From ed8d3fafd9ee17fb13cd5b3b5ce8053e8eaad406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Mon, 6 Jul 2026 17:23:23 +0800
Subject: [PATCH] bug;

---
 .../repository/listener/StockInExcelListener.java           | 2 +-
 .../repository/persistence/ReservationStockInOrderImpl.java | 4 ++++
 .../service/ReserveStockInOrderDomainService.java           | 6 +++---
 .../service/ReserveStockOutOrderDomainService.java          | 6 +++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/StockInExcelListener.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/StockInExcelListener.java
index c9ca998ce..e88ff7fc9 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/StockInExcelListener.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/StockInExcelListener.java
@@ -78,7 +78,7 @@ public class StockInExcelListener extends AnalysisEventListener<Map<String, Obje
      */
     private void parseHeaderData(Map<String, Object> data) {
         // 入库日期：查找包含"入库日期"标签的下一个值
-        Object stockInDateObj = getValueAfterLabel(data, "入库日期");
+        Object stockInDateObj = getValueAfterLabel(data, "入庫日期：");
         if (stockInDateObj != null) {
             Date stockInDate = convertToDate(stockInDateObj);
             stockInHeader.setStockInDate(stockInDate);
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 67f9b4558..795e9bbee 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
@@ -241,6 +241,8 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         reservationStockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
         reservationStockOutOrderDO.setBusinessType("pu_tong_chu_ku");
         reservationStockOutOrderDO.setOrderTypeName("普通出库");
+        reservationStockOutOrderDO.setPriorityLevelCode("yi_ban");
+        reservationStockOutOrderDO.setPriorityLevelName("一般");
         DeliveryHeader deliveryHeader = deliveryDataDTO.getDeliveryHeader();
         reservationStockOutOrderDO.setTotalAmount(deliveryHeader.getSubtotalAmount());
         reservationStockOutOrderDO.setRoute(deliveryHeader.getDeliveryLineNo());
@@ -381,6 +383,8 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         reservationStockInOrderDO.setDocumentDate(new Date());
         reservationStockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
         reservationStockInOrderDO.setOrderTypeName("普通入库");
+        reservationStockInOrderDO.setPriorityLevelCode("yi_ban");
+        reservationStockInOrderDO.setPriorityLevelName("一般");
         reservationStockInOrderDO.setIssueStatus(0);
         reservationStockInOrderDO.setSalesmanId(loginUser.getUserPo().getUserId().toString());
         reservationStockInOrderDO.setSalesmanName(loginUser.getUserPo().getUserName());
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
index 4c5093170..bb96ef266 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
@@ -121,7 +121,7 @@ public class ReserveStockInOrderDomainService {
         BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockInOrderDO.setVolumeLimit(volumeLimit);
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
+        stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
 //        stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
 //        stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         stockInOrderService.insert(stockInOrderDO);
@@ -150,7 +150,7 @@ public class ReserveStockInOrderDomainService {
 //            BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 //            stockInOrderDO.setVolumeLimit(volumeLimit);
             LoginUser loginUser = SecurityUtils.getLoginUser();
-            stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
+            stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
 //            stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
 //            stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
             stockInOrderService.insert(stockInOrderDO);
@@ -183,7 +183,7 @@ public class ReserveStockInOrderDomainService {
         BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockInOrderDO.setVolumeLimit(volumeLimit);
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
+        stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
 //        stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
 //        stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         stockInOrderService.update(stockInOrderDO);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
index d94e83762..04d511c1d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
@@ -105,7 +105,7 @@ public class ReserveStockOutOrderDomainService {
             stockOutOrderDO.setCheckTaskDistribution(2);
         }
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
+        stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
 //        stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
 //        stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         stockOutOrderService.insert(stockOutOrderDO);
@@ -139,7 +139,7 @@ public class ReserveStockOutOrderDomainService {
                 stockOutOrderDO.setCheckTaskDistribution(2);
             }
             LoginUser loginUser = SecurityUtils.getLoginUser();
-            stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
+            stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
 //            stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
 //            stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
             stockOutOrderService.insert(stockOutOrderDO);
@@ -170,7 +170,7 @@ public class ReserveStockOutOrderDomainService {
         BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(ReserveOutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockOutOrderDO.setVolumeLimit(volumeLimit);
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
+        stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
 //        stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
 //        stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         stockOutOrderService.update(stockOutOrderDO);