新增移位保存净重(KG)、毛重(KG)、体积(CBM)、面积(SQM)

mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java

@@ -244,7 +244,21 @@ public class ShiftMaterialDetail extends BaseVOEntity {
     @ApiModelProperty("移位类型")
     private Integer shiftType;
 
+    @ApiModelProperty("净重(KG)")
+    @Excel(name = "净重(KG)")
+    private BigDecimal netWeight;
 
+    @ApiModelProperty("毛重(KG)")
+    @Excel(name = "毛重(KG)")
+    private BigDecimal grossWeight;
+
+    @ApiModelProperty("体积")
+    @Excel(name = "体积")
+    private BigDecimal volume;
+
+    @ApiModelProperty("面积")
+    @Excel(name = "面积")
+    private BigDecimal area;
 
     @ApiModelProperty("移位详情")
     @TableField(exist = false)

mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/todo/ShiftMaterialDetailDO.java

@@ -247,6 +247,22 @@ public class ShiftMaterialDetailDO extends BaseVOEntity {
     @Excel(name = "物料状态名称")
     private String materialStatusName;
 
+    @ApiModelProperty("净重(KG)")
+    @Excel(name = "净重(KG)")
+    private BigDecimal netWeight;
+
+    @ApiModelProperty("毛重(KG)")
+    @Excel(name = "毛重(KG)")
+    private BigDecimal grossWeight;
+
+    @ApiModelProperty("体积")
+    @Excel(name = "体积")
+    private BigDecimal volume;
+
+    @ApiModelProperty("面积")
+    @Excel(name = "面积")
+    private BigDecimal area;
+
     @ApiModelProperty("移位详情")
     @TableField(exist = false)
     private List<ShiftMaterialDetailDO> children;

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java

@@ -161,4 +161,20 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
     private String boxPalletNo;
     //查询规则 hz:货主,wl:物料,kw:库位,wlkw:物料库位,all:全部
     private String queryRule;
+
+    @ApiModelProperty("净重(KG)")
+    @Excel(name = "净重(KG)")
+    private BigDecimal netWeight;
+
+    @ApiModelProperty("毛重(KG)")
+    @Excel(name = "毛重(KG)")
+    private BigDecimal grossWeight;
+
+    @ApiModelProperty("体积")
+    @Excel(name = "体积")
+    private BigDecimal volume;
+
+    @ApiModelProperty("面积")
+    @Excel(name = "面积")
+    private BigDecimal area;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shiftMaterialDetail/ShiftMaterialDetailDTO.java

@@ -239,6 +239,22 @@ public class ShiftMaterialDetailDTO extends BaseVOEntity {
     @Excel(name = "备注")
     private String remark;
 
+    @ApiModelProperty("净重(KG)")
+    @Excel(name = "净重(KG)")
+    private BigDecimal netWeight;
+
+    @ApiModelProperty("毛重(KG)")
+    @Excel(name = "毛重(KG)")
+    private BigDecimal grossWeight;
+
+    @ApiModelProperty("体积")
+    @Excel(name = "体积")
+    private BigDecimal volume;
+
+    @ApiModelProperty("面积")
+    @Excel(name = "面积")
+    private BigDecimal area;
+
 
     @ApiModelProperty(name = "组织ID集合")
     private List<Long> organizationIdList;