0412更新

src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java

@@ -47,4 +47,28 @@ public class LiuhuaViewData extends QueryPage {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date firstReportDate2;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date liuhuaTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date xiubianTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date hongkaoTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jianyanTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jiagongTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date baozhuangTime;
 }

src/main/resources/mapper/production/SoScheduledListMapper.xml

@@ -228,6 +228,11 @@
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'加工'),0),3))+'%' as jiagongWancheng,
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'包装'),0),3))+'%' as baozhuangWancheng,
          (select Convert( DECIMAL(20,2),sum( f.QtyApprove*dbo.Get_SPBOMQtyAssembly(f.site,f.orderNo))*100.0/a.QtyReported)
+         ,z.TillTime as liuhuaTime,dbo.Get_liuhuaView_gongxu_firstReportTime(a.site,a.SeqNo,'修边') as  xiubianTime
+         ,dbo.Get_liuhuaView_gongxu_firstReportTime(a.site,a.SeqNo,'烘烤') as hongkaoTime
+         ,dbo.Get_liuhuaView_gongxu_firstReportTime(a.site,a.SeqNo,'检验') as jianyanTime
+         ,dbo.Get_liuhuaView_gongxu_firstReportTime(a.site,a.SeqNo,'加工') as jiagongTime
+         ,dbo.Get_liuhuaView_gongxu_firstReportTime(a.site,a.SeqNo,'包装') as baozhuangTime
         from SOScheduledRouting f
         where  f.materSeqNo =a.SeqNo
         and dbo.Get_ProductionLineDesc(f.site,dbo.Get_WorkCenter_ProLineNo(f.site,f.S_WorkCenterNo))  like '%检验%'
@@ -235,7 +240,7 @@
         ) as liuhuahegelv
         from SOScheduledRouting a
         left join shoporder b on a.site=b.site and a.orderNo=b.orderNo
-
+        left join SFDC_TimeHist z on a.site=z.Site and a.SeqNo=z.SeqNo and z.HistSeqNo=1
     <where>
             AND a.scheduleType='日计划派工单'
             and a.QtyReported>0