From c7a7afb5cea66aaf2bba2c7595288fe1e8683b79 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Sat, 14 Mar 2026 14:20:30 +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=E7=8A=B6=E6=80=81=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/DifferentManageImpl.java      |  8 ++---
 .../HandoverTaskOrderDomainService.java       |  8 +++--
 .../persistence/OutMaterialDetailImpl.java    | 32 +++++++++----------
 .../persistence/ShiftMaterialDetailImpl.java  |  8 ++---
 4 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java
index ed604cb42..be3f7fb15 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java
@@ -215,10 +215,10 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
         inventoryAdjustmentRecord.setAdjustedArea(materialInventory1.getArea() == null ? BigDecimal.ZERO : materialInventory1.getArea());
         inventoryAdjustmentRecord.setAdjustAction("差异过账");
         inventoryAdjustmentRecord.setRelateNo(investigetionManageDetailDO.getInvestigationNumber());
-        inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
-        inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
-        inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
-        inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
+        inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory1.getMaterialStatusCode() == null ? "" : materialInventory1.getMaterialStatusCode());
+        inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory1.getMaterialStatusCode() == null ? "" :  materialInventory1.getMaterialStatusCode());
+        inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory1.getMaterialStatusName() == null ? "" :  materialInventory1.getMaterialStatusName());
+        inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory1.getMaterialStatusName()  == null ? "" :  materialInventory1.getMaterialStatusName());
         inventoryAdjustmentRecord.setMaterialBaseInfoId(investigetionManageDetailDO.getMaterialBaseInfoId());
         inventoryAdjustmentRecord.setMaterialCode(investigetionManageDetailDO.getMaterialCode());
         inventoryAdjustmentRecord.setMaterialName(investigetionManageDetailDO.getMaterialName());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
index a645da579..9513be5b0 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
@@ -274,9 +274,11 @@ public class HandoverTaskOrderDomainService {
                     InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
                     inventoryAdjustmentRecord.setAdjustAction("出库");
                     inventoryAdjustmentRecord.setRelateNo(orderNumber);
-                    inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
-                    inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
-                    inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
+                    inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode());
+                    inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory.getMaterialStatusCode() == null ? "" :  materialInventory.getMaterialStatusCode());
+                    inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory.getMaterialStatusName() == null ? "" :  materialInventory.getMaterialStatusName());
+                    inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory.getMaterialStatusName()  == null ? "" :  materialInventory.getMaterialStatusName());
+//                    inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
 //                    inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
                     inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
                     inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
index f8f1f99e7..24f29b343 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
@@ -464,10 +464,10 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
                 inventoryAdjustmentRecord.setAdjustAction("分配库存");
                 inventoryAdjustmentRecord.setRelateNo(outOrderNumber);
-                inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
+                inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory.getMaterialStatusCode() == null ? "" :  materialInventory.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory.getMaterialStatusName() == null ? "" :  materialInventory.getMaterialStatusName());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory.getMaterialStatusName()  == null ? "" :  materialInventory.getMaterialStatusName());
                 inventoryAdjustmentRecord.setAdjustType(1L);
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
@@ -555,10 +555,10 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
                 inventoryAdjustmentRecord.setAdjustAction("分配库存");
                 inventoryAdjustmentRecord.setRelateNo(outOrderNumber);
-                inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
+                inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory.getMaterialStatusCode() == null ? "" :  materialInventory.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory.getMaterialStatusName() == null ? "" :  materialInventory.getMaterialStatusName());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory.getMaterialStatusName()  == null ? "" :  materialInventory.getMaterialStatusName());
                 inventoryAdjustmentRecord.setAdjustType(1L);
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
@@ -791,10 +791,10 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
                 inventoryAdjustmentRecord.setAdjustAction("分配库存");
                 inventoryAdjustmentRecord.setRelateNo(outOrderNumber);
-                inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
+                inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventoryPO.getMaterialStatusCode() == null ? "" : materialInventoryPO.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventoryPO.getMaterialStatusCode() == null ? "" :  materialInventoryPO.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventoryPO.getMaterialStatusName() == null ? "" :  materialInventoryPO.getMaterialStatusName());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventoryPO.getMaterialStatusName()  == null ? "" :  materialInventoryPO.getMaterialStatusName());
                 inventoryAdjustmentRecord.setAdjustType(1L);
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
@@ -865,10 +865,10 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
                 inventoryAdjustmentRecord.setAdjustAction("分配库存");
                 inventoryAdjustmentRecord.setRelateNo(outOrderNumber);
-                inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
+                inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventoryPO.getMaterialStatusCode() == null ? "" : materialInventoryPO.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventoryPO.getMaterialStatusCode() == null ? "" :  materialInventoryPO.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventoryPO.getMaterialStatusName() == null ? "" :  materialInventoryPO.getMaterialStatusName());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventoryPO.getMaterialStatusName()  == null ? "" :  materialInventoryPO.getMaterialStatusName());
                 inventoryAdjustmentRecord.setAdjustType(1L);
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
index e052574a6..4a54af722 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
@@ -505,10 +505,10 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
 
         inventoryAdjustmentRecord.setAdjustAction("移位管理");
         inventoryAdjustmentRecord.setRelateNo(shiftMaterialDetailDO.getShiftNumber());
-        inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
-        inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
-        inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
-        inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
+        inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory1.getMaterialStatusCode() == null ? "" : materialInventory1.getMaterialStatusCode());
+        inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory1.getMaterialStatusCode() == null ? "" :  materialInventory1.getMaterialStatusCode());
+        inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory1.getMaterialStatusName() == null ? "" :  materialInventory1.getMaterialStatusName());
+        inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory1.getMaterialStatusName()  == null ? "" :  materialInventory1.getMaterialStatusName());
         inventoryAdjustmentRecord.setMaterialBaseInfoId(shiftMaterialDetailDO.getMaterialBaseInfoId());
         inventoryAdjustmentRecord.setMaterialCode(shiftMaterialDetailDO.getMaterialCode());
         inventoryAdjustmentRecord.setMaterialName(shiftMaterialDetailDO.getMaterialName());