From 7357d5f7ed4bc4ba1749d9bedb35f18f17ba391c Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 22 Jan 2024 14:36:55 +0800 Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../production/entity/SOScheduledRoutingOutData.java | 9 +++++++++ src/main/resources/mapper/production/DailyPlanMapper.xml | 1 + 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java b/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java index fde2e5f..e2f16e1 100644 --- a/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java +++ b/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java @@ -38,6 +38,7 @@ public class SOScheduledRoutingOutData { private String batchNo; private String partStock; private String jobType; + private Double workTime; /** * */ @@ -800,5 +801,13 @@ public class SOScheduledRoutingOutData { public void setJobType(String jobType) { this.jobType = jobType; } + + public Double getWorkTime() { + return workTime; + } + + public void setWorkTime(Double workTime) { + this.workTime = workTime; + } } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 72fbbd4..52008e1 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -458,6 +458,7 @@ dbo.Get_OperatorDesc(a.Site,operatorId) as operatorName,dbo.Get_ItemDesc(a.Site,OrderNo,ItemNo) as itemDesc,orderRef1 , dbo.Get_WorkCenterDesc(a.Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_SpecDesc(a.Site,partNo) as partSpec,circulation_seqNo,circulation_qty ,dbo.Get_PartWeightFactorForReport(a.site,PartNo,OrderNo) as weightFactor,dbo.Get_Part_UMID(a.Site,PartNo) umid,a.jobType, + case when a.worktime is not null and a.worktime>0 then Round(QtyReported*100/a.worktime,2) else 0 end as efficiency,Round(isnull(a.workTime,0),2) workTime, Round(dbo.Get_PartWeightFactorForReport(a.site,PartNo,OrderNo)*QtyRequired,2) as weight from SOScheduledRouting a left join user_work_center uwc on a.site=uwc.site and a.S_WorkCenterNo =uwc.WorkCenterNo and uwc.userId=#{userId}