From 32ed7520d8ff35d5acf33f9036f3c478b86f01cd Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Wed, 25 Aug 2021 22:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/SfcDispatchMapper.xml    | 184 +++++++++---------
 1 file changed, 93 insertions(+), 91 deletions(-)

diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index a319637a..a3f83381 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -668,99 +668,101 @@
     </select>
 
     <select id="findSfcDispatchList" resultMap="FullResultMap">
-        SELECT 	WIP.*, V1.STEP_ID PREPOSITION_STEP_ID, V1.OPERATION PREPOSITION_OPERATION,
-                CASE WHEN WIP.DISPATCH_SEQ = 1 OR V1.DISPATCH_STATUS = 'COMPLETE' THEN N'是' ELSE N'否' END IS_COMPLETED,
-                CASE WHEN WIP.DISPATCH_STATUS = 'NEW' THEN N'新建' WHEN WIP.DISPATCH_STATUS = 'CANCEL' THEN N'取消'
-                     WHEN WIP.DISPATCH_STATUS = 'PAUSE' THEN N'暂停' WHEN WIP.DISPATCH_STATUS = 'RELEASE' THEN N'发布'
-                     END  AS STATUS_NAME, 'ADMINISTRATOR' AS ROLE
+        SELECT WIP.*
         FROM (
-            SELECT 	DISTINCT SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, C2.VALUE ITEM_NUMBER, C1.VALUE WORK_ORDER, IM.HANDLE ITEM_BO, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,
-                    SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE USER_NAME, SD.DISPATCH_QTY, SD.PROD_HOURS, RS.DESCRIPTION RESOURCE_DESCRIPTION,
-                    CASE WHEN SD.DISPATCH_STATUS = 'COMPLETE' THEN SD.DISPATCH_QTY ELSE 0 END COMPLETED_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH, SD.EMPLOYEE_DESCRIPTION,
-                    SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.DISPATCH_SEQ-1 BEFORE_SEQ, SD.DISPATCH_SEQ+1 AFTER_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE,
-                    CASE WHEN IM.LOT_SIZE = 1 THEN N'是' ELSE N'否' END IS_MAJOR, CASE WHEN SD.TURN_OPERATION = 'true' THEN N'是' ELSE N'否' END TURN_OPERATION, SD.BLANKING_SIZE,
-                    WR.WORK_CENTER RESOURCE_WORK_CENTER
-            FROM Z_SFC_DISPATCH SD
-            LEFT JOIN RESRCE RS ON SD.SITE = RS.SITE AND SD.RESRCE = RS.RESRCE
-            INNER JOIN SHOP_ORDER SO ON SO.SITE = SD.SITE AND SO.SHOP_ORDER = SD.SHOP_ORDER
-            LEFT JOIN CUSTOM_FIELDS C1 ON C1.HANDLE = SO.HANDLE AND C1."ATTRIBUTE" = 'WORK_ORDER'
-            LEFT JOIN CUSTOM_FIELDS C2 ON C2.HANDLE = SO.HANDLE AND C2."ATTRIBUTE" = 'ITEM_NUMBER'
-            INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO
-            LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
-            INNER JOIN OPERATION O ON O.SITE = SD.SITE AND O.OPERATION = SD.OPERATION AND O.CURRENT_REVISION = 'true'
-            LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh'
-            INNER JOIN BOM_COMPONENT BC ON BC.BOM_BO = SO.BOM_BO
-            INNER JOIN ITEM CP ON CP.HANDLE = BC.COMPONENT_GBO
-            LEFT JOIN ITEM_T CPT ON CPT.ITEM_BO = CP.HANDLE AND CPT.LOCALE = 'zh'
-            LEFT JOIN WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = 'ResourceBO:' || SD.SITE || ',' || SD.RESRCE
-            LEFT JOIN WORK_CENTER WR ON WR.HANDLE = WCM.WORK_CENTER_BO
-            WHERE SD.SITE = #{site}
-            <if test="workCenter != null and workCenter != ''">
-                AND SD.OPERATION LIKE #{workCenter}||'%'
-            </if>
-            <if test="dispatchStatus != null and dispatchStatus != ''">
-                AND SD.DISPATCH_STATUS = #{dispatchStatus}
-            </if>
-            <if test="item != null and item != ''">
-                AND IM.ITEM = #{item}
-            </if>
-            <if test="workOrder != null and workOrder != ''">
-                AND C1.VALUE LIKE '%' ||#{workOrder}|| '%'
-            </if>
-            <if test="itemNumber != null and itemNumber != ''">
-                AND C2.VALUE LIKE '%' ||#{itemNumber}|| '%'
-            </if>
-            <if test="shopOrder != null and shopOrder != ''">
-                AND SD.SHOP_ORDER = #{shopOrder}
-            </if>
-            <if test="resourceType != null and resourceType != ''">
-                AND SD.RESOURCE_TYPE = #{resourceType}
-            </if>
-            <if test="resrce != null and resrce != ''">
-                AND SD.RESRCE = #{resrce}
-            </if>
-            <if test="operation != null and operation != ''">
-                AND SD.OPERATION = #{operation}
-            </if>
-            <if test="operationDescription != null and operationDescription != ''">
-                AND OT.DESCRIPTION = #{operationDescription}
-            </if>
-            <if test="sfc != null and sfc != ''">
-                AND SD.SFC = #{sfc}
-            </if>
-            <if test="turnOperation != null and turnOperation != ''">
-                AND SD.TURN_OPERATION = #{turnOperation}
-            </if>
-            <if test="component != null and component != ''">
-                AND CP.ITEM = #{component}
-            </if>
-            <if test="componentDescription != null and componentDescription != ''">
-                AND CPT.DESCRIPTION LIKE '%' || #{componentDescription} || '%'
-            </if>
-            <if test="isDispatch != null and isDispatch != ''">
-                AND SD.IS_DISPATCH = #{isDispatch}
-            </if>
-            <if test="blankingSize != null and blankingSize != ''">
-                AND SD.BLANKING_SIZE LIKE '%'||#{blankingSize}||'%'
-            </if>
-            <if test="startFromDate != null">
-                AND SO.PLANNED_START_DATE >= #{startFromDate}
-            </if>
-            <if test="startToDate != null">
-                AND SO.PLANNED_START_DATE &lt;= #{startToDate}
-            </if>
-            <if test="completeFromDate != null">
-                AND SO.PLANNED_COMP_DATE >= TO_DATE(#{completeFromDate}, 'YYYY-MM-DD')
-            </if>
-            <if test="completeToDate != null">
-                AND SO.PLANNED_COMP_DATE &lt;= TO_DATE(#{completeToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
-            </if>
+            SELECT 	WIP.*, V1.STEP_ID PREPOSITION_STEP_ID, V1.OPERATION PREPOSITION_OPERATION,
+                    CASE WHEN WIP.DISPATCH_SEQ = 1 OR V1.DISPATCH_STATUS = 'COMPLETE' THEN N'是' ELSE N'否' END IS_COMPLETED,
+                    CASE WHEN WIP.DISPATCH_STATUS = 'NEW' THEN N'新建' WHEN WIP.DISPATCH_STATUS = 'CANCEL' THEN N'取消'
+                         WHEN WIP.DISPATCH_STATUS = 'PAUSE' THEN N'暂停' WHEN WIP.DISPATCH_STATUS = 'RELEASE' THEN N'发布'
+                         END  AS STATUS_NAME, 'ADMINISTRATOR' AS ROLE
+            FROM (
+                SELECT 	DISTINCT SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, C2.VALUE ITEM_NUMBER, C1.VALUE WORK_ORDER, IM.HANDLE ITEM_BO, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,
+                        SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE USER_NAME, SD.DISPATCH_QTY, SD.PROD_HOURS, RS.DESCRIPTION RESOURCE_DESCRIPTION,
+                        CASE WHEN SD.DISPATCH_STATUS = 'COMPLETE' THEN SD.DISPATCH_QTY ELSE 0 END COMPLETED_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH, SD.EMPLOYEE_DESCRIPTION,
+                        SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.DISPATCH_SEQ-1 BEFORE_SEQ, SD.DISPATCH_SEQ+1 AFTER_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE,
+                        CASE WHEN IM.LOT_SIZE = 1 THEN N'是' ELSE N'否' END IS_MAJOR, CASE WHEN SD.TURN_OPERATION = 'true' THEN N'是' ELSE N'否' END TURN_OPERATION, SD.BLANKING_SIZE,
+                        WR.WORK_CENTER RESOURCE_WORK_CENTER
+                FROM Z_SFC_DISPATCH SD
+                LEFT JOIN RESRCE RS ON SD.SITE = RS.SITE AND SD.RESRCE = RS.RESRCE
+                INNER JOIN SHOP_ORDER SO ON SO.SITE = SD.SITE AND SO.SHOP_ORDER = SD.SHOP_ORDER
+                LEFT JOIN CUSTOM_FIELDS C1 ON C1.HANDLE = SO.HANDLE AND C1."ATTRIBUTE" = 'WORK_ORDER'
+                LEFT JOIN CUSTOM_FIELDS C2 ON C2.HANDLE = SO.HANDLE AND C2."ATTRIBUTE" = 'ITEM_NUMBER'
+                INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO
+                LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
+                INNER JOIN OPERATION O ON O.SITE = SD.SITE AND O.OPERATION = SD.OPERATION AND O.CURRENT_REVISION = 'true'
+                LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh'
+                INNER JOIN BOM_COMPONENT BC ON BC.BOM_BO = SO.BOM_BO
+                INNER JOIN ITEM CP ON CP.HANDLE = BC.COMPONENT_GBO
+                LEFT JOIN ITEM_T CPT ON CPT.ITEM_BO = CP.HANDLE AND CPT.LOCALE = 'zh'
+                LEFT JOIN WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = 'ResourceBO:' || SD.SITE || ',' || SD.RESRCE
+                LEFT JOIN WORK_CENTER WR ON WR.HANDLE = WCM.WORK_CENTER_BO
+                WHERE SD.SITE = #{site}
+                <if test="workCenter != null and workCenter != ''">
+                    AND SD.OPERATION LIKE #{workCenter}||'%'
+                </if>
+                <if test="dispatchStatus != null and dispatchStatus != ''">
+                    AND SD.DISPATCH_STATUS = #{dispatchStatus}
+                </if>
+                <if test="item != null and item != ''">
+                    AND IM.ITEM = #{item}
+                </if>
+                <if test="workOrder != null and workOrder != ''">
+                    AND C1.VALUE LIKE '%' ||#{workOrder}|| '%'
+                </if>
+                <if test="itemNumber != null and itemNumber != ''">
+                    AND C2.VALUE LIKE '%' ||#{itemNumber}|| '%'
+                </if>
+                <if test="shopOrder != null and shopOrder != ''">
+                    AND SD.SHOP_ORDER = #{shopOrder}
+                </if>
+                <if test="resourceType != null and resourceType != ''">
+                    AND SD.RESOURCE_TYPE = #{resourceType}
+                </if>
+                <if test="resrce != null and resrce != ''">
+                    AND SD.RESRCE = #{resrce}
+                </if>
+                <if test="operation != null and operation != ''">
+                    AND SD.OPERATION = #{operation}
+                </if>
+                <if test="operationDescription != null and operationDescription != ''">
+                    AND OT.DESCRIPTION = #{operationDescription}
+                </if>
+                <if test="sfc != null and sfc != ''">
+                    AND SD.SFC = #{sfc}
+                </if>
+                <if test="turnOperation != null and turnOperation != ''">
+                    AND SD.TURN_OPERATION = #{turnOperation}
+                </if>
+                <if test="component != null and component != ''">
+                    AND CP.ITEM = #{component}
+                </if>
+                <if test="componentDescription != null and componentDescription != ''">
+                    AND CPT.DESCRIPTION LIKE '%' || #{componentDescription} || '%'
+                </if>
+                <if test="isDispatch != null and isDispatch != ''">
+                    AND SD.IS_DISPATCH = #{isDispatch}
+                </if>
+                <if test="blankingSize != null and blankingSize != ''">
+                    AND SD.BLANKING_SIZE LIKE '%'||#{blankingSize}||'%'
+                </if>
+                <if test="startFromDate != null">
+                    AND SO.PLANNED_START_DATE >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD')
+                </if>
+                <if test="startToDate != null">
+                    AND SO.PLANNED_START_DATE &lt;= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
+                </if>
+                <if test="completeFromDate != null">
+                    AND SO.PLANNED_COMP_DATE >= TO_DATE(#{completeFromDate}, 'YYYY-MM-DD')
+                </if>
+                <if test="completeToDate != null">
+                    AND SO.PLANNED_COMP_DATE &lt;= TO_DATE(#{completeToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
+                </if>
+            ) WIP
+            LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ
+            LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ
         ) WIP
-        LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ
-        LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ
-        WHERE 1 = 1
-        <if test="isCompleted != null and isCompleted != '' and isCompleted = 'true'">
-            AND V1.DISPATCH_STATUS = 'COMPLETE'
+        <if test="isCompleted != null and isCompleted != ''">
+            WHERE WIP.IS_COMPLETED = #{isCompleted}
         </if>
         ORDER BY WIP.SHOP_ORDER, WIP.SFC, TO_NUMBER(WIP.DISPATCH_SEQ)
     </select>