From 7d4b3852ea8a170421c2ccb022ebaa4da2d7787b Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Mon, 1 Jun 2026 19:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/pickingOrder/repository/po/PickingOrderPO.java   | 3 +++
 .../domain/pickingOrder/repository/todo/PickingOrderDO.java | 3 +++
 .../wms/interfaces/dto/pickingOrder/PickingOrderDTO.java    | 3 +++
 .../resources/mapper/pickingOrder/PickingOrderMapper.xml    | 6 ++++++
 4 files changed, 15 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java
index d97950c84..6721e7bb2 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java
@@ -159,4 +159,7 @@ public class PickingOrderPO extends StockOutOrderBasePO {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+
+    @ApiModelProperty("是否报关")
+    private String needDeclareFlag;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
index 858f13adc..15c9d1428 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
@@ -206,4 +206,7 @@ public class PickingOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+
+    @ApiModelProperty("是否报关")
+    private String needDeclareFlag;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java
index 5c20ebf3e..5294c2bee 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java
@@ -174,4 +174,7 @@ public class PickingOrderDTO extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+
+    @ApiModelProperty("是否报关")
+    private String needDeclareFlag;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
index 470bfba95..c162f8537 100644
--- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderTypeName"    column="order_type_name"    />
         <result property="priorityLevelCode"    column="priority_level_code"    />
         <result property="priorityLevelName"    column="priority_level_name"    />
+        <result property="needDeclareFlag"    column="need_declare_flag"    />
     </resultMap>
 
 
@@ -108,12 +109,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
             <otherwise> and a.del_flag = 1 </otherwise>
         </choose>
+        <if test="needDeclareFlag != null  and needDeclareFlag != ''">
+            and b.need_declare_flag = #{needDeclareFlag}
+        </if>
     </sql>
 
     <select id="queryList" parameterType="com.mhd.wms.domain.pickingOrder.repository.todo.PickingOrderDO" resultMap="PickingOrderResult">
         select
             <include refid="selectPickingOrderPo"/>
+        ,b.need_Declare_Flag
         from picking_order a
+         left join STOCK_OUT_ORDER b ON a.order_number = b.out_Order_number
         <where>
             <include refid="selectPickingOrderPo1"/>
         </where>