diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index b381fc6..18ce99b 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -141,7 +141,8 @@ T.QtyApprove, isnull(SOP1.QtyApprove,0) lastApproveQty, b.NeedDate as planFinishTime, - S90.TextValue as remark + S90.TextValue as remark, + T.OutWorkFlag as ClosedFlag from SOScheduledRouting T LEFT JOIN SOScheduledRouting SOP1 ON SOP1.site=t.site and SOP1.OrderNo=t.OrderNo and SOP1.SeqNo = isnull(T.PreviousSeqNo,-1) ,SORouting a @@ -168,7 +169,8 @@ b.NeedDate as planFinishTime, '温:' + Convert(varchar(100),isnull(S90.NumValue,0)) + ' ' + '时:' + Convert(varchar(100),isnull(S91.NumValue,0)) as text1, '温:' + Convert(varchar(100),isnull(S92.NumValue,0)) + ' ' + '时:' + Convert(varchar(100),isnull(S93.NumValue,0)) as text2, - p3.TextValue text3 + p3.TextValue text3, + T.OutWorkFlag as ClosedFlag from SOScheduledRouting T LEFT JOIN SOScheduledRouting SOP1 ON SOP1.site=t.site and SOP1.OrderNo=t.OrderNo and SOP1.SeqNo = isnull(T.PreviousSeqNo,-1) ,SORouting a left join ShopOrder b on a.site=b.site and a.orderNo=b.orderNo @@ -197,7 +199,8 @@ T.QtyApprove, isnull(SOP.QtyApprove,0) lastApproveQty, T.S_ScheduledDate as planFinishTime, - isnull(CONVERT(varchar(30), p1.NumValue),p1.TextValue) text2,p2.NumValue num2,p3.TextValue text1,p4.TextValue text3 + isnull(CONVERT(varchar(30), p1.NumValue),p1.TextValue) text2,p2.NumValue num2,p3.TextValue text1,p4.TextValue text3, + T.OutWorkFlag as ClosedFlag from SOScheduledRouting T LEFT JOIN SOScheduledRouting SOP ON SOP.site=t.site and SOP.OrderNo=t.OrderNo and SOP.SeqNo = isnull(T.PreviousSeqNo,-1) ,SORouting a left join ShopOrder b on a.site=b.site and a.orderNo=b.orderNo