From 39e8297d162f3b9940abca146df1b9da95eeb195 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, 7 Aug 2025 11:28:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=A7=E9=87=8F=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E9=87=8C=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/heai/modules/production/entity/SfdcCancel.java | 3 +++ src/main/resources/mapper/production/DailyPlanMapper.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java index bd81591..ffc33d0 100644 --- a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java +++ b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java @@ -48,6 +48,9 @@ public class SfdcCancel { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date statisticDate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date lastStartTime; private String reverseflag; private Double reportWeight; private Double approveWeight; diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index a0297e8..f5d6af5 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -1374,6 +1374,7 @@ , a.c_sys_scrap_rate as csysScrapRate, b.shiftType as shiftType, + SOP.LastStartTime as lastStartTime, case when a.ReportQty!=0 then Round((a.ReportQty - a.ApproveQty) * 100 / a.ReportQty, 2) else 0 end as scrapRate @@ -1386,6 +1387,8 @@ f.DefectCode = 'PQ001' left join SFDC_DefectHist g on a.site = g.site and a.OrderNo = g.OrderNo and a.seqNo = g.SeqNo and g.DefectCode = 'PQ003' + left join SoRouting h on b.site=h.site and b.orderNo=h.OrderNo and b.itemNo=h.itemNo + LEFT JOIN SORoutingOutput SOP ON a.site=SOP.site and a.OrderNo=SOP.OrderNo and SOP.itemNo=dbo.Get_SORouting_PreviousOperationItemNo(a.site,a.OrderNo,h.itemNo) and a.AssJobSeqNo is not null