From b825f1a789504b25a99a2f86e04522b3fc0d33da Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Tue, 21 Jul 2026 18:51:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=E5=85=A5=E5=BA=93=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ExecutionStockInOrderMapper.java   |  1 +
 .../ReservationStockInOrderDomainService.java | 33 +++++++++++++------
 .../ExecutionStockInOrderMapper.xml           |  6 ++++
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/mapper/ExecutionStockInOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/mapper/ExecutionStockInOrderMapper.java
index a83ad2a97..e2621b868 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/mapper/ExecutionStockInOrderMapper.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/mapper/ExecutionStockInOrderMapper.java
@@ -68,4 +68,5 @@ public interface ExecutionStockInOrderMapper extends BaseMapper<ExecutionStockIn
 
     String getNcUrl(@Param("interfaceType") String interfaceType,@Param("organizationName") String organizationName,@Param("organizationId") Long organizationId);
 
+    int countByOrderNumberPrefix(@Param("prefix") String prefix);
 }
\ No newline at end of file
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 b8313f252..ae877f85c 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
@@ -17,6 +17,7 @@ import com.mhd.oms.domain.executionInMaterialDetail.entity.ExecutionInMaterialDe
 import com.mhd.oms.domain.executionInMaterialDetail.repository.facade.IExecutionInMaterialDetailService;
 import com.mhd.oms.domain.executionStockInOrder.entity.ExecutionStockInOrder;
 import com.mhd.oms.domain.executionStockInOrder.repository.facade.IExecutionStockInOrderService;
+import com.mhd.oms.domain.executionStockInOrder.repository.mapper.ExecutionStockInOrderMapper;
 import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO;
 import com.mhd.oms.domain.executionStockInOrder.service.ExecutionStockInOrderApplicationService;
 import com.mhd.oms.domain.reservationInMaterialDetail.entity.ReservationInMaterialDetail;
@@ -85,6 +86,8 @@ public class ReservationStockInOrderDomainService {
     private ExecutionStockInOrderApplicationService stockInOrderApplicationService;
     @Autowired
     private BusinessDocumentOrderMapper businessDocumentOrderMapper;
+    @Autowired
+    private ExecutionStockInOrderMapper executionStockInOrderMapper;
 
     /**
      * 分页查询入库单列表
@@ -534,11 +537,10 @@ public class ReservationStockInOrderDomainService {
                 reservationStockInOrder.setWarehouseCode(warehouseCode);
                 reservationStockInOrder.setWarehouseName(warehouseName);
                 reservationStockInOrder.setBusinessInOrderNumber(inOrderNumber);
-                if (materialDetailGroupByWarehouse!=null&&materialDetailGroupByWarehouse.size()>1) {
-                    reservationStockInOrder.setInOrderNumber(OrderSequence.getOrderCode("RK"));
-                } else {
-                    reservationStockInOrder.setInOrderNumber(inOrderNumber);
-                }
+                reservationStockInOrder.setInOrderNumber(generateExecutionOrderNumber(warehouseCode));
+                // 原本 businessOrderNo 通过 BeanUtils.copyProperties 从预约单拷贝，现改为与执行单号一致
+                // reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo());
+                reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getInOrderNumber());
 
                 List<ExecutionInMaterialDetail> inMaterialDetailList  = new ArrayList<>();
                 int index = 1;
@@ -691,11 +693,10 @@ public class ReservationStockInOrderDomainService {
                 reservationStockInOrder.setWarehouseCode(warehouseCode);
                 reservationStockInOrder.setWarehouseName(warehouseName);
                 reservationStockInOrder.setBusinessInOrderNumber(inOrderNumber);
-                if (materialDetailGroupByWarehouse!=null&&materialDetailGroupByWarehouse.size()>1) {
-                    reservationStockInOrder.setInOrderNumber(OrderSequence.getOrderCode("RK"));
-                } else {
-                    reservationStockInOrder.setInOrderNumber(inOrderNumber);
-                }
+                reservationStockInOrder.setInOrderNumber(generateExecutionOrderNumber(warehouseCode));
+                // 原本 businessOrderNo 通过 BeanUtils.copyProperties 从预约单拷贝，现改为与执行单号一致
+                // reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo());
+                reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getInOrderNumber());
 
                 List<ExecutionInMaterialDetail> inMaterialDetailList  = new ArrayList<>();
                 int index = 1;
@@ -1212,4 +1213,16 @@ public class ReservationStockInOrderDomainService {
         return stockInOrderService.queryNoticePrintDetail(stockInOrderDO);
     }
 
+    /**
+     * 生成执行入库单号：仓库代码简称 + YYMMDD + 当日累加（3位，不足补零）
+     */
+    public String generateExecutionOrderNumber(String warehouseCode) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
+        String datePart = sdf.format(new Date());
+        String prefix = warehouseCode + datePart;
+        int todayCount = executionStockInOrderMapper.countByOrderNumberPrefix(prefix);
+        String seq = String.format("%03d", todayCount + 1);
+        return prefix + seq;
+    }
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml
index cab60f61c..e71996c13 100644
--- a/mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml
@@ -650,4 +650,10 @@
     <update id="delWShOrderDetail">
         update "NGWL_TEST_WMS".RECEIPT_MATERIAL_DETAIL set DEL_FLAG = 2 where DEL_FLAG = 1 and RECEIPT_ORDER_NUMBER = #{receiptOrderNumber}
     </update>
+
+    <select id="countByOrderNumberPrefix" resultType="java.lang.Integer" parameterType="java.lang.String">
+        SELECT COUNT(1)
+        FROM execution_stock_in_order
+        WHERE in_order_number LIKE concat(#{prefix}, '%')
+    </select>
 </mapper>
\ No newline at end of file