From 3774732a74d2d24b77521a8178003b28637f7706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Thu, 14 Aug 2025 17:12:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=8C=E6=88=90=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E8=BF=87=E6=BB=A4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/heai/modules/production/entity/OrderViewData.java | 6 ++++++
.../resources/mapper/production/SoScheduledListMapper.xml | 6 ++++++
2 files changed, 12 insertions(+)
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}