From 6752441e720f4818b324daf6c2ca806be329447f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 12 Jun 2026 11:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=97=B6=E9=97=B4=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=8A=E6=98=AF=E5=90=A6=E6=8A=A5=E5=85=B3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/pickingOrder/PickingOrderApplicationService.java   | 2 +-
 .../resources/mapper/stockOutOrder/StockOutOrderMapper.xml     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
index d69e642c5..3210a0d91 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
@@ -808,7 +808,7 @@ public class PickingOrderApplicationService {
             // etpsPreentNo: 入库单号 - 取拣货明细中的入库单号（第一个）
             String inOrderNumber = outMaterialDetailList.get(0).getInOrderNumber();
             order.put("etpsPreentNo", inOrderNumber != null ? inOrderNumber : "");
-            order.put("inputTime", new Date());
+            order.put("inputTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             order.put("mtpckEndprdTypecd", "E"); // 成品（出口）
             order.put("stockTypecd", "I");
 
diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml
index 09dcc8f3e..cd290cd7f 100644
--- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml
@@ -148,6 +148,9 @@
         <if test="noticeNumber != null  and noticeNumber != ''">
             and a.notice_number = #{noticeNumber}
         </if>
+        <if test="needDeclareFlag != null  and needDeclareFlag != ''">
+            and a.need_declare_flag = #{needDeclareFlag}
+        </if>
         <if test="outOrderNumber != null  and outOrderNumber != ''">
             and a.out_order_number like concat('%', #{outOrderNumber}, '%')
         </if>