From 8ca1ace5ad128e4d3948cbfe95701fb9877a4ce5 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 2 Aug 2024 15:19:17 +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

---
 .../com/heai/modules/production/entity/LiuhuaViewData.java    | 3 +++
 .../modules/production/service/impl/DailyPlanServiceImpl.java | 1 +
 .../resources/mapper/production/SoScheduledListMapper.xml     | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java b/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java
index f3a5a14..1984618 100644
--- a/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java
+++ b/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java
@@ -44,4 +44,7 @@ public class LiuhuaViewData extends QueryPage {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date firstReportDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date firstReportDate2;
 }
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index f99c4d4..8ca1866 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -707,6 +707,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         reportData.setType("reportData");
         reportData.setStrQty(inData.getQtyApprove());
         reportData.setWeight(inData.getApproveWeight());
+        reportData.setRemark(inData.getRemark());
         return R.ok().put("msg","操作成功！").put("transData",transData).put("badData",badData).put("reportData",reportData);
     }
     @Override
diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml
index 7cc99a3..af8bbf6 100644
--- a/src/main/resources/mapper/production/SoScheduledListMapper.xml
+++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml
@@ -220,7 +220,8 @@
       <select id="getLiuhuaView" resultType="LiuhuaViewData">
    select a.site,a.orderNo,a.SeqNo,Round(a.QtyRequired,2) QtyRequired,Round(a.QtyReported,2) QtyReported,Round(a.QtyApprove,2) QtyApprove,
    Convert( varchar(20),Convert( DECIMAL(20,1),a.QtyReported*100/a.QtyRequired))+'%' as liuhuaWancheng,
-        S_ScheduledDate as ScheduledDate,S_ShiftNo as shiftNo,dbo.Get_OperatorDesc(a.site,a.operatorId) as operatorName,a.partNo,dbo.Get_Part_SpecDesc(a.site,a.partNo) partSpec,
+   dbo.Get_seqNo_firstReportTime(a.site,a.SeqNo) firstReportDate2,
+        S_ScheduledDate as ScheduledDate,S_ShiftNo as shiftNo,dbo.Get_OperatorDesc(a.site,a.operatorId) as operatorDesc,a.partNo,dbo.Get_Part_SpecDesc(a.site,a.partNo) partSpec,
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'修边'),0),3))+'%' as xiubianWancheng,
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'烘烤'),0),3))+'%' as hongkaoWancheng,
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'检验'),0),3))+'%' as jianyanWancheng,
@@ -234,6 +235,7 @@
         ) as liuhuahegelv
         from SOScheduledRouting a
         left join shoporder b on a.site=b.site and a.orderNo=b.orderNo
+
     <where>
             AND a.scheduleType='日计划派工单'
             and a.QtyReported>0