From be597775d958329c9d722076c83f3abe08a1eb76 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Tue, 21 Jul 2026 22:10:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/ReservationStockInOrderImpl.java | 6 +++++-
 .../service/ReservationStockInOrderDomainService.java       | 3 ++-
 .../service/ReservationStockOutOrderDomainService.java      | 3 ++-
 3 files changed, 9 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 ee11a2413..97f6f761d 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
@@ -32,6 +32,7 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfo
 import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.vo.*;
+import com.mhd.oms.domain.reservationStockInOrder.service.ReservationStockInOrderDomainService;
 import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.mapper.ReservationStockOutOrderMapper;
@@ -83,6 +84,8 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
     private SystemServiceFeign systemServiceFeign;
     @Autowired
     private IReservationInMaterialDetailService materialDetailService;
+    @Autowired
+    private ReservationStockInOrderDomainService reservationStockInOrderDomainService;
 
     /**
      * 查询入库单列表
@@ -469,7 +472,8 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertDomain(ReservationStockInOrderDO stockInOrderDO) {
         if (stockInOrderDO.getInOrderNumber() == null) {
-            stockInOrderDO.setInOrderNumber(OrderSequence.getOrderCode("RK"));
+            stockInOrderDO.setInOrderNumber(reservationStockInOrderDomainService.generateReserveOrderNumber());
+            stockInOrderDO.setBusinessOrderNo(stockInOrderDO.getInOrderNumber());
         }
 //        //统计总计划数
         BigDecimal quantity =  stockInOrderDO.getMaterialDetailList().stream().map(ReservationInMaterialDetailDO::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
index b827f61f8..5c8413c36 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
@@ -103,7 +103,8 @@ public class ReservationStockInOrderDomainService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean insert(ReservationStockInOrderDO stockInOrderDO) {
         if (stockInOrderDO.getInOrderNumber() == null) {
-            stockInOrderDO.setInOrderNumber(OrderSequence.getOrderCode("RK"));
+            stockInOrderDO.setInOrderNumber(generateReserveOrderNumber());
+            stockInOrderDO.setBusinessOrderNo(stockInOrderDO.getInOrderNumber());
         }
 //        //设置默认值
 //        setDefaultValues(stockInOrderDO);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
index 8663d6b39..4295d2b4d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
@@ -127,7 +127,8 @@ public class ReservationStockOutOrderDomainService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean insert(ReservationStockOutOrderDO stockOutOrderDO) {
         if (stockOutOrderDO.getOutOrderNumber() == null) {
-            stockOutOrderDO.setOutOrderNumber(OrderSequence.getOrderCode("CK"));
+            stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber());
+            stockOutOrderDO.setBusinessOrderNo(stockOutOrderDO.getOutOrderNumber());
         }
         // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity
         setMaterialDetailInfo(stockOutOrderDO);