Merge remote-tracking branch 'origin/dev' into dev

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java

@@ -132,6 +132,8 @@ public class ExcelParseService {
             stockOutOrder.setUpdateTime(new Date());
             stockOutOrder.setDelFlag(1);
         }
+        // 复核下发状态默认为否（2）
+        stockOutOrder.setCheckTaskDistribution(2);
         //校验必填字段
         StringBuilder errorMsg = check(stockOutOrder);
         if (errorMsg.length() > 0) {

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java

@@ -154,6 +154,10 @@ public class StockOutOrderDomainService {
         //统计总体积
         //BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(OutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         //stockOutOrderDO.setVolumeLimit(volumeLimit);
+        // 复核下发状态默认为否（2）
+        if (stockOutOrderDO.getCheckTaskDistribution() == null) {
+            stockOutOrderDO.setCheckTaskDistribution(2);
+        }
         stockOutOrderService.insert(stockOutOrderDO);
         return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
     }
@@ -180,6 +184,10 @@ public class StockOutOrderDomainService {
             //统计总体积
             BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(OutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
             stockOutOrderDO.setVolumeLimit(volumeLimit);
+            // 复核下发状态默认为否（2）
+            if (stockOutOrderDO.getCheckTaskDistribution() == null) {
+                stockOutOrderDO.setCheckTaskDistribution(2);
+            }
             stockOutOrderService.insert(stockOutOrderDO);
             outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
         }
@@ -691,7 +699,7 @@ public class StockOutOrderDomainService {
         stockOutOrderDOQuery.setCheckTaskDistribution(2);
         List<StockOutOrderPO> stockOutOrderPOList = stockOutOrderService.queryList(stockOutOrderDOQuery);
         if (CollectionUtils.isEmpty(stockOutOrderPOList)) {
-            throw new ServiceException("收货单不存在或已下发，请重新选择");
+            throw new ServiceException("复合单已下发，请重新选择");
         }
         //复核下发任务
         genDeliveTask(stockOutOrderPOList, stockOutOrderDO);

mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml

@@ -54,6 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="totalArea"    column="total_area"    />
+        <result property="totalGrossWeight"    column="total_gross_weight"    />
+        <result property="totalNetWeight"    column="total_net_weight"    />
+        <result property="totalVolume"    column="total_volume"    />
+        <result property="outUniqueId"    column="out_unique_id"    />
     </resultMap>
 
 
@@ -67,7 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.storage_location_id, a.storage_location_code, a.storage_location_name, a.remark,
         a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO, a.EXT_ATTR_1, a.EXT_ATTR_2,
         a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_3, a.EXT_ATTR_4,
-        a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag
+        a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag,
+        a.total_area, a.total_gross_weight, a.total_net_weight, a.total_volume, a.out_unique_id
     </sql>
 
     <sql id="selectPickingMaterialDetailPo1">