From e82a577a8b8e27d11946c9eddff37fb15b09cbd4 Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Wed, 9 Mar 2022 21:28:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8D=95=20=20=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaotao/modules/schedule/data/ShopOrderOutData.java | 9 +++++++++ src/main/resources/mapper/schedule/ScheduleMapper.xml | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java b/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java index d56f729..e0c7035 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java @@ -38,6 +38,7 @@ public class ShopOrderOutData extends BaseShopOrderData { private Float qtyApprovedPreOps;// private String manualFlag; private String repairSOFlag;// + private Float scheduleToPlanTime;// public ShopOrderOutData() { } @@ -201,4 +202,12 @@ public class ShopOrderOutData extends BaseShopOrderData { public void setRepairSOFlag(String repairSOFlag) { this.repairSOFlag = repairSOFlag; } + + public Float getScheduleToPlanTime() { + return scheduleToPlanTime; + } + + public void setScheduleToPlanTime(Float scheduleToPlanTime) { + this.scheduleToPlanTime = scheduleToPlanTime; + } } diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index a6b3f24..cc76716 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -45,6 +45,7 @@ D.EnterDate enterDate, dbo.Get_SOOpsScheduleAvailResource(T.Site,T.OrderNo,T.WorkCenterNo,T.ItemNo) availResource, T.WorkCenterNo workCenterNo, T.MachRunFactor machRunFactor, T.MachSetupTime machSetupTime, T.FactorUnit factorUnit, T.ScheduledFlag scheduledFlag, D.RoutingRevNo routingRevNo, T.QtyScheduled qtyScheduled,(round(T.QtyRequired,3) - Round(T.QtyScheduled,3)) qtyToSchedule, Isnull(S1.QtyScheduled,0.0) qtyScheduledPreOps, + dbo.getScheduleToPlanTime(D.LotSize, T.MachSetupTime, T.MachRunFactor, T.FactorUnit, t.Efficiency) scheduleToPlanTime, D.OriSOOrderNo oriSOOrderNo, P.Remark custPartNo, 1*t.Efficiency efficiency, D.CostRollUpFlag costRollUpFlag, isnull(S1.QtyApprove,0.0) qtyApprovedPreOps, d.ManualFlag manualFlag, d.RepairSOFlag repairSOFlag from SORouting as T @@ -225,7 +226,7 @@