From 76d95c1b2dfae8cdbbb6b8bfea0dd045ac140aef Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Thu, 27 Aug 2026 14:10:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(oms):=E5=85=A5=E5=BA=93=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BFOrderNO=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=AA=E4=BD=9C=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=A0=BC=E5=BC=8F=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=8C=89=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E9=87=8D=20=E9=9C=80=E6=B1=82=EF=BC=9A=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=A1=A8=E6=A0=BCOrderNO=E5=80=BC=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E5=88=B0=E5=AD=97=E6=AE=B5"=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7"=EF=BC=9B"=E5=85=A5=E5=BA=93=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E5=8F=B7"=E4=BB=8D=E7=94=B1=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=20=E5=8E=9F=E6=9C=AC=E9=80=BB=E8=BE=91=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=EF=BC=9B=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=8D=E5=85=81=E8=AE=B8=E5=AF=BC=E5=85=A5=E5=B9=B6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA"=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8"=EF=BC=9B=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=8D=95=E5=8F=B7=20=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E7=8E=B0=E6=9C=89=E7=B3=BB=E7=BB=9F=E9=80=BB=E8=BE=91=EF=BC=9B?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7=E5=8E=BB=E6=8E=89=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=A0=A1=E9=AA=8C=E3=80=82=20=E4=B8=80=E3=80=81?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B5=81=E7=A8=8B(ReservationStockInOrderImp?=
 =?UTF-8?q?l.parseStockInExcel)=EF=BC=9A=20=20=20=201.=20=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BFOrderNO=E5=8F=AA=E5=86=99=E5=85=A5=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7(business=5Forder=5Fno)=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E5=90=8C=E6=97=B6=E4=BD=9C=E4=B8=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7=20=20=20=202.=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4validateTemplateOrderNo=E6=A0=BC=E5=BC=8F=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=A0=A1=E9=AA=8C(R+=E5=B9=B4=E6=9C=88=E6=97=A5+3?=
 =?UTF-8?q?=E4=BD=8D=E5=BA=8F=E5=8F=B7)=EF=BC=8C=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E4=B8=8D=E5=86=8D=E9=99=90=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=20=20=20=203.=20=E6=9F=A5=E9=87=8D=E7=94=B1=E6=8C=89in=5Forder?=
 =?UTF-8?q?=5Fnumber=E8=B7=A8=E4=B8=A4=E8=A1=A8=E6=94=B9=E4=B8=BA=E6=8C=89?=
 =?UTF-8?q?business=5Forder=5Fno=E6=9F=A5=E5=85=A5=E5=BA=93=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E8=A1=A8=EF=BC=8C=20=20=20=20=20=20=20Mapper?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EexistsByBusinessOrderNo=EF=BC=9B=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=97=B6=E6=8A=A5"=E4=B8=9A=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E5=B7=B2=E5=AD=98=E5=9C=A8=EF=BC=9Axxx=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=B7=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=AD=E7=9A=84OrderNO=E5=90=8E=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5"=20=20=20=204.=20=E5=85=A5=E5=BA=93=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E5=8F=B7(in=5Forder=5Fnumber)=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E7=94=B1insertDomain=E6=8C=89=E5=8E=9F=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E7=94=9F=E6=88=90=20=20=20=20=20=20=20(R+=E5=B9=B4?=
 =?UTF-8?q?=E6=9C=88=E6=97=A5+=E5=BD=93=E6=97=A5=E7=B4=AF=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=8C=E8=B7=A8reservation/reserve=E4=B8=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=96=E5=8F=B7=E9=98=B2=E6=92=9E)=20=E4=BA=8C=E3=80=81inser?=
 =?UTF-8?q?tDomain=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BB=85=E5=9C=A8=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=3D=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=B8=A6=E6=A8=A1=E6=9D=BF=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E6=97=B6=E4=B8=8D=E8=A6=86=E7=9B=96=EF=BC=9B=20=20=20?=
 =?UTF-8?q?=20=E6=A8=A1=E6=9D=BF=E6=9C=AA=E5=A1=AB=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E7=8E=B0=E6=9C=89=E9=80=BB=E8=BE=91=E3=80=82?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=8B=E5=B7=A5=E6=96=B0=E5=A2=9E(DomainSe?=
 =?UTF-8?q?rvice.insert)=E4=B8=8E=E5=AE=A2=E6=88=B7=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=20=20=20=20(ReserveStockInOrderDomainService?=
 =?UTF-8?q?)=E4=B8=BA=E7=8B=AC=E7=AB=8B=E9=93=BE=E8=B7=AF=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=97=E5=BD=B1=E5=93=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ReservationStockInOrderMapper.java |  2 +
 .../ReservationStockInOrderImpl.java          | 51 +++++--------------
 .../ReservationStockInOrderMapper.xml         |  5 ++
 3 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
index 8f6078a99..2d23240eb 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
@@ -77,4 +77,6 @@ public interface ReservationStockInOrderMapper extends BaseMapper<ReservationSto
     List<String> generateReserveOrderNumber1(@Param("prefix") String prefix);
 
     int existsByOrderNumber(@Param("inOrderNumber") String inOrderNumber);
+
+    int existsByBusinessOrderNo(@Param("businessOrderNo") String businessOrderNo);
 }
\ No newline at end of file
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 26d21686d..5116ef9b0 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
@@ -486,25 +486,17 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         }
         ReservationStockInOrderDO reservationStockInOrderDO = new ReservationStockInOrderDO();
         StockInHeader stockInHeader = resultDTO.getStockInHeader();
-        // 业务单号：优先使用模板自带OrderNO，与系统已有入库业务单号重复时提示；
-        // 模板未填单号时按 R+年月日+当日累加 规则生成（如R260717001、R260717002）
+        // 业务单号：优先使用模板自带OrderNO（不做格式规则校验），与系统已有业务单号重复时提示不允许导入；
+        // 入库业务单号(in_order_number)不使用模板单号，统一由系统原本逻辑生成（见insertDomain）；
+        // 模板未填单号时保持系统逻辑：业务单号默认=入库业务单号
         String templateOrderNo = stockInHeader.getOrderNo() == null ? "" : stockInHeader.getOrderNo().trim();
         if (!templateOrderNo.isEmpty()) {
-            // 先校验模板单号是否符合规则：R+年月日+3位及以上序号，如R260717001
-            validateTemplateOrderNo(templateOrderNo);
-            // 跨两张入库单表查重（与手工新增取号逻辑保持一致）
-            // 注意：本类字段命名易混淆——stockInOrderMapper为reservation表，reservationStockInOrderMapper为reserve表
-            boolean duplicated = stockInOrderMapper.existsByOrderNumber(templateOrderNo) > 0
-                    || reservationStockInOrderMapper.countByInOrderNumber(templateOrderNo) > 0;
-            if (duplicated) {
-                throw new ServiceException("入库业务单号已存在：" + templateOrderNo + "，请修改模板中的OrderNO后重新导入");
+            // 按业务单号查重（入库业务单表 business_order_no 字段）
+            if (stockInOrderMapper.existsByBusinessOrderNo(templateOrderNo) > 0) {
+                throw new ServiceException("业务单号已存在：" + templateOrderNo + "，请修改模板中的OrderNO后重新导入");
             }
+            reservationStockInOrderDO.setBusinessOrderNo(templateOrderNo);
         }
-        if (templateOrderNo.isEmpty()) {
-            templateOrderNo = reservationStockInOrderDomainService.generateReserveOrderNumber();
-        }
-        reservationStockInOrderDO.setInOrderNumber(templateOrderNo);
-        reservationStockInOrderDO.setBusinessOrderNo(templateOrderNo);
         reservationStockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
         reservationStockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         reservationStockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -597,25 +589,6 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
     }
 
 
-    /**
-     * 校验模板自带业务单号是否符合规则：R + 年月日(yyMMdd) + 3位及以上序号
-     * 示例：R260717001、R260717002
-     * 格式不符或年月日部分非有效日期（如R261332001）时抛出提示
-     */
-    private void validateTemplateOrderNo(String orderNo) {
-        // R + 6位年月日 + 至少3位数字序号
-        if (!orderNo.matches("R\\d{9,}")) {
-            throw new ServiceException("入库业务单号格式不正确：正确格式为R+年月日+3位序号，如R260717001");
-        }
-        try {
-            SimpleDateFormat fmt = new SimpleDateFormat("yyMMdd");
-            fmt.setLenient(false);
-            fmt.parse(orderNo.substring(1, 7));
-        } catch (java.text.ParseException e) {
-            throw new ServiceException("入库业务单号格式不正确：正确格式为R+年月日+3位序号，如R260717001");
-        }
-    }
-
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertDomain(ReservationStockInOrderDO stockInOrderDO) {
         // 仓库信息校验（保留原有行为：仓库信息获取失败直接报错）
@@ -624,12 +597,16 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         if (!"200".equals(String.valueOf(ajaxResult.get("code")))) {
             throw new ServiceException("获取仓库信息失败");
         }
-        // 入库单号：调用方已设置（如导入时优先使用模板自带OrderNO，且已校验不重复）则沿用，不再覆盖；
-        // 未设置时按 R+年月日+当日累加 规则生成（如R260717001、R260717002），跨reservation/reserve两表取号防撞
+        // 入库单号：调用方未设置时按 R+年月日+当日累加 规则生成（如R260717001、R260717002），
+        // 跨reservation/reserve两表取号防撞；导入时不再使用模板OrderNO作为入库单号（模板单号只作业务单号）
         if (stockInOrderDO.getInOrderNumber() == null || stockInOrderDO.getInOrderNumber().trim().isEmpty()) {
             stockInOrderDO.setInOrderNumber(reservationStockInOrderDomainService.generateReserveOrderNumber());
         }
-        stockInOrderDO.setBusinessOrderNo(stockInOrderDO.getInOrderNumber());
+        // 业务单号：未设置时默认=入库单号（模板未填OrderNO的导入及常规场景）；
+        // 导入且模板带OrderNO时由调用方已设置，此处沿用不覆盖
+        if (stockInOrderDO.getBusinessOrderNo() == null || stockInOrderDO.getBusinessOrderNo().trim().isEmpty()) {
+            stockInOrderDO.setBusinessOrderNo(stockInOrderDO.getInOrderNumber());
+        }
         //统计总计划数
         BigDecimal quantity =  stockInOrderDO.getMaterialDetailList().stream().map(ReservationInMaterialDetailDO::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockInOrderDO.setQuantity(quantity);
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 8d7578d06..19c04380f 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -688,4 +688,9 @@
     <select id="existsByOrderNumber" resultType="java.lang.Integer" parameterType="java.lang.String">
         SELECT COUNT(1) FROM reservation_stock_in_order WHERE in_order_number = #{inOrderNumber}
     </select>
+
+    <!-- 导入模板自带OrderNO按业务单号查重 -->
+    <select id="existsByBusinessOrderNo" resultType="java.lang.Integer" parameterType="java.lang.String">
+        SELECT COUNT(1) FROM reservation_stock_in_order WHERE business_order_no = #{businessOrderNo}
+    </select>
 </mapper>
\ No newline at end of file