From 99e7c314a0f1a63b54735be4fabd8678301c4745 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Thu, 16 Apr 2026 11:31:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=84=E7=A0=81=E5=95=86=E5=93=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=8B=A3=E8=B4=A7=E5=8D=95=E5=AD=98=E5=85=A5=E6=8A=84?=
 =?UTF-8?q?=E7=A0=81=E9=87=8D=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/po/OutMaterialDetailPO.java                 | 4 ++++
 .../stockOutOrder/service/StockOutOrderDomainService.java  | 7 ++++++-
 .../mapper/OutMaterialDetail/OutMaterialDetailMapper.xml   | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java
index 7f3e971fb..5ffdb3901 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java
@@ -525,4 +525,8 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
     @ApiModelProperty("出库异常明细：作业数量（复核异常场景=实际复核数量）")
     @TableField(exist = false)
     private BigDecimal abnormalWorkQuantity;
+
+    @ApiModelProperty("抄码总重量")
+    @Excel(name = "抄码总重量")
+    private BigDecimal copyTotalWeight;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
index 26e172d2a..f5b45e931 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
@@ -655,7 +655,12 @@ public class StockOutOrderDomainService {
                         pickingMaterialDetailDO.setExtAttr4(outMaterialDetailPO.getExtAttr4());
                         // 毛重、净重、面积、体积从出库单明细自动带出
                         pickingMaterialDetailDO.setTotalGrossWeight(outMaterialDetailPO.getTotalGrossWeight());
-                        pickingMaterialDetailDO.setTotalNetWeight(outMaterialDetailPO.getTotalNetWeight());
+                        //判断是否是抄码商品净重
+                        if (outMaterialDetailPO.getCopyTotalWeight() != null){
+                            pickingMaterialDetailDO.setTotalNetWeight(outMaterialDetailPO.getCopyTotalWeight());
+                        }else {
+                            pickingMaterialDetailDO.setTotalNetWeight(outMaterialDetailPO.getTotalNetWeight());
+                        }
                         pickingMaterialDetailDO.setTotalArea(outMaterialDetailPO.getTotalArea());
                         pickingMaterialDetailDO.setTotalVolume(outMaterialDetailPO.getTotalVolume());
                         pickingMaterialDetailList.add(pickingMaterialDetailDO);
diff --git a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml
index ee9ce8fcc..08061dfaf 100644
--- a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml
@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inOrderNumber"    column="in_order_number"    />
         <result property="stockUnit"    column="stock_unit"    />
         <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="copyTotalWeight"    column="COPY_TOTAL_WEIGHT"    />
     </resultMap>
 
 
@@ -145,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.INVENTORY_DATE,
         a.EXT_ATTR_3,
         a.EXT_ATTR_4,
+        a.COPY_TOTAL_WEIGHT,
         a.INVENTORY_QUANTITY
     </sql>