diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index bb3131c..4ee85d4 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -150,7 +150,7 @@ (Case when dbo.Get_SOOpsJobEstFinishDate(T.Site,T.OrderNo,T.ItemNo,T.SeqNo)T.PlanFinishTime then 0.0 else round((convert(float,dbo.Get_SOOpsJobEstFinishDate(T.Site,T.OrderNo,T.ItemNo,T.SeqNo)) - convert(float,T.PlanFinishTime)) * 24,2) end) delayHours, dbo.Get_SOSchedule_RecordIdentity(T.Site,T.PlanStartTime,T.PlanFinishTime,D.NeedDate,S1.PlanStartTime,S1.PlanFinishTime) mergeStatusCon, - D.CostRollUpFlag costRollUpFlag, dbo.getCurrentScheduleColorStyle(T.QtyReported, D.LotSize, T.PlanFinishTime, T.ClosedFlag) colorStyle + D.CostRollUpFlag costRollUpFlag, dbo.getCurrentScheduleColorStyle(T.QtyReported, T.QtyRequired, T.PlanFinishTime, T.ClosedFlag) colorStyle from SOScheduledList as E,SOScheduledRouting as T Left Join ShopOrder as D On T.Site=D.Site and T.OrderNo=D.OrderNo ,SORouting as S diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index 21d38f4..dc4d66c 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -81,7 +81,7 @@ SELECT T.Site site, E.S_ScheduledSeqNo scheduledSeqNo, T.OrderNo orderNo, T.ItemNo itemNo, T.S_WorkCenterNo workCenterNo, T.ClosedFlag closedFlag, T.PlanStartTime planStartTime, T.PlanFinishTime planFinishTime,T.S_ResourceID resourceId, T.QtyRequired qtyRequired, T.TimeRequired timeRequired, T.SeqNo seqNo, T.SELECTedFlag slectedFlag, T.SourceFlag sourceFlag, T.ParkFlag parkFlag, P.Remark custPartNo, P.PartNo partNo, P.PartDescription partDesc, - dbo.getCurrentScheduleColorStyle(T.QtyReported, S.LotSize, T.PlanFinishTime, T.ClosedFlag) colorStyle, + dbo.getCurrentScheduleColorStyle(T.QtyReported, T.QtyRequired, T.PlanFinishTime, T.ClosedFlag) colorStyle, P.Spec spec, T.Remark remark, T.TimeRequired_Original,T.QtyRequired_Original, T.QtyReported, P.ConfigurationTemplateID customerName, T.VirtualResourceFlag FROM SOScheduledList as E,SOScheduledRouting as T,ShopOrder as S,Part as P