上工序已完成报表SQL修改

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -2127,6 +2127,7 @@
         </if>
     </select>
     <select id="lastOperationCompletedReport" resultType="java.util.Map" parameterType="java.util.HashMap">
+        --上工序已完成报表
         SELECT WIP.*,
         CASE
         WHEN WIP.BEFORE_SEQ = 0
@@ -2159,7 +2160,9 @@
         TO_CHAR(zsd.DISPATCH_QTY * zsd.PROD_HOURS, '99990.99') TOTAL_PROD_HOURS,
         zsd.SITE                                               SITE,
         s.SFC                                                  SFC,
-                        zsd.DISPATCH_SEQ - 1                                   BEFORE_SEQ,
+        ZSD.DISPATCH_SEQ - 1                                   BEFORE_SEQ,
+        zsd.PREPOSITION_OPERATION                              PREPOSITION_OPERATION,
+        zsd.ROUTER_BO                                          ROUTER_BO,
         zsd.PLANNED_START_DATE                                 PLANNED_START_DATE,
         zsd.PLANNED_COMP_DATE                                  PLANNED_COMP_DATE,
         zsd.ACTUAL_START_DATE                                  ACTUAL_START_DATE
@@ -2183,15 +2186,14 @@
         LEFT JOIN ITEM CP ON CP.HANDLE = BC.COMPONENT_GBO
         LEFT JOIN ITEM_T ct ON CT.ITEM_BO = CP.HANDLE AND CT.LOCALE = 'zh'
         GROUP BY S.SFC) WIP ON WIP.SFC = s.SFC
-                 WHERE (zsd.DISPATCH_STATUS = 'NEW'
-                     OR zsd.DISPATCH_STATUS = 'RELEASE'
-                     OR zsd.DISPATCH_STATUS = 'START')
+        WHERE zsd.DISPATCH_STATUS = 'NEW'
         ORDER BY wct.DESCRIPTION, zsd.DISPATCH_NO DESC) WIP
         LEFT JOIN Z_SFC_DISPATCH V1
-                           ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ
+        ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.ROUTER_BO = WIP.ROUTER_BO
+        AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ
         LEFT JOIN OPERATION o ON o.OPERATION = V1.OPERATION AND o.SITE = V1.SITE
         LEFT JOIN OPERATION_T ot ON ot.OPERATION_BO = o.HANDLE AND ot.LOCALE = 'zh'
-                 WHERE 1=1
+        WHERE 1 = 1
         <if test="workOrder != null and workOrder != ''">
             AND WIP.WORK_ORDER = #{workOrder}
         </if>
@@ -2404,7 +2406,7 @@ SELECT zab.CREATED_DATE_TIME,
         INNER JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zab.HANDLE = zabd.ABNORMAL_BILL_BO
         INNER JOIN Z_ABNORMAL_NC_CODE zanc ON zab.HANDLE = zanc.ABNORMAL_BILL_BO
         INNER JOIN NC_CODE nc ON zanc.NC_CODE = nc.NC_CODE AND nc.SITE = zab.SITE
-        INNER JOIN NC_CODE_T nct ON nct.NC_CODE_BO = nc.HANDLE
+        INNER JOIN NC_CODE_T nct ON nct.NC_CODE_BO = nc.HANDLE AND nct.LOCALE = 'zh'
         INNER JOIN ITEM i ON i.HANDLE = zab.ITEM_BO
         LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE
         INNER JOIN DATA_FIELD df ON df.DATA_FIELD = 'PRODUCT_CATEGORY'