From fca2476c7bbdfce2af33e6d713957cef13aacab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Mon, 25 Aug 2025 16:53:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AB=E5=8C=96=E6=B4=BE=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E8=A1=A8=20-=20=E5=A2=9E=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF/=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=91=98=E5=A7=93=E5=90=8D=E5=90=8E=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/heai/modules/production/entity/LiuhuaViewData.java | 1 + src/main/resources/mapper/production/SoScheduledListMapper.xml | 3 ++- 2 files changed, 3 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 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