From c496354b61d2258f78520fee3dbe27f1c8849d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Mon, 25 Aug 2025 17:47:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C=E5=B7=A5?=
 =?UTF-8?q?=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    | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index 2aa07ea..fa03be3 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -128,15 +128,28 @@
 
     </select>
         <select id="SORoutingBoardForJianYan" resultType="SORoutingData" >
-        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
-        ,S90.TextValue as remark
-        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.PropertiesItemNo='SPECIAL CHECK'
-       where a.partNo like 'FP%' and (b.status not in ('已取消','已关闭','已停工','已计划') and a.QtyRequired>a.QtyReported) and dbo.Get_WorkCenter_ProLineNo(a.site,a.WorkCenterNo)='INSPECT'
-        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,
+                   S90.TextValue as remark
+            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.PropertiesItemNo='SPECIAL CHECK'
+            where T.Site = A.Site AND T.OrderNo = A.OrderNo AND T.ItemNo = A.ItemNo AND T.ClosedFlag = 'N' AND T.OutWorkFlag = 'Y'
+              and dbo.Get_WorkCenter_ProLineNo(a.site,a.WorkCenterNo)='INSPECT'
+              and b.enterDate>'2022-01-01'
+            order by T.S_ScheduledDate
 
     </select>
     <select id="SORoutingBoardForShuiZhu" resultType="com.heai.modules.board.entity.SORoutingBoardData" >