From 269e1b0542e8af5dab8a1e5e2a13b340af3f7ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 26 Aug 2025 09:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=B4=E7=85=AE=E7=83=98?=
 =?UTF-8?q?=E7=83=A4=E5=B7=A5=E5=BA=8F=E7=9C=8B=E6=9D=BFsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/board/BoardMapper.xml    | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index fa03be3..98cbb20 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -153,21 +153,34 @@
 
     </select>
     <select id="SORoutingBoardForShuiZhu" resultType="com.heai.modules.board.entity.SORoutingBoardData" >
-        SELECT a.site,a.OrderNo,a.ItemNo,a.OperationDesc,a.PartNo,dbo.Get_Part_Spec(a.Site,a.PartNo) as PartDesc,a.QtyRequired,
-        a.QtyReported,a.QtyApprove,isnull(SOP.TotalFinishedQty,0) lastApproveQty,b.NeedDate as planFinishTime,dbo.Get_SORouting_ClosedFlag(a.site,a.OrderNo,a.ItemNo) as ClosedFlag
-        ,'温:' + 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
-        from SORouting a left join ShopOrder b on a.site=b.site and a.orderNo=b.orderNo
-        LEFT JOIN SORoutingOutput SOP ON a.site=SOP.site and a.OrderNo=SOP.OrderNo and SOP.itemNo=dbo.Get_SORouting_PreviousOperationItemNo(a.site,a.OrderNo,a.itemNo)
-        Left Join PartSubPropertiesValue as S90 On S90.Site=a.Site and S90.PartNo=a.PartNo and S90.RecordType='P' and S90.SubCodeSeqNo=1 and S90.PropertiesItemNo='WATER TEMP'
-        Left Join PartSubPropertiesValue as S91 On S91.Site=a.Site and S91.PartNo=a.PartNo  and S91.RecordType='P' and S91.SubCodeSeqNo=1 and S91.PropertiesItemNo='WATER TIME'
-        Left Join PartSubPropertiesValue as S92 On S92.Site=a.Site and S92.PartNo=a.PartNo and S92.RecordType='P' and S92.SubCodeSeqNo=1 and S92.PropertiesItemNo='POST CURE-TEMP'
-        Left Join PartSubPropertiesValue as S93 On S93.Site=a.Site and S93.PartNo=a.PartNo and S93.RecordType='P' and S93.SubCodeSeqNo=1 and S93.PropertiesItemNo='POST CURE-TIME'
-        LEFT JOIN PartSubPropertiesValue p3 on p3.site=a.site and p3.PartNo=a.PartNo and p3.PropertiesItemNo='MATERIAL'
-       where a.partNo like 'FP%' and (b.status not in ('已取消','已关闭','已停工','已计划') and a.QtyRequired>a.QtyReported) and dbo.Get_WorkCenter_ProLineNo(a.site,a.WorkCenterNo)='TREAT'
-           and( (isnull(SOP.TotalFinishedQty,0)>0 and isnull(SOP.TotalFinishedQty,0)>a.QtyReported) or a.itemNo=10) and b.enterDate>'2022-01-01'
-        order by planFinishTime
+        SELECT a.site,
+               a.OrderNo,
+               T.SeqNo,
+               a.OperationDesc,
+               a.PartNo,
+               dbo.Get_Part_Spec(a.Site,a.PartNo) as PartDesc,
+               T.QtyRequired,
+               T.QtyReported,
+               T.QtyApprove,
+               isnull(SOP1.QtyApprove,0) lastApproveQty,
+               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
+        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
+                        LEFT JOIN SORoutingOutput SOP ON a.site=SOP.site and a.OrderNo=SOP.OrderNo and SOP.itemNo=dbo.Get_SORouting_PreviousOperationItemNo(a.site,a.OrderNo,a.itemNo)
+                        Left Join PartSubPropertiesValue as S90 On S90.Site=a.Site and S90.PartNo=a.PartNo and S90.RecordType='P' and S90.SubCodeSeqNo=1 and S90.PropertiesItemNo='WATER TEMP'
+                        Left Join PartSubPropertiesValue as S91 On S91.Site=a.Site and S91.PartNo=a.PartNo  and S91.RecordType='P' and S91.SubCodeSeqNo=1 and S91.PropertiesItemNo='WATER TIME'
+                        Left Join PartSubPropertiesValue as S92 On S92.Site=a.Site and S92.PartNo=a.PartNo and S92.RecordType='P' and S92.SubCodeSeqNo=1 and S92.PropertiesItemNo='POST CURE-TEMP'
+                        Left Join PartSubPropertiesValue as S93 On S93.Site=a.Site and S93.PartNo=a.PartNo and S93.RecordType='P' and S93.SubCodeSeqNo=1 and S93.PropertiesItemNo='POST CURE-TIME'
+                        LEFT JOIN PartSubPropertiesValue p3 on p3.site=a.site and p3.PartNo=a.PartNo and p3.PropertiesItemNo='MATERIAL'
+        where T.Site = A.Site AND T.OrderNo = A.OrderNo AND T.ItemNo = A.ItemNo AND T.ClosedFlag = 'N' AND T.OutWorkFlag = 'Y'
+          and a.partNo like 'FP%'
+          and dbo.Get_WorkCenter_ProLineNo(a.site,a.WorkCenterNo)='TREAT'
+          and b.enterDate>'2022-01-01'
+        order by T.S_ScheduledDate
 
     </select>
     <select id="SORoutingBoardForBaoZhuang" resultType="com.heai.modules.board.entity.SORoutingBoardData" >