From f149b7322dfdd5c5ef5ebb7246ac9a5ca771a17f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Mon, 9 Feb 2026 09:43:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=87=BA=E5=BA=93=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockInOrder/StockInOrderApplicationService.java     | 7 +++++++
 .../repository/listener/ExcelParseService.java           | 7 +++++++
 .../assember/stockInOrder/StockInOrderAssembler.java     | 9 +++++++++
 3 files changed, 23 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
index fe4bfedb0..9058a6ffc 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
@@ -1094,6 +1094,13 @@ public class StockInOrderApplicationService {
 //                order.setOrderTypeCode(h.getOrderTypeCode());
                 order.setConsignmentNo(h.getConsignmentNo());
                 order.setRemark(h.getRemark());
+                // 导入入库单时，如果入库单类型为空，默认设置为普通入库
+                if (StringUtils.isBlank(order.getOrderTypeCode())) {
+                    order.setOrderTypeCode("pu_tong_ru_ku");
+                }
+                if (StringUtils.isBlank(order.getOrderTypeName())) {
+                    order.setOrderTypeName("普通入库单");
+                }
 
                 // 报关表头字段（优先使用表头字段，如果表头为空则使用明细行字段）
                 order.setTo(StringUtils.isNotBlank(headerInfo.getTo()) ? headerInfo.getTo() : h.getTo());
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 14d180ac2..237ecc575 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
@@ -115,6 +115,13 @@ public class ExcelParseService {
             stockOutOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         }
         initParam(stockOutOrder);
+        // 导入出库单时，如果出库单类型为空，默认设置为普通出库
+        if (StringUtils.isBlank(stockOutOrder.getOrderTypeCode())) {
+            stockOutOrder.setOrderTypeCode("pu_tong_chu_ku");
+        }
+        if (StringUtils.isBlank(stockOutOrder.getOrderTypeName())) {
+            stockOutOrder.setOrderTypeName("普通出库");
+        }
         //设置创建时间和创建人信息
         if (loginUser != null) {
             stockOutOrder.setCreateBy(loginUser.getUserid());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java
index e9ad9f229..b2fd38df6 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java
@@ -69,6 +69,15 @@ public class StockInOrderAssembler {
             stockInOrderDO.setCreateByName(userName);
             stockInOrderDO.setCreateTime(new Date());
             stockInOrderDO.setDelFlag(1);
+            // 新增入库单时，如果入库单类型为空，默认设置为普通入库
+            String orderTypeCode = stockInOrderDO.getOrderTypeCode();
+            if (orderTypeCode == null || orderTypeCode.trim().length() == 0) {
+                stockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
+            }
+            String orderTypeName = stockInOrderDO.getOrderTypeName();
+            if (orderTypeName == null || orderTypeName.trim().length() == 0) {
+                stockInOrderDO.setOrderTypeName("普通入库单");
+            }
         }
         return stockInOrderDO;
     }