From 8446d21b1b1f9cef864c52aaaf6b11946417ec3e Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Wed, 21 May 2025 12:30:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cim/idm/model/dto/PurchaseDto.java       | 3 +++
 zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java
index e437349..6d27110 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java
@@ -30,4 +30,7 @@ public class PurchaseDto {
 
 	// 到货单类型
 	private String deliveryType;
+
+	// 供应商
+	private String supplierNo;
 }
diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
index da8fc28..c53525f 100644
--- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
+++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
@@ -74,6 +74,9 @@
             AND m.ORDERDATE BETWEEN TO_DATE( #{dto.fromDate}, 'YYYY/MM/DDHH24MISS' )
             AND TO_DATE( #{dto.toDate}, 'YYYY/MM/DDHH24MISS' )
         </if>
+        <if test="dto.supplierNo != null and dto.supplierNo != ''">
+            AND m.SUPPLIERNO LIKE '%'||#{dto.supplierNo}||'%'
+        </if>
         AND ms.IS_BATCH = #{isBatch}
     </select>