diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index c440b37..bb3131c 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -90,7 +90,7 @@ Left Join SORouting as S1 On T.Site=S1.Site and T.OrderNo=S1.OrderNo and T.PreItemNo=S1.ItemNo Left Join SORouting as S2 On T.Site=S2.Site and T.OrderNo=S2.OrderNo and T.NextItemNo=S2.ItemNo - Round(T.QtyScheduled,3) round(T.QtyRequired,3) and T.ClosedFlag = 'N' + Round(T.QtyScheduled,3) round(T.QtyRequired,3) and T.ClosedFlag = 'N' AND T.WorkCenterNo ]]> 'FQC' and T.site in (Select Site from AccessSite where upper(UserID)=#{username}) @@ -162,7 +162,7 @@ AND E.Site like #{site} - AND T.S_WorkCenterNo like #{workCenterNo} + AND T.S_WorkCenterNo like #{workCenterNo} AND T.S_WorkCenterNo ]]> 'FQC' AND E.ResourceID like #{resourceId} Order by E.S_ScheduledSeqNo diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index 027dddc..21d38f4 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -141,7 +141,7 @@ LEFT JOIN SORouting as S1 On T.Site=S1.Site and T.OrderNo=S1.OrderNo and T.PreItemNo=S1.ItemNo LEFT JOIN SORouting as S2 On T.Site=S2.Site and T.OrderNo=S2.OrderNo and T.NextItemNo=S2.ItemNo - AND T.ClosedFlag = 'N' and T.site = #{site} + AND T.ClosedFlag = 'N' and T.site = #{site} AND T.WorkCenterNo ]]> 'FQC' AND T.OrderNo]]>'9999' AND isnull(D.Status,'')]]>'已取消' and isnull(D.Status,'')]]>'已计划' and isnull(D.Status,'')]]>'已关闭' AND T.OrderNo = #{orderNo} AND T.ItemNo = #{itemNo}