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"
+
@@ -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