diff --git a/src/main/java/com/heai/modules/production/entity/OrderViewData.java b/src/main/java/com/heai/modules/production/entity/OrderViewData.java
index 993e502..f68e436 100644
--- a/src/main/java/com/heai/modules/production/entity/OrderViewData.java
+++ b/src/main/java/com/heai/modules/production/entity/OrderViewData.java
@@ -40,4 +40,10 @@ public class OrderViewData {
private String customerDesc;
private String customerId;
private int defectQty;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startDate2;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endDate2;
}
diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml
index c66d9ac..2d92805 100644
--- a/src/main/resources/mapper/production/SoScheduledListMapper.xml
+++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml
@@ -220,6 +220,12 @@
AND #{endDate} >= DATEADD(dd, -1, a.EnterDate)
+
+ AND a.NeedDate >= #{startDate2}
+
+
+ AND #{endDate2} >= DATEADD(dd, 0, a.NeedDate)
+
AND a.CustomerID like #{customerId}