From 1f5aef417ba59753edc52cbeb76574287bce43ad Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Tue, 21 Apr 2026 15:06:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=88=B0=E4=B8=8A=E5=AE=B6?=
=?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mhd_wms/sql/pdaSql.sql | 2 +-
.../repository/po/ReceiptMaterialDetailPO.java | 4 ++++
.../repository/todo/ReceiptMaterialDetailDO.java | 6 +++---
.../repository/todo/ShelfMaterialDetailDO.java | 4 ++++
.../service/StockReceiptOrderDomainService.java | 2 ++
.../dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java | 4 ++++
.../dto/stockReceiptOrder/StockReceiptOrderDTO.java | 4 ++++
.../mapper/inMaterialDetail/InMaterialDetailMapper.xml | 1 +
.../receiptMaterialDetail/ReceiptMaterialDetailMapper.xml | 4 +++-
9 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/mhd_wms/sql/pdaSql.sql b/mhd_wms/sql/pdaSql.sql
index 2b9eee527..462171e65 100644
--- a/mhd_wms/sql/pdaSql.sql
+++ b/mhd_wms/sql/pdaSql.sql
@@ -38,4 +38,4 @@ ALTER TABLE SHELF_MATERIAL_DETAIL ADD COPY_DETAILS VARCHAR;
ALTER TABLE NGWL_TEST_WMS.IN_MATERIAL_DETAIL ADD OMS_IN_MATERIAL_DETAIL varchar(100) NULL;
ALTER TABLE NGWL_TEST_WMS.STOCK_IN_ORDER ADD OMS_STOCK_IN_ORDER_ID varchar(100) NULL;
-ALTER TABLE NGWL_TEST_WMS.RECEIPT_MATERIAL_DETAIL ADD OMS_STOCK_IN_ORDER_ID varchar(100) NULL;
+ALTER TABLE NGWL_TEST_WMS.RECEIPT_MATERIAL_DETAIL ADD oms_in_material_detail varchar(100) NULL;
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java
index 7dc56499c..d0404036c 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java
@@ -359,4 +359,8 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
@ApiModelProperty("是否抄码: 1-是 2-否")
@Excel(name = "是否抄码: 1-是 2-否")
private Integer copyCode;
+
+ @ApiModelProperty("oms入库单详情id")
+ @Excel(name = "oms入库单详情id")
+ private String omsInMaterialDetail;
}
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java
index d2cae0336..9ed048d74 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java
@@ -355,7 +355,7 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity {
@ApiModelProperty("是否抄码：1-是 2-否（与物料主数据同源，PDA/PC 透传）")
private Integer copyCode;
- @ApiModelProperty("oms入库单id")
- @Excel(name = "oms入库单id")
- private String omsStockInOrderId;
+ @ApiModelProperty("oms入库单详情id")
+ @Excel(name = "oms入库单详情id")
+ private String omsInMaterialDetail;
}
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java
index e176a8a51..1a0979df5 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java
@@ -363,4 +363,8 @@ public class ShelfMaterialDetailDO extends BaseVOEntity {
*/
@ApiModelProperty(hidden = true)
private Boolean pdaShelfSyntheticChildInjected;
+
+ @ApiModelProperty("oms入库单详情id")
+ @Excel(name = "oms入库单详情id")
+ private String omsInMaterialDetail;
}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
index 45a7f2257..6a3523594 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
@@ -1297,6 +1297,7 @@ public class StockReceiptOrderDomainService {
ShelfMaterialDetailDO shelfMaterialDetailDO = new ShelfMaterialDetailDO();
BeanUtils.copyProperties(receiptMaterialDetailPO, shelfMaterialDetailDO);
+ shelfMaterialDetailDO.setOmsInMaterialDetail(receiptMaterialDetailPO.getOmsInMaterialDetail());
shelfMaterialDetailDO.setLotNumber(receiptMaterialDetailPO.getLotNo());
shelfMaterialDetailDO.setQuantity(receiptMaterialDetailPO.getReceiptQuantity());
shelfMaterialDetailDO.setInUniqueId(receiptMaterialDetailPO.getInUniqueId());
@@ -1344,6 +1345,7 @@ public class StockReceiptOrderDomainService {
}
ShelfMaterialDetailDO shelfMaterialDetailDOChildren = new ShelfMaterialDetailDO();
BeanUtils.copyProperties(receiptMaterialDetailPOChildren, shelfMaterialDetailDOChildren);
+ shelfMaterialDetailDOChildren.setOmsInMaterialDetail(receiptMaterialDetailPO.getOmsInMaterialDetail());
shelfMaterialDetailDOChildren.setLotNumber(receiptMaterialDetailPOChildren.getLotNo());
shelfMaterialDetailDOChildren.setQuantity(receiptMaterialDetailPOChildren.getReceiptQuantity());
shelfMaterialDetailDOChildren.setInUniqueId(receiptMaterialDetailPO.getInUniqueId());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java
index 4c8b0dce1..4b2648e4d 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java
@@ -303,4 +303,8 @@ public class ReceiptMaterialDetailDTO extends BaseVOEntity {
@ApiModelProperty("抄码数量克重详情：JSON 字符串，key 为序号(1,2,3…)，value 为单件净重KG(支持小数)。例：{\"1\":1.343,\"2\":1.343}；上架完成后写入 copy_code_reference")
@Excel(name = "抄码数量克重详情")
private String copyDetails;
+
+ @ApiModelProperty("oms入库单详情id")
+ @Excel(name = "oms入库单详情id")
+ private String omsInMaterialDetail;
}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java
index 47c50905d..73c390d8f 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java
@@ -159,4 +159,8 @@ public class StockReceiptOrderDTO extends StockInOrderBaseDTO {
@ApiModelProperty(name = "费用参数json")
private String billingJson;
+
+ @ApiModelProperty("oms入库单id")
+ @Excel(name = "oms入库单id")
+ private String omsStockInOrderId;
}
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml
index 947d321de..ea2509216 100644
--- a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml
@@ -115,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.ORIGIN_COUNTRY, a.BOX_PALLET_NO, a.CURRENCY, a.UNIT, a.DECLARED_QUANTITY, a.BOX_COUNT, a.PIECE_COUNT, a.INBOUND_QUANTITY,
a.TOTAL_NET_WEIGHT, a.TOTAL_GROSS_WEIGHT, a.TOTAL_VOLUME, a.TOTAL_AREA, a.TOTAL_PRICE,
a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_1, a.EXT_ATTR_2, a.EXT_ATTR_3, a.EXT_ATTR_4
+ a.OMS_IN_MATERIAL_DETAIL
,CASE
WHEN (a.quantity - a.receipt_quantity) < 0 THEN 0
ELSE (a.quantity - a.receipt_quantity)
diff --git a/mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml
index c66d39a69..b80f63648 100644
--- a/mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml
@@ -88,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -119,7 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ifnull(a.EXT_ATTR_1, b.EXT_ATTR_1) EXT_ATTR_1,
ifnull(a.EXT_ATTR_2, b.EXT_ATTR_2) EXT_ATTR_2,
ifnull(a.EXT_ATTR_3, b.EXT_ATTR_3) EXT_ATTR_3,
- ifnull(a.EXT_ATTR_4, b.EXT_ATTR_4) EXT_ATTR_4
+ ifnull(a.EXT_ATTR_4, b.EXT_ATTR_4) EXT_ATTR_4,
+ a.OMS_IN_MATERIAL_DETAIL
from RECEIPT_MATERIAL_DETAIL a
LEFT JOIN IN_MATERIAL_DETAIL b ON a.IN_UNIQUE_ID = b.UNIQUE_ID AND b.DEL_FLAG = 1
LEFT JOIN MATERIAL_BASE_INFO c ON a.MATERIAL_BASE_INFO_ID = c.MATERIAL_BASE_INFO_ID AND c.DEL_FLAG = 1