PC收货管理尺寸字段添加

mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java

@@ -491,8 +491,10 @@ public class PickingOrderApplicationService {
     public Boolean allDistribution(PickingOrderDO pickingOrderDO){
         //设置作业人员信息
         operatorsParam(pickingOrderDO);
-        //设置集货库位
-        setStorageLocation(pickingOrderDO);
+        // 整单下发时集货位改为选填：仅在前端传入集货位时才补全库位信息
+        if (pickingOrderDO.getStorageLocationId() != null) {
+            setStorageLocation(pickingOrderDO);
+        }
         return pickingOrderDomainService.allDistribution(pickingOrderDO);
     }
 

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java

@@ -526,15 +526,18 @@ public class PickingOrderDomainService {
             stockOutTaskOrderDO.setSerialNumber(OrderSequence.getOrderCode("JHZYLS"));
             stockOutTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JHZY"));
             stockOutTaskOrderDO.setType(1);//按单
-            stockOutTaskOrderDO.setWarehouseId(pickingOrderDO.getWarehouseId());
-            stockOutTaskOrderDO.setWarehouseCode(pickingOrderDO.getWarehouseCode());
-            stockOutTaskOrderDO.setWarehouseName(pickingOrderDO.getWarehouseName());
-            stockOutTaskOrderDO.setStorageSectionId(pickingOrderDO.getStorageSectionId());
-            stockOutTaskOrderDO.setStorageCode(pickingOrderDO.getStorageCode());
-            stockOutTaskOrderDO.setStorageName(pickingOrderDO.getStorageName());
-            stockOutTaskOrderDO.setStorageLocationId(pickingOrderDO.getStorageLocationId());
-            stockOutTaskOrderDO.setStorageLocationCode(pickingOrderDO.getStorageLocationCode());
-            stockOutTaskOrderDO.setStorageLocationName(pickingOrderDO.getStorageLocationName());
+            // 集货位选填：仅在请求中传入集货位时，才覆盖任务单的库位信息
+            if (pickingOrderDO.getStorageLocationId() != null) {
+                stockOutTaskOrderDO.setWarehouseId(pickingOrderDO.getWarehouseId());
+                stockOutTaskOrderDO.setWarehouseCode(pickingOrderDO.getWarehouseCode());
+                stockOutTaskOrderDO.setWarehouseName(pickingOrderDO.getWarehouseName());
+                stockOutTaskOrderDO.setStorageSectionId(pickingOrderDO.getStorageSectionId());
+                stockOutTaskOrderDO.setStorageCode(pickingOrderDO.getStorageCode());
+                stockOutTaskOrderDO.setStorageName(pickingOrderDO.getStorageName());
+                stockOutTaskOrderDO.setStorageLocationId(pickingOrderDO.getStorageLocationId());
+                stockOutTaskOrderDO.setStorageLocationCode(pickingOrderDO.getStorageLocationCode());
+                stockOutTaskOrderDO.setStorageLocationName(pickingOrderDO.getStorageLocationName());
+            }
             stockOutTaskOrderDO.setOperatorsBy(pickingOrderDO.getOperatorsBy());
             stockOutTaskOrderDO.setOperatorsName(pickingOrderDO.getOperatorsName());
             List<PickingMaterialDetail> pickingMaterialDetailDbList = pickingMaterialDetailMap.get(pickingOrderPO.getPickingOrderNumber());

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java

@@ -332,7 +332,7 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
 
     @ApiModelProperty("尺寸")
     @Excel(name = "尺寸")
-    @TableField(exist = false)
+    @TableField("dimensions")
     private String dimensions;
 
     @ApiModelProperty("箱数")

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java

@@ -72,6 +72,10 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
     @Excel(name = "规格型号")
     private String specificationModel;
 
+    @ApiModelProperty("尺寸")
+    @Excel(name = "尺寸")
+    private String dimensions;
+
     @ApiModelProperty("计划数量")
     @Excel(name = "计划数量")
     private BigDecimal quantity;

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java

@@ -70,6 +70,10 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity {
     @Excel(name = "规格型号")
     private String specificationModel;
 
+    @ApiModelProperty("尺寸")
+    @Excel(name = "尺寸")
+    private String dimensions;
+
     @ApiModelProperty("计划数量")
     @Excel(name = "计划数量")
     private BigDecimal quantity;

mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialName"    column="MATERIAL_NAME"    />
         <result property="barCode"    column="bar_code"    />
         <result property="specificationModel"    column="specification_model"    />
+        <result property="dimensions"    column="DIMENSIONS"    />
         <result property="quantity"    column="quantity"    />
         <result property="alreadyReceiptGrossWeight"    column="already_receipt_gross_weight"    />
         <result property="alreadyReceiptNetWeight"    column="already_receipt_net_weight"    />
@@ -90,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ifnull(a.MATERIAL_NAME, c.MATERIAL_NAME) MATERIAL_NAME, 
         a.BAR_CODE, 
         c.SPECIFICATION_MODEL,
+        ifnull(a.DIMENSIONS, b.DIMENSIONS) DIMENSIONS,
         a.QUANTITY, a.ALREADY_RECEIPT_QUANTITY, a.ALREADY_RECEIPT_GROSS_WEIGHT, a.ALREADY_RECEIPT_NET_WEIGHT, a.ALREADY_RECEIPT_VOLUME, a.ALREADY_RECEIPT_AREA, a.RECEIPT_QUANTITY, a.RECEIPT_STATUS, a.PACK_ID, a.PACK_CODE, a.PACK_NAME, a.PACK_DETAIL_ID, ifnull(a.UNIT_CODE, b.UNIT_CODE) UNIT_CODE, ifnull(a.UNIT_NAME, b.UNIT_NAME) UNIT_NAME, a.UNIT_NUMBER, a.MATERIAL_WAREHOUSE_CONTROL_ID, a.SERIAL_NUMBER_MANAGE, a.QUALITY_INSPECTION_MANAGE, a.QUALITY_INSPECTION_STAGE, a.QUALITY_INSPECTION_RULE, a.QUALITY_INSPECTION_RATIO, a.QUALITY_INSPECTION_TERM, a.QUALITY_INSPECTION_RESULTS, a.ALLOW_OVERCHARGE, a.OVERCHARGE_RATIO, a.BATCH_NUMBER, a.MATERIAL_STATUS_CODE, a.MATERIAL_STATUS_NAME, a.DISTRIBUTE_RULE_ID, a.DISTRIBUTE_RULE_CODE, a.DISTRIBUTE_RULE_NAME, a.CONTAINER_ID, a.CONTAINER_CODE, a.CONTAINER_TYPE, a.CONTAINER_TYPE_NAME, a.LEVEL, a.PARENT_UNIQUE_ID, a.IN_UNIQUE_ID, a.ALLOW_MODIFY, a.REMARK, a.CREATE_TIME, a.CREATE_BY, a.CREATE_BY_NAME, a.UPDATE_TIME, a.UPDATE_BY, a.UPDATE_BY_NAME, a.GEN_STOCK_SHELF, a.DEL_FLAG,
         ifnull(a.TOTAL_NET_WEIGHT, b.TOTAL_NET_WEIGHT) TOTAL_NET_WEIGHT, 
         ifnull(a.TOTAL_GROSS_WEIGHT, b.TOTAL_GROSS_WEIGHT) TOTAL_GROSS_WEIGHT,