From ffad2d9f348ac7d73dabe5226de81203655c51ec Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Wed, 20 Oct 2021 10:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=93=8D=E4=BD=9C=E5=91=98?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BFSFC=E5=BC=B9=E5=87=BA=E6=A1=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=B8=8A=E9=81=93=E5=B7=A5=E5=BA=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 meapi/src/main/resources/mapper/SfcMapper.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml
index 3316268f..c36b8834 100644
--- a/meapi/src/main/resources/mapper/SfcMapper.xml
+++ b/meapi/src/main/resources/mapper/SfcMapper.xml
@@ -666,7 +666,8 @@
     </select>
 
     <select id="pageByResrce" resultType="com.foreverwin.mesnac.meapi.dto.SfcDto">
-        SELECT PREZSD.EMPLOYEE_DESCRIPTION,
+        SELECT * FROM (
+        SELECT S.SITE,PREZSD.EMPLOYEE_DESCRIPTION,
         CASE WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '完成'
         ELSE '未完成' END LAST_OPERATION_STATUS,SS.STEP_ID CURRENT_STEP_ID,zsd.STEP_ID,
          S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION,S.ITEM_BO,S.SHOP_ORDER_BO
@@ -681,9 +682,17 @@
         LEFT JOIN  SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0)
         WHERE S.SITE=#{ew.entity.site}  AND ZSD.RESRCE=#{ew.entity.resrce}  AND (ZSD.DISPATCH_STATUS='RELEASE' OR ZSD.DISPATCH_STATUS='START')
         AND S.STATUS_BO  IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404')
-        AND zprt.STATUS='FINISH' AND  ZPRT."RESULT"='OK'
+        AND zprt.STATUS='FINISH' AND  ZPRT."RESULT"='OK' ) T
+        WHERE T.SITE = #{ew.entity.site}
         <if test="globalQuery!=null and globalQuery!=''">
-            AND S.SFC like '%${globalQuery}%'
+            <choose>
+                <when test="globalQuery.contains('完成')">
+                    AND T.LAST_OPERATION_STATUS = #{globalQuery}
+                </when>
+                <otherwise>
+                    AND T.SFC like '%${globalQuery}%'
+                </otherwise>
+            </choose>
         </if>
         </select>