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 0b712d6..ef28bbc 100644 --- a/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java +++ b/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java @@ -29,6 +29,7 @@ public class LiuhuaViewData extends QueryPage { private String jianyanWancheng; private String jiagongWancheng; private String baozhuangWancheng; + private String shiftType; private String liuhuahegelv; diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml index 2d92805..ee3e7d4 100644 --- a/src/main/resources/mapper/production/SoScheduledListMapper.xml +++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml @@ -264,7 +264,8 @@ 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 + dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '包装') as baozhuangTime, + a.shiftType 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