From 5d748a9ac6998fdf9b12df7de109e9943acf6460 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Tue, 8 Sep 2026 09:28:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=20=E5=85=A5=E5=BA=93=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E6=96=B0=E5=A2=9E=E6=97=B6=E7=94=A8businessT?=
 =?UTF-8?q?ype=E5=9B=9E=E5=A1=AB=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=80=80=E8=B4=A7=E5=8D=95=E8=A2=AB?=
 =?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

---
 .../service/ExecutionStockInOrderAssembler.java       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderAssembler.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderAssembler.java
index b8150096d..efe87076d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderAssembler.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderAssembler.java
@@ -92,9 +92,14 @@ public class ExecutionStockInOrderAssembler {
             stockInOrderDO.setCreateTime(new Date());
             stockInOrderDO.setDelFlag(1);
             // 新增入库单时，如果入库单类型为空，默认设置为普通入库
-            String orderTypeCode = stockInOrderDO.getOrderTypeCode();
-            if (orderTypeCode == null || orderTypeCode.trim().length() == 0) {
-                stockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
+            // 前端新增只传业务类型(businessType)不传单据类型时，先用业务类型回填单据类型编码，
+            // 否则退货单会被兜底成pu_tong_ru_ku，再被setDataDict按字典反查覆盖成"普通入库"
+            if (stockInOrderDO.getOrderTypeCode() == null || stockInOrderDO.getOrderTypeCode().trim().length() == 0) {
+                if (stockInOrderDO.getBusinessType() != null && stockInOrderDO.getBusinessType().trim().length() > 0) {
+                    stockInOrderDO.setOrderTypeCode(stockInOrderDO.getBusinessType().trim());
+                } else {
+                    stockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
+                }
             }
             String orderTypeName = stockInOrderDO.getOrderTypeName();
             if (orderTypeName == null || orderTypeName.trim().length() == 0) {