From 54cd738bd6b29d0e081efa64bd322980b97b9905 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Fri, 27 Feb 2026 09:40:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=BB=E4=BD=8D=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=87=80=E9=87=8D(KG)=E3=80=81=E6=AF=9B=E9=87=8D(KG)?=
 =?UTF-8?q?=E3=80=81=E4=BD=93=E7=A7=AF(CBM)=E3=80=81=E9=9D=A2=E7=A7=AF(SQM?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ShiftMaterialDetail.java              | 14 ++++++++++++++
 .../repository/todo/ShiftMaterialDetailDO.java   | 16 ++++++++++++++++
 .../materialInventory/MaterialInventoryDTO.java  | 16 ++++++++++++++++
 .../ShiftMaterialDetailDTO.java                  | 16 ++++++++++++++++
 4 files changed, 62 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java
index 09640f20f..ad0e85a13 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java
+++ b/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)
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/todo/ShiftMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/todo/ShiftMaterialDetailDO.java
index f0be6b9c3..1f82db3ca 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/todo/ShiftMaterialDetailDO.java
+++ b/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;
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
index 3505e386a..0dfc6f23c 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
+++ b/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;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shiftMaterialDetail/ShiftMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shiftMaterialDetail/ShiftMaterialDetailDTO.java
index 58c3cd7c2..b2a943850 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shiftMaterialDetail/ShiftMaterialDetailDTO.java
+++ b/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;