From 9db78617fecc5c00daa6c2af348fc52bb21f517c Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Mon, 1 Jun 2026 18:36:56 +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

---
 .../stockShelfOrder/repository/po/StockShelfOrderPO.java     | 3 +++
 .../stockShelfOrder/repository/todo/StockShelfOrderDO.java   | 4 ++++
 .../interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java   | 3 +++
 .../resources/mapper/stockInOrder/StockInOrderMapper.xml     | 5 +++++
 .../mapper/stockShelfOrder/StockShelfOrderMapper.xml         | 1 +
 5 files changed, 16 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java
index 434ad9dd0..8e4fa9f9c 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java
@@ -139,4 +139,7 @@ public class StockShelfOrderPO extends StockInOrderBasePO {
     @Excel(name = "批次号")
     private String batchNo;
 
+
+    @ApiModelProperty("是否报关")
+    private Long needCustomsDeclaration;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
index 7c43fdc51..a5922b243 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
@@ -151,4 +151,8 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
     @ApiModelProperty("批次号")
     @Excel(name = "批次号")
     private String batchNo;
+
+    @ApiModelProperty("是否报关")
+    private Long needCustomsDeclaration;
+
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java
index bece64af4..7f434bd31 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java
@@ -140,4 +140,7 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO {
     @ApiModelProperty("批次号")
     @Excel(name = "批次号")
     private String batchNo;
+
+    @ApiModelProperty("是否报关")
+    private Long needCustomsDeclaration;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
index 3c3e82f8e..b899afa65 100644
--- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
@@ -137,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ,b.notice_number, b.warehouse_id, b.warehouse_code, b.warehouse_name, b.shipper_id, b.shipper_code, b.shipper_name,
         b.order_type_code, b.order_type_name, b.supplier_id, b.supplier_code, b.supplier_name, b.expect_time, b.supply_chain_number, b.priority_level_code,
         b.priority_level_name, b.direct_warehouse, b.annex_url, b.material_quantity as in_order_material_quantity, b.quantity as in_order_quantity
+        ,b.NEED_CUSTOMS_DECLARATION
     </sql>
 
     <sql id="joinStockInOrderPoWhere">
@@ -195,6 +196,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="quantity != null ">
             and b.quantity = #{quantity}
         </if>
+        <if test="needCustomsDeclaration != null ">
+            and b.need_customs_declaration = #{needCustomsDeclaration}
+        </if>
+
     </sql>
 
     <sql id="selectStockInOrderPo1">
diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
index 3c57d6b8f..793f86d71 100644
--- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
@@ -104,6 +104,7 @@ 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>
+
     </sql>
 
     <sql id="joinStockReceiptOrderWhere">