From ade7669e211dd1826e15d8de723f868a165aeba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Mon, 1 Dec 2025 14:07:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-962=20=E6=99=AE=E9=80=9A=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E9=80=81=E8=B4=A7=E5=8D=95=E5=92=8C=E9=92=A2=E6=9E=84?=
 =?UTF-8?q?=E4=BB=B6=E9=80=81=E8=B4=A7=E5=8D=95=E6=B7=BB=E5=8A=A0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java | 7 +++++++
 .../pojo/qo/StructuralPackageDeliverOrderSearchQO.java     | 5 +++++
 .../src/main/resources/mapper/WmsSrmOrderMapper.xml        | 7 +++++--
 .../mapper/WmsStructuralPackageDeliverOrderMapper.xml      | 3 +++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java
index 57c8fbe0..2af32bc3 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java
@@ -1,5 +1,6 @@
 package com.nflg.wms.common.pojo.qo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
@@ -26,4 +27,10 @@ public class SRMOrderSearchQO extends SearchBaseQO {
      */
     private String itemCode;
 
+    /**
+     * 是否已完结
+     */
+    @JsonProperty("isCompleted")
+    private Boolean isCompleted;
+
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java
index 59977db6..b0fedd13 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java
@@ -19,4 +19,9 @@ public class StructuralPackageDeliverOrderSearchQO extends SearchBaseQO{
      * 供应商编号
      */
     private String supplierNo;
+
+    /**
+     * 状态，0：待收货；1：收货中；2：已收货
+     */
+    private Short state;
 }
\ No newline at end of file
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml
index ab44a11c..f58136aa 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml
@@ -6,8 +6,8 @@
         from wms_srm_order a
         left join user_supplier b on a.supplier_num=b.supplier_code
         <where>
-            <if test="request.noteNum !=null and request.noteNum !='' ">
-                and a.note_num ilike concat('%', #{request.noteNum}, '%')
+            <if test="request.isCompleted!=null">
+                a.is_completed = #{request.isCompleted}
             </if>
             <if test="request.supplierNum !=null and request.supplierNum !='' ">
                 and a.supplier_num =#{request.supplierNum}
@@ -26,6 +26,9 @@
             <if test="request.endDate !=null">
                 and a.create_time &lt; #{request.endDate}
             </if>
+            <if test="request.noteNum !=null and request.noteNum !='' ">
+                and a.note_num ilike concat('%', #{request.noteNum}, '%')
+            </if>
         </where>
         order by a.id desc
     </select>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
index f731820f..28d82ebd 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
@@ -24,6 +24,9 @@
                     </foreach>
                 </if>
             </if>
+            <if test="request.state!=null">
+                and pdo.state=#{request.state}
+            </if>
             <if test="request.supplierNo!=null and request.supplierNo!=''">
                 and us.supplier_code=#{request.supplierNo}
             </if>