From 9f70b236a02a0839b166802288797f18b846319b Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Wed, 22 Jul 2026 21:35:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/ReservationStockInOrderImpl.java      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
index 97f6f761d..3e571056c 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
@@ -219,7 +219,10 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         }
 
         ReservationStockOutOrderDO reservationStockOutOrderDO = new ReservationStockOutOrderDO();
-        reservationStockOutOrderDO.setOutOrderNumber(OrderSequence.getOrderCode("CK"));
+        // 生成出库业务单号
+        String orderNumber = reservationStockOutOrderApplicationService.generateReserveOrderNumber();
+        reservationStockOutOrderDO.setOutOrderNumber(orderNumber);
+        reservationStockOutOrderDO.setBusinessOrderNo(orderNumber);
         // 货主信息：有货品明细时从解析结果取，无货品明细时从登录用户取
         if (!shipperIds.isEmpty()) {
             reservationStockOutOrderDO.setShipperId((Long) shipperIds.get(0).get("shipperId"));
@@ -376,7 +379,10 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
             }
         }
         ReservationStockInOrderDO reservationStockInOrderDO = new ReservationStockInOrderDO();
-        reservationStockInOrderDO.setInOrderNumber(OrderSequence.getOrderCode("RK"));
+        // 生成业务单号
+        String orderNumber = reservationStockInOrderDomainService.generateReserveOrderNumber();
+        reservationStockInOrderDO.setInOrderNumber(orderNumber);
+        reservationStockInOrderDO.setBusinessOrderNo(orderNumber);
         reservationStockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
         reservationStockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         reservationStockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -402,7 +408,6 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         reservationStockInOrderDO.setWarehouseDate(stockInHeader.getStockInDate());
         reservationStockInOrderDO.setStorageTime(stockInHeader.getStockInDate());
         reservationStockInOrderDO.setExpectTime(stockInHeader.getStockInDate());
-        reservationStockInOrderDO.setBusinessOrderNo(stockInHeader.getOrderNo());
         reservationStockInOrderDO.setReservationOrderSource("数据导入");
         List<ReservationInMaterialDetailDO> reservationInMaterialDetailDOList = new ArrayList<>();
         int index = 1;