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 fffce60..03da327 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java @@ -45,6 +45,7 @@ public class ShopOrderOutData extends BaseShopOrderData { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date prePlanFinishTime;//前道结束时间 + private Float timeRequired;//需求时间 public ShopOrderOutData() { } @@ -232,4 +233,12 @@ public class ShopOrderOutData extends BaseShopOrderData { public void setPrePlanFinishTime(Date prePlanFinishTime) { this.prePlanFinishTime = prePlanFinishTime; } + + public Float getTimeRequired() { + return timeRequired; + } + + public void setTimeRequired(Float timeRequired) { + this.timeRequired = timeRequired; + } } diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index e3ab6c7..b342425 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -18,7 +18,7 @@ SELECT T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, T.OperationDesc itemDesc, D.NeedDate needDate, T.PartNo partNo, P.PartDescription partDesc, P.Spec spec, T.WorkCenterNo workCenterNo, T.NextItemNo nextItemNo, S2.OperationDesc nextItemDesc, T.PreItemNo preItemNo,S1.OperationDesc preItemDesc, S1.ScheduledFlag preScheduledFlag, T.QtyReported qtyReported, T.ScheduledFlag scheduledFlag, D.LotSize lotSize, D.EnterDate enterDate, - dbo.Get_SOOpsScheduleAvailResource(T.Site,T.OrderNo,T.WorkCenterNo,T.ItemNo) as AvailResource, ROUND(T.TimeRequired, 3) timeRequired, + dbo.Get_SOOpsScheduleAvailResource(T.Site,T.OrderNo,T.WorkCenterNo,T.ItemNo) as AvailResource, ROUND(T.TimeRequired, 2) timeRequired, dbo.getScheduleToPlanTime(D.LotSize, T.MachSetupTime, T.MachRunFactor, T.FactorUnit, T.Efficiency) scheduleToPlanTime, D.CustomerID customerId, P.ConfigurationTemplateID customerName, T.MachRunFactor machRunFactor, T.MachSetupTime machSetupTime, T.FactorUnit factorUnit, T.QtyScheduled qtyScheduled, (round(T.QtyRequired,3) - Round(T.QtyScheduled,3)) qtyToSchedule, Isnull(S1.QtyScheduled,0.0) qtyScheduledPreOps,