From 7501bde7174a84776d1bc896933aa7c12b6f58da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Sat, 18 Apr 2026 16:58:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E9=87=8D=E9=87=8F=E4=BD=93=E7=A7=AF?=
 =?UTF-8?q?=E7=AD=89=E8=B0=83=E6=95=B4=E4=BF=A1=E6=81=AF;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todo/InventoryAdjustmentRecordDO.java     | 40 +++++++++++++++++++
 ...nventoryAdjustmentRecordDomainService.java | 21 ++++++++++
 2 files changed, 61 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/todo/InventoryAdjustmentRecordDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/todo/InventoryAdjustmentRecordDO.java
index cc19f418b..784787475 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/todo/InventoryAdjustmentRecordDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/todo/InventoryAdjustmentRecordDO.java
@@ -171,4 +171,44 @@ public class InventoryAdjustmentRecordDO extends BaseVOEntity {
     @ApiModelProperty("关联单号")
     @Excel(name = "关联单号")
     private String relateNo;
+
+    @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("调整后净重(KG)")
+    @Excel(name = "调整后净重(KG)")
+    private BigDecimal adjustedNetWeight;
+
+    @ApiModelProperty("调整后毛重(KG)")
+    @Excel(name = "调整后毛重(KG)")
+    private BigDecimal adjustedGrossWeight;
+
+    @ApiModelProperty("调整后体积")
+    @Excel(name = "调整后体积")
+    private BigDecimal adjustedVolume;
+
+    @ApiModelProperty("调整后面积")
+    @Excel(name = "调整后面积")
+    private BigDecimal adjustedArea;
+
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String lotNumber;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java
index 61f41d8eb..5afbda11b 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java
@@ -155,6 +155,17 @@ public class InventoryAdjustmentRecordDomainService {
                     inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
                     inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory.getAllocationQuantity());
                     inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory.getFreezeQuantity());
+                    // 调整前：库存数量（净重、毛重、体积、面积）
+                    inventoryAdjustmentRecord.setNetWeight(materialInventory.getNetWeight());
+                    inventoryAdjustmentRecord.setGrossWeight(materialInventory.getGrossWeight());
+                    inventoryAdjustmentRecord.setVolume(materialInventory.getVolume());
+                    inventoryAdjustmentRecord.setArea(materialInventory.getArea());
+                    // 调整后：库存数量 - 复核时填写的数量
+                    inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory.getNetWeight());
+                    inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory.getGrossWeight());
+                    inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
+                    inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
+
                 } else {
                     throw new ServiceException("根据物料库存id查询不到物料库存信息！");
                 }
@@ -199,6 +210,16 @@ public class InventoryAdjustmentRecordDomainService {
                 inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory.getAllocationQuantity());
                 inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory.getFreezeQuantity());
+                // 调整前：库存数量（净重、毛重、体积、面积）
+                inventoryAdjustmentRecord.setNetWeight(materialInventory.getNetWeight());
+                inventoryAdjustmentRecord.setGrossWeight(materialInventory.getGrossWeight());
+                inventoryAdjustmentRecord.setVolume(materialInventory.getVolume());
+                inventoryAdjustmentRecord.setArea(materialInventory.getArea());
+                // 调整后：库存数量 - 复核时填写的数量
+                inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory.getNetWeight());
+                inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory.getGrossWeight());
+                inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
+                inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
             } else {
                 throw new ServiceException("根据原物料状态查询不到物料库存信息！");
             }