PC上架尺寸字段查询修改

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java

@@ -68,6 +68,11 @@ public class ShelfMaterialDetail extends BaseVOEntity {
     @Excel(name = "物料条形码")
     private String barCode;
 
+    @ApiModelProperty("尺寸")
+    @Excel(name = "尺寸")
+    @TableField("dimensions")
+    private String dimensions;
+
     @ApiModelProperty("计划数量")
     @Excel(name = "计划数量")
     private BigDecimal quantity;

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java

@@ -69,6 +69,10 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
     @Excel(name = "物料条形码")
     private String barCode;
 
+    @ApiModelProperty("尺寸")
+    @Excel(name = "尺寸")
+    private String dimensions;
+
     @ApiModelProperty("计划数量")
     @Excel(name = "计划数量")
     private BigDecimal quantity;

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java

@@ -66,6 +66,10 @@ public class ShelfMaterialDetailDO extends BaseVOEntity {
     @Excel(name = "物料条形码")
     private String barCode;
 
+    @ApiModelProperty("尺寸")
+    @Excel(name = "尺寸")
+    private String dimensions;
+
     @ApiModelProperty("计划数量")
     @Excel(name = "计划数量")
     private BigDecimal quantity;

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java

@@ -66,6 +66,10 @@ public class ShelfMaterialDetailDTO extends BaseVOEntity {
     @Excel(name = "物料条形码")
     private String barCode;
 
+    @ApiModelProperty("尺寸")
+    @Excel(name = "尺寸")
+    private String dimensions;
+
     @ApiModelProperty("计划数量")
     @Excel(name = "计划数量")
     private BigDecimal quantity;

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

@@ -91,7 +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.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, 

mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialCode"    column="material_code"    />
         <result property="materialName"    column="material_name"    />
         <result property="barCode"    column="bar_code"    />
+        <result property="dimensions"    column="dimensions"    />
         <result property="quantity"    column="quantity"    />
         <result property="shelvesQuantity"    column="shelves_quantity"    />
         <result property="shelvesStatus"    column="shelves_status"    />
@@ -75,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectShelfMaterialDetailPo">
-        select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, shelf_order_number, material_base_info_id, material_code, material_name, bar_code, quantity, already_shelves_quantity, shelves_quantity, shelves_status, pack_id, pack_code, pack_name, 
+        select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, shelf_order_number, material_base_info_id, material_code, material_name, bar_code, dimensions, quantity, already_shelves_quantity, shelves_quantity, shelves_status, pack_id, pack_code, pack_name, 
         CASE 
             WHEN pack_detail_id IS NULL OR TRIM(pack_detail_id) = '' THEN NULL 
             ELSE CAST(pack_detail_id AS BIGINT)