From 9531d52ef06006037cebf6265919d5db7f5bf172 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Thu, 16 Apr 2026 16:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=92=8C=E6=8B=A3=E8=B4=A7?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=8A=84?=
=?UTF-8?q?=E7=A0=81=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../repository/po/OutMaterialDetailPO.java | 4 ++++
.../repository/po/PickingMaterialDetailPO.java | 9 +++++++++
.../pickingOrder/service/PickingOrderDomainService.java | 1 +
.../service/StockOutOrderDomainService.java | 1 +
.../PickingMaterialDetailMapper.xml | 2 ++
5 files changed, 17 insertions(+)
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 f9d3977a7..1bf8b6f16 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
@@ -533,4 +533,8 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
@ApiModelProperty("抄码id数组 逗号分隔")
@Excel(name = "抄码id数组")
private String copyCodeReferenceIds;
+
+ @ApiModelProperty("是否抄码: 1-是 2-否")
+ @Excel(name = "是否抄码: 1-是 2-否")
+ private Integer copyCode;
}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
index ed3b1a0c2..3e054306c 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
@@ -304,4 +304,13 @@ public class PickingMaterialDetailPO extends BaseVOEntity {
@ApiModelProperty("出库异常明细：作业数量（拣货异常场景=实际拣货数量）")
@TableField(exist = false)
private BigDecimal abnormalWorkQuantity;
+
+ @ApiModelProperty("是否抄码: 1-是 2-否")
+ @Excel(name = "是否抄码: 1-是 2-否")
+ private Integer copyCode;
+
+ @ApiModelProperty("抄码id数组 逗号分隔")
+ @Excel(name = "抄码id数组")
+ private String copyCodeReferenceIds;
+
}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
index 748204f1f..8b7d8b13d 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
@@ -236,6 +236,7 @@ public class PickingOrderDomainService {
if(materialBaseInfo!=null){
pickingMaterialDetailPO.setMaterialCode(materialBaseInfo.getMaterialCode());
pickingMaterialDetailPO.setMaterialName(materialBaseInfo.getMaterialName());
+ pickingMaterialDetailPO.setCopyCode(materialBaseInfo.getCopyCode());
}
}
pickingOrderPO.setMaterialDetailList(pickingMaterialDetailPOList);
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 065e17eba..d0c01c716 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
@@ -512,6 +512,7 @@ public class StockOutOrderDomainService {
outMaterialDetailPO.setCommodityName(materialBaseInfos.get(0).getMaterialName());
outMaterialDetailPO.setMaterialCode(materialBaseInfos.get(0).getMaterialCode());
outMaterialDetailPO.setMaterialName(materialBaseInfos.get(0).getMaterialName());
+ outMaterialDetailPO.setCopyCode(materialBaseInfos.get(0).getCopyCode());
}
}
stockOutOrderPO.setMaterialDetailList(materialDetailPOList);
diff --git a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
index 8d5cd2a67..16d7fb84e 100644
--- a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_3, a.EXT_ATTR_4,
a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag,
a.total_area, a.total_gross_weight, a.total_net_weight, a.total_volume, a.out_unique_id,
+ a.COPY_CODE_REFERENCE_IDS,
omd.in_order_number, omd.lot_no as lot_number