diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml index f4de431..c9380fb 100644 --- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml +++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml @@ -237,6 +237,9 @@ AND SS.S_ResourceID like '%' + #{sResourceID} + '%' + + AND T.AssJobSeqNo = #{assJobSeqNo} + AND T.ReportDate >= #{date1} @@ -259,33 +262,36 @@ and T.Site=S.Site and T.OrderNo=S.OrderNo and T.Site=R.Site and T.OrderNo=R.OrderNo and T.ItemNo=R.ItemNo and s.Site=p.Site and s.PartNo=p.PartNo and R.Site=W.Site and R.WorkCenterNo=W.WorkCenterNo and T.Site=O.Site and T.OperatorID=O.OperatorID and T.Site=R.Site and T.OrderNo=R.OrderNo and T.ItemNo=R.ItemNo - and T.Site in (Select Site from AccessSite where upper(UserID)=#{user}) + and T.Site in (Select Site from AccessSite where upper(UserID)=#{user}) AND T.Reverseflag = 'N' AND T.Site = #{site} - + AND s.PartNo like '%' + #{partNo} + '%' - + AND p.PartDescription+' / '+p.Spec like '%' + #{partDescription} + '%' AND T.OrderNo = #{orderNo} - + AND T.OperatorID like '%' + #{operatorID} + '%' - + AND R.WorkcenterNo like '%' + #{workCenterNo} + '%' AND SS.S_ResourceID like '%' + #{sResourceID} + '%' - + + AND T.AssJobSeqNo = #{assJobSeqNo} + + AND T.ReportDate >= #{date1} - + AND dateadd( DAY, 1, #{date2} ) > T.ReportDate