From 87cacef4f936b2a4464c375ce32fd10253c8138a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Wed, 18 Mar 2026 14:25:30 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E5=A4=8D=E6=A0=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/OutMaterialDetailImpl.java          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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 026231beb..b9b4b5c5c 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
@@ -1060,10 +1060,15 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
             outMaterialDetail.setUpdateBy(loginUser.getUserid());
             outMaterialDetail.setUpdateByName(loginUser.getUsername());
             outMaterialDetail.setUpdateTime(new Date());
-            outMaterialDetail.setCheckArea(outMaterialDetailDO.getCheckArea());
-            outMaterialDetail.setCheckVolume(outMaterialDetailDO.getCheckVolume());
-            outMaterialDetail.setCheckGrossWeight(outMaterialDetailDO.getCheckGrossWeight());
-            outMaterialDetail.setCheckNetWeight(outMaterialDetailDO.getCheckNetWeight());
+            // 前端复核时填写的净重毛重体积面积通过 total* 字段传入，check* 优先，为 null 时用 total* 兜底
+            outMaterialDetail.setCheckNetWeight(outMaterialDetailDO.getCheckNetWeight() != null
+                    ? outMaterialDetailDO.getCheckNetWeight() : outMaterialDetailDO.getTotalNetWeight());
+            outMaterialDetail.setCheckGrossWeight(outMaterialDetailDO.getCheckGrossWeight() != null
+                    ? outMaterialDetailDO.getCheckGrossWeight() : outMaterialDetailDO.getTotalGrossWeight());
+            outMaterialDetail.setCheckVolume(outMaterialDetailDO.getCheckVolume() != null
+                    ? outMaterialDetailDO.getCheckVolume() : outMaterialDetailDO.getTotalVolume());
+            outMaterialDetail.setCheckArea(outMaterialDetailDO.getCheckArea() != null
+                    ? outMaterialDetailDO.getCheckArea() : outMaterialDetailDO.getTotalArea());
 
             // 复核时同步净重、毛重、体积、面积到 picking_material_detail，供 getCheckInfo 查询展示（优先 check*，否则 total*）
             if (1 == type && outMaterialDetailDb.getUniqueId() != null) {