From 4e25cc77bbbcc17991a714c9325e953f7252cca4 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 13 Dec 2023 16:39:29 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/heai/modules/production/entity/OrderViewData.java | 3 +++
 src/main/resources/mapper/production/SoScheduledListMapper.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 63c6768..2b012d2 100644
--- a/src/main/java/com/heai/modules/production/entity/OrderViewData.java
+++ b/src/main/java/com/heai/modules/production/entity/OrderViewData.java
@@ -29,4 +29,7 @@ public class OrderViewData {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date firstReportDate;
 }
diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml
index 94d880e..1c9eafc 100644
--- a/src/main/resources/mapper/production/SoScheduledListMapper.xml
+++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml
@@ -178,7 +178,7 @@
     </select>
 
     <select id="getOrderView" resultType="OrderViewData">
-        SELECT a.OrderNo,dbo.Get_Part_Spec(a.site,a.PartNo) partSpec,
+        SELECT site,a.OrderNo,dbo.Get_Part_Spec(a.site,a.PartNo) partSpec,dbo.Get_orderView_liuhuaReportTime(a.site,a.OrderNo) as firstReportDate,
         Round(isnull(dbo.Get_orderView_liuhuaReport(a.site,a.OrderNo),0),3) as liuhuaReport ,
         Round(isnull(dbo.Get_orderView_liuhuaFinish(a.site,a.OrderNo),0),3) as liuhuaFinish ,
         Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'修边'),0),3) as xiubianReport,