From ec86e3b2012e517288faf7695df477d402f1f8f1 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Mon, 6 Sep 2021 18:32:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BA=BA=E5=91=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=9B=E6=AF=8F=E6=97=A5=E7=94=9F=E4=BA=A7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8A=A5=E8=A1=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/ReportDataMapper.xml     | 40 +++++++++++++------
 .../resources/mapper/SelfReportMapper.xml     |  2 +-
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index f6004a3c..61daf532 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -122,18 +122,20 @@
                OT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION , ZSD.DISPATCH_STATUS OPERATION_STATUS ,
                ZSD.PROD_HOURS ,ZSD.ACTUAL_PROD_HOURS , ZSD.PLANNED_START_DATE , ZSD.PLANNED_COMP_DATE , ZSD.ACTUAL_START_DATE , ZSD.ACTUAL_COMPLETE_DATE
         FROM Z_SFC_DISPATCH ZSD
-                 LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER
-                 LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = SO.HANDLE AND CFA."ATTRIBUTE" = 'WORK_ORDER'
-                 LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = SO.HANDLE AND CFB."ATTRIBUTE" = 'ITEM_NUMBER'
-                 LEFT JOIN SFC S ON S.SFC = ZSD.SFC
-                 LEFT JOIN ITEM I ON I.HANDLE = S.ITEM_BO
-                 LEFT JOIN ITEM_T IT ON IT.ITEM_BO = S.ITEM_BO
-                 LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER
-                 LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE
-                 LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION
-                 LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE
-                 LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE
-                 LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO
+            LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER
+            LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = SO.HANDLE AND CFA."ATTRIBUTE" = 'WORK_ORDER'
+            LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = SO.HANDLE AND CFB."ATTRIBUTE" = 'ITEM_NUMBER'
+            LEFT JOIN SFC S ON S.SFC = ZSD.SFC
+            LEFT JOIN ITEM I ON I.HANDLE = S.ITEM_BO
+            LEFT JOIN ITEM_T IT ON IT.ITEM_BO = S.ITEM_BO
+            LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER
+            LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE
+            LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION
+            LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE
+            LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE
+            LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO
+            LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE AND R.SITE = ZSD.SITE
+            LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CHECK_USR'
         WHERE ZSD.SITE = #{site}
         <if test="itemNumber != null and itemNumber != ''" >
             AND CFB.VALUE LIKE '%'||#{itemNumber}||'%'
@@ -150,6 +152,18 @@
         <if test="resrce != null and resrce != ''" >
             AND ZSD.RESRCE = #{resrce}
         </if>
+        <if test="checkUsr != null and checkUsr != ''" >
+            AND CF.VALUE = #{checkUsr}
+        </if>
+        <if test="operation != null and operation != ''" >
+            AND ZSD.OPERATION = #{operation}
+        </if>
+        <if test="item != null and item != ''" >
+            AND I.ITEM = #{item}
+        </if>
+        <if test="sfc != null and sfc != ''" >
+            AND ZSD.SFC = #{sfc}
+        </if>
         <if test="routerType != null and routerType != ''" >
             <if test="routerType = 'C'.toString()" >
                 AND RU.ROUTER_TYPE = #{routerType}
@@ -160,7 +174,7 @@
         </if>
         <if test="operationStatus != null and operationStatus != ''" >
             <if test="operationStatus = 'OTHER'.toString()" >
-                AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE'
+                AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL'
             </if>
             <if test="operationStatus != 'OTHER'.toString()" >
                 AND ZSD.DISPATCH_STATUS = #{operationStatus}
diff --git a/quality/src/main/resources/mapper/SelfReportMapper.xml b/quality/src/main/resources/mapper/SelfReportMapper.xml
index c5f0fdf7..0faa64d5 100644
--- a/quality/src/main/resources/mapper/SelfReportMapper.xml
+++ b/quality/src/main/resources/mapper/SelfReportMapper.xml
@@ -622,7 +622,7 @@
     <!--查询设备和设备上的检验人员-->
     <select id="selectResourceAndCheckUsr" resultMap="BaseResultMap">
         SELECT R.RESRCE ,R.DESCRIPTION ,CF.VALUE CHECK_USR  FROM RESRCE R
-        LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CHECK_USR'
+        INNER JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CHECK_USR'
         WHERE R.SITE = #{site}
     </select>