From acbf7c9fdfadda1d4cc934a4ee9fd07082318bda Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Mon, 7 Sep 2026 16:56:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E8=B4=A7=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=8F=91=E6=97=B6=E6=89=A7=E8=A1=8C=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E7=B1=BB=E5=9E=8B=E8=A2=AB=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=86=99=E6=88=90=E6=99=AE=E9=80=9A=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReservationStockInOrderDomainService.java | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

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 bd8852799..8fbe068b6 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
@@ -620,9 +620,16 @@ public class ReservationStockInOrderDomainService {
                 // 执行单"运输业务单号"列永远显示入库业务单号（未选运输也显示）
                 BeanUtils.copyProperties(byId, reservationStockInOrder,"inOrderId","issueStatus","issueTime","issueId","issueName","reservationAuditId","reservationAuditName","reservationAuditTime","businessOrderNo","businessNumber","tmsOrderNumber");
                 reservationStockInOrder.setIssueStatus(0);
-                reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
-                reservationStockInOrder.setOrderTypeName("普通入库");
-                reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
+                // 退货入库单下发时类型跟随预约单，避免执行入库单被固定写成普通入库
+                if ("tui_huo_ru_ku".equals(byId.getOrderTypeCode()) || "退货入库".equals(byId.getOrderTypeName())) {
+                    reservationStockInOrder.setOrderTypeCode("tui_huo_ru_ku");
+                    reservationStockInOrder.setOrderTypeName("退货入库");
+                    reservationStockInOrder.setBusinessType("tui_huo_ru_ku");
+                } else {
+                    reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
+                    reservationStockInOrder.setOrderTypeName("普通入库");
+                    reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
+                }
                 reservationStockInOrder.setReservationOrderSource("客户预约");
                 reservationStockInOrder.setWarehouseId(warehouseId);
                 if (warehouseId == null || warehouseId == 0L){
@@ -851,9 +858,16 @@ public class ReservationStockInOrderDomainService {
                 // 运输业务单号不直接从业务单头复制，避免历史已取消运输单号残留下发到执行单
                 BeanUtils.copyProperties(byId, reservationStockInOrder,"inOrderId","issueStatus","issueTime","issueId","issueName","reservationAuditId","reservationAuditName","reservationAuditTime","businessOrderNo","businessNumber","tmsOrderNumber");
                 reservationStockInOrder.setIssueStatus(0);
-                reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
-                reservationStockInOrder.setOrderTypeName("普通入库");
-                reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
+                // 退货入库单下发时类型跟随预约单，避免执行入库单被固定写成普通入库
+                if ("tui_huo_ru_ku".equals(byId.getOrderTypeCode()) || "退货入库".equals(byId.getOrderTypeName())) {
+                    reservationStockInOrder.setOrderTypeCode("tui_huo_ru_ku");
+                    reservationStockInOrder.setOrderTypeName("退货入库");
+                    reservationStockInOrder.setBusinessType("tui_huo_ru_ku");
+                } else {
+                    reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
+                    reservationStockInOrder.setOrderTypeName("普通入库");
+                    reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
+                }
                 reservationStockInOrder.setReservationOrderSource("客户预约");
                 reservationStockInOrder.setWarehouseId(warehouseId);
 //                reservationStockInOrder.setOrganizationId(orgId);