From 02acda9e230ded160def3163cfb2f26b67339a29 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 19:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/ExecutionStockInOrderImpl.java     |  1 +
 .../ExecutionStockInOrderApplicationService.java   | 14 +++++++-------
 .../ExecutionStockOutOrderApplicationService.java  |  1 +
 .../persistence/ReservationStockInOrderImpl.java   |  1 +
 .../ReservationStockInOrderDomainService.java      |  2 ++
 ...ReservationStockOutOrderApplicationService.java |  1 +
 .../ReservationStockOutOrderDomainService.java     |  2 ++
 .../service/ReserveStockInOrderDomainService.java  |  1 +
 .../ReserveStockOutOrderApplicationService.java    |  1 +
 .../service/ReserveStockOutOrderDomainService.java |  1 +
 .../StockOutOrderApplicationService.java           |  1 +
 .../repository/listener/ExcelParseService.java     |  3 +++
 12 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/persistence/ExecutionStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/persistence/ExecutionStockInOrderImpl.java
index d7111a4f8..3aa3ad397 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/persistence/ExecutionStockInOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/persistence/ExecutionStockInOrderImpl.java
@@ -357,6 +357,7 @@ public class ExecutionStockInOrderImpl extends ServiceImpl<ExecutionStockInOrder
         reservationStockInOrderDO.setDocumentDate(new Date());
         reservationStockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
         reservationStockInOrderDO.setOrderTypeName("普通入库");
+        reservationStockInOrderDO.setBusinessType("pu_tong_ru_ku");
         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/executionStockInOrder/service/ExecutionStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderApplicationService.java
index ae93c9855..46a751e43 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderApplicationService.java
@@ -132,13 +132,13 @@ public class ExecutionStockInOrderApplicationService {
                 }
             }
             // 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值
-            if (stockInOrderDO.getWarehouseId() == null) {
-                AssociationWarehouseCacheDO associationWarehouseCacheDO =
-                        SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-                if (associationWarehouseCacheDO != null) {
-                    stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
-                }
-            }
+//            if (stockInOrderDO.getWarehouseId() == null) {
+//                AssociationWarehouseCacheDO associationWarehouseCacheDO =
+//                        SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
+//                if (associationWarehouseCacheDO != null) {
+//                    stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+//                }
+//            }
         }
 
         // 库管角色过滤：不展示已创建（status=1）的入库单
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderApplicationService.java
index 32832e0ac..f28d93192 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderApplicationService.java
@@ -235,6 +235,7 @@ public class ExecutionStockOutOrderApplicationService {
         //设置客户信息
         //customerParam(stockOutOrderDO);
         stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
+        stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
         stockOutOrderDO.setOrderTypeName("普通出库");
         //设置数据字典键值
         //setDataDict(stockOutOrderDO);
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 795e9bbee..0ee86bf18 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
@@ -383,6 +383,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
         reservationStockInOrderDO.setDocumentDate(new Date());
         reservationStockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
         reservationStockInOrderDO.setOrderTypeName("普通入库");
+        reservationStockInOrderDO.setBusinessType("pu_tong_ru_ku");
         reservationStockInOrderDO.setPriorityLevelCode("yi_ban");
         reservationStockInOrderDO.setPriorityLevelName("一般");
         reservationStockInOrderDO.setIssueStatus(0);
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 484013a32..48da47d00 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
@@ -519,6 +519,7 @@ public class ReservationStockInOrderDomainService {
                 reservationStockInOrder.setIssueStatus(0);
                 reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
                 reservationStockInOrder.setOrderTypeName("普通入库");
+                reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
                 reservationStockInOrder.setReservationOrderSource("客户预约");
                 reservationStockInOrder.setWarehouseId(warehouseId);
                 if (warehouseId == null || warehouseId == 0L){
@@ -681,6 +682,7 @@ public class ReservationStockInOrderDomainService {
                 reservationStockInOrder.setIssueStatus(0);
                 reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
                 reservationStockInOrder.setOrderTypeName("普通入库");
+                reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
                 reservationStockInOrder.setReservationOrderSource("客户预约");
                 reservationStockInOrder.setWarehouseId(warehouseId);
                 reservationStockInOrder.setOrganizationId(orgId);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
index 8cde20557..0c61a57cf 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
@@ -252,6 +252,7 @@ public class ReservationStockOutOrderApplicationService {
         //设置客户信息
         //customerParam(stockOutOrderDO);
         stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
+        stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
         stockOutOrderDO.setOrderTypeName("普通出库");
         //设置数据字典键值
         //setDataDict(stockOutOrderDO);
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 d018207f5..9807ea098 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
@@ -370,6 +370,7 @@ public class ReservationStockOutOrderDomainService {
                 reservationStockInOrder.setIssueStatus(0);
                 reservationStockInOrder.setOrderTypeCode("pu_tong_chu_ku");
                 reservationStockInOrder.setOrderTypeName("普通出库");
+                reservationStockInOrder.setBusinessType("pu_tong_chu_ku");
                 reservationStockInOrder.setReservationOrderSource("客户预约");
                 reservationStockInOrder.setWarehouseId(warehouseId);
                 reservationStockInOrder.setWarehouseCode(warehouseCode);
@@ -503,6 +504,7 @@ public class ReservationStockOutOrderDomainService {
                 reservationStockInOrder.setIssueStatus(0);
                 reservationStockInOrder.setOrderTypeCode("pu_tong_chu_ku");
                 reservationStockInOrder.setOrderTypeName("普通出库");
+                reservationStockInOrder.setBusinessType("pu_tong_chu_ku");
                 reservationStockInOrder.setReservationOrderSource("客户预约");
                 reservationStockInOrder.setWarehouseId(warehouseId);
                 reservationStockInOrder.setOrganizationId(orgId);
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 bb96ef266..fac864e88 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
@@ -462,6 +462,7 @@ public class ReserveStockInOrderDomainService {
         reservationStockInOrder.setIssueStatus(0);
         reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
         reservationStockInOrder.setOrderTypeName("普通入库");
+        reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
         reservationStockInOrder.setReservationOrderSource("客户预约");
         Long shipperId = reservationStockInOrder.getShipperId();
         String jsbz = reservationStockInOrderMapper.getJsbz(shipperId);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java
index f427cb81d..95cdd6c2f 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java
@@ -260,6 +260,7 @@ public class ReserveStockOutOrderApplicationService {
         //设置客户信息
         //customerParam(stockOutOrderDO);
         stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
+        stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
         stockOutOrderDO.setOrderTypeName("普通出库");
         //设置数据字典键值
         //setDataDict(stockOutOrderDO);
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 04d511c1d..b7eb92264 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
@@ -293,6 +293,7 @@ public class ReserveStockOutOrderDomainService {
         reservationStockOutOrder.setIssueStatus(0);
         reservationStockOutOrder.setOrderTypeCode("pu_tong_chu_ku");
         reservationStockOutOrder.setOrderTypeName("普通出库");
+        reservationStockOutOrder.setBusinessType("pu_tong_chu_ku");
         reservationStockOutOrder.setReservationOrderSource("客户预约");
         Long shipperId = reservationStockOutOrder.getShipperId();
         String jsbz = reservationStockInOrderMapper.getJsbz(shipperId);
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
index 7c07f7053..3487a1f13 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
@@ -300,6 +300,7 @@ public class StockOutOrderApplicationService {
         //设置客户信息
         customerParam(stockOutOrderDO);
         stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
+        stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
         stockOutOrderDO.setOrderTypeName("普通出库");
         //设置数据字典键值
         //setDataDict(stockOutOrderDO);
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java
index afaa73354..8fb6472db 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java
@@ -129,6 +129,9 @@ public class ExcelParseService {
         if (StringUtils.isBlank(stockOutOrder.getOrderTypeCode())) {
             stockOutOrder.setOrderTypeCode("pu_tong_chu_ku");
         }
+        if (StringUtils.isBlank(stockOutOrder.getBusinessType())) {
+            stockOutOrder.setBusinessType("pu_tong_chu_ku");
+        }
         if (StringUtils.isBlank(stockOutOrder.getOrderTypeName())) {
             stockOutOrder.setOrderTypeName("普通出库");
         }