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