From 2fda194098442224bee69bc0167055a417e12f1b Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Tue, 21 Jan 2025 21:35:01 +0800
Subject: [PATCH] =?UTF-8?q?2025.01.20=20=E7=BB=A9=E6=95=88&=E9=80=81?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=20=E7=AC=AC=E4=BA=8C=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/deliverySchedule/data/DeliveryPlanData.java    | 3 +++
 .../deliverySchedule/data/DeliveryScheduleData.java        | 3 +++
 .../service/impl/DeliveryScheduleServiceImpl.java          | 2 +-
 .../mapper/deliverySchedule/DeliveryPlanMapper.xml         | 7 +++++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryPlanData.java b/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryPlanData.java
index 14afbe3..d9aba07 100644
--- a/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryPlanData.java
+++ b/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryPlanData.java
@@ -39,6 +39,9 @@ public class DeliveryPlanData extends QueryPage implements Serializable {
     @TableField(value = "Status")
     private String Status;
 
+    @TableField(exist = false)
+    private List<String> StatusList;
+
     @TableField(value = "NotifyQty")
     private Double NotifyQty;
 
diff --git a/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryScheduleData.java b/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryScheduleData.java
index 97d160d..e0cd3cb 100644
--- a/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryScheduleData.java
+++ b/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryScheduleData.java
@@ -34,6 +34,9 @@ public class DeliveryScheduleData extends QueryPage implements Serializable {
     @TableField(value = "Status")
     private String Status;
 
+    @TableField(exist = false)
+    private List<String> StatusList;
+
     @TableField(value = "Qty")
     private Double Qty;
 
diff --git a/src/main/java/com/xujie/sys/modules/deliverySchedule/service/impl/DeliveryScheduleServiceImpl.java b/src/main/java/com/xujie/sys/modules/deliverySchedule/service/impl/DeliveryScheduleServiceImpl.java
index 807d3a1..49368ee 100644
--- a/src/main/java/com/xujie/sys/modules/deliverySchedule/service/impl/DeliveryScheduleServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/deliverySchedule/service/impl/DeliveryScheduleServiceImpl.java
@@ -68,7 +68,7 @@ public class DeliveryScheduleServiceImpl extends ServiceImpl<DeliveryScheduleMap
             } else {
                 deliveryScheduleData.setDeliveryQty(allotmentQty);
                 baseMapper.updateSupplierDeliveryScheduleDeliveryQty(deliveryScheduleData);
-                break;
+                allotmentQty = 0.0;
             }
         }
     }
diff --git a/src/main/resources/mapper/deliverySchedule/DeliveryPlanMapper.xml b/src/main/resources/mapper/deliverySchedule/DeliveryPlanMapper.xml
index d8efad5..5b17347 100644
--- a/src/main/resources/mapper/deliverySchedule/DeliveryPlanMapper.xml
+++ b/src/main/resources/mapper/deliverySchedule/DeliveryPlanMapper.xml
@@ -58,8 +58,11 @@
                 <if test="query.UserName != null and query.UserName != ''">
                     AND PODN.Username like #{query.UserName}
                 </if>
-                <if test="query.Status != null and query.Status != ''">
-                    AND PODN.Status = #{query.Status}
+                <if test = "query.StatusList != null and query.StatusList.size > 0">
+                    AND PODN.status in
+                    <foreach item="item" collection="query.StatusList"  open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
                 </if>
                 <if test="query.WantedDelStartDate != null">
                     AND PODN.WantedDelDate >= #{query.WantedDelStartDate}