From 76a5c987b2f17e5f835f7ec7d7e7d1e362094288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 31 Jul 2026 15:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E8=80=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ReserveStockInOrderApplicationService.java       | 2 +-
 .../service/ReserveStockOutOrderApplicationService.java      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
index e0c259eff..cbf30e381 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
@@ -2201,7 +2201,7 @@ public class ReserveStockInOrderApplicationService {
             // 组装入库预约单
             ReserveStockInOrderDO stockInOrderDO = new ReserveStockInOrderDO();
             stockInOrderDO.setInOrderNumber(orderNumber);
-            stockInOrderDO.setBusinessOrderNo(generateDateTimeWithRandom());
+            stockInOrderDO.setBusinessOrderNo(orderNumber);
             // 老系统历史数据，状态直接置为最终状态：已入库、审核通过、已完成
             stockInOrderDO.setStatus(5);
             stockInOrderDO.setAuditStatus(3);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java
index 3d69b9552..4dc2f9a89 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java
@@ -1240,7 +1240,8 @@ public class ReserveStockOutOrderApplicationService {
                 materialDetail.setTotalGrossWeight(detailRow.getWeight());
                 // 保留老系统关联的入库单号到备注
                 if (StringUtils.isNotBlank(detailRow.getInOrderNumber())) {
-                    materialDetail.setRemark("老系统入库单号：" + detailRow.getInOrderNumber());
+//                    materialDetail.setRemark("老系统入库单号：" + detailRow.getInOrderNumber());
+                    materialDetail.setInOrderNumber(detailRow.getInOrderNumber());
                 }
                 materialDetail.setContractFee(BigDecimal.ZERO);
                 materialDetail.setLotNo(generateDateSerialNumber() + "-" + lotIndex);
@@ -1261,7 +1262,7 @@ public class ReserveStockOutOrderApplicationService {
             // 组装出库预约单
             ReserveStockOutOrderDO stockOutOrderDO = new ReserveStockOutOrderDO();
             stockOutOrderDO.setOutOrderNumber(orderNumber);
-            stockOutOrderDO.setBusinessOrderNo(generateDateTimeWithRandom());
+            stockOutOrderDO.setBusinessOrderNo(orderNumber);
             // 老系统历史数据，状态直接置为最终状态：已出库、审核通过
             stockOutOrderDO.setStatus(9);
             stockOutOrderDO.setAuditStatus(3);