报表

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

@@ -151,7 +151,7 @@
                  ELSE  WCT2.DESCRIPTION
                 END WORK_CENTER_DESCRIPTION,
             ZRRT.RESOURCE_NO,R.DESCRIPTION RESOURCE_DESCRIPTION,ZRRT.NC_CODE_NO, /*不良代码描述,维修人员*/
-            ZRRT.PRELIMINARY_REASON ,ZRRT.DEAL_WAY ,ZRRT.DEAL_WAY_DESCRIPTION ,
+            ZRRT.PRELIMINARY_REASON ,dflt.DATA_TAG DEAL_WAY ,ZRRT.DEAL_WAY_DESCRIPTION ,
             I.ITEM ITEM,
             CASE WHEN ZRITS.ITEM_BO != 'NULL' THEN IT.DESCRIPTION
                  ELSE ZRITS.DESCRIPTION
@@ -194,6 +194,9 @@
                 LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = ZRITS.ITEM_BO AND CF."ATTRIBUTE" = 'MAT_SPEC'
 
                 LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZRRT.REPORT_USER AND ZNU.SITE = ZRRT.SITE
+                LEFT JOIN DATA_FIELD df ON df.DATA_FIELD = 'REPAIR_DEAL_WAY'
+                LEFT JOIN DATA_FIELD_LIST dfl ON dfl.DATA_FIELD_BO = df.HANDLE AND dfl.DATA_VALUE = ZRRT.DEAL_WAY
+                LEFT JOIN DATA_FIELD_LIST_T dflt ON dflt.DATA_FIELD_LIST_BO = dfl.HANDLE AND dflt.LOCALE = #{locale}
         <where>
             ZRRT.SITE = #{site}
             <if test="param.workCenter != null and param.workCenter != ''">
@@ -286,7 +289,10 @@
                 zsd.EMPLOYEE_DESCRIPTION  DISPATCH_USER ,ot.DESCRIPTION OPERATION ,
                 r2.RESRCE RESRCE,r2.DESCRIPTION RESRCE_DESCRIPTION,zsd.RESOURCE_TYPE RESOURCE_TYPE,
                rt.DESCRIPTION RESOURCE_TYPE_DESCRIPTION,zabd.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,zabd.DUTY_TYPE DUTY_TYPE,
-               zabd.DUTY_DEPART DUTY_DEPART,TO_CHAR(TO_NUMBER(zabd.CLOSED_DATE_TIME - zab.RESPONSE_DATE_TIME)*24,'FM9999990.00') WORKING_HOURS
+               zabd.DUTY_DEPART DUTY_DEPART,TO_CHAR(TO_NUMBER(zabd.CLOSED_DATE_TIME - zab.RESPONSE_DATE_TIME)*24,'FM9999990.00') WORKING_HOURS,
+               CASE WHEN zab.SFC IS NOT NULL THEN '质量异常'
+               ELSE '外协质量异常'
+               END ABNORMAL_TYPE
         FROM Z_ABNORMAL_BILL zab
                  INNER JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zab.HANDLE = zabd.ABNORMAL_BILL_BO
                  LEFT JOIN Z_ABNORMAL_NC_CODE zanc ON zab.HANDLE = zanc.ABNORMAL_BILL_BO
@@ -358,7 +364,7 @@
                  zabd.CLOSED_DATE_TIME ,zab.NC_QTY ,zab.PB_QTY ,zab.SHOP_ORDER,so.QTY_TO_BUILD,
                  zsd.EMPLOYEE_DESCRIPTION  ,ot.DESCRIPTION  ,
                  r2.RESRCE,r2.DESCRIPTION,zsd.RESOURCE_TYPE,
-                 rt.DESCRIPTION, dflt.DATA_TAG,zabd.DUTY_CAUSE_TYPE,zabd.DUTY_TYPE ,zabd.DUTY_DEPART,
+                 rt.DESCRIPTION, dflt.DATA_TAG,zabd.DUTY_CAUSE_TYPE,zabd.DUTY_TYPE ,zabd.DUTY_DEPART,zab.SFC,
         znu.FULL_NAME,znu2.FULL_NAME,zab.RESPONSE_DATE_TIME,dflt2.DATA_TAG
         ORDER BY zab.CREATED_DATE_TIME DESC
     </select>
@@ -393,7 +399,10 @@
                znu4.FULL_NAME CANCEL_USER,zabd.RESOLVE_REMARK RESOLVE_REMARK,
                zabd.ABNORMAL_REASON ABNORMAL_REASON,zabd.BEFORE_MEASURE BEFORE_MEASURE,
                ug.DESCRIPTION RESOLVE_SEND_USER_GROUP,
-               TO_CHAR(TO_NUMBER(zabd.RESOLVE_DATE_TIME - zsr.CREATED_DATE_TIME)*24,'FM9999990.00') RESOLVE_DURATION,
+               CASE WHEN zsr.CREATED_DATE_TIME IS NOT NULL THEN TO_CHAR(TO_NUMBER(zabd.RESOLVE_DATE_TIME - zsr.CREATED_DATE_TIME)*24,'FM9999990.00')
+                    WHEN zabd.RESOLVE_DATE_TIME IS NOT NULL THEN TO_CHAR(TO_NUMBER(zabd.RESOLVE_DATE_TIME - zab.CREATED_DATE_TIME)*24,'FM9999990.00')
+                    ELSE ''
+                    END RESOLVE_DURATION,
                zabd.DUTY_DEPART DUTY_DEPART
         FROM Z_ABNORMAL_BILL zab
         LEFT JOIN Z_ABNORMAL_NC_CODE zanc ON zanc.ABNORMAL_BILL_BO = zab.HANDLE
@@ -403,7 +412,7 @@
         LEFT JOIN NC_CODE nc ON zanc.NC_CODE = nc.NC_CODE AND nc.SITE = zab.SITE
         LEFT JOIN NC_CODE_T nct ON nct.NC_CODE_BO = nc.HANDLE AND nct.LOCALE = 'zh'
         LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zab.SHOP_ORDER AND so.SITE = zab.SITE
-        LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE
+        LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'WORK_ORDER'
         LEFT JOIN ITEM i ON i.HANDLE = zab.ITEM_BO
         LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE AND it.LOCALE = 'zh'
         LEFT JOIN OPERATION o ON o.OPERATION = zab.OPERATION AND o.SITE = zab.SITE
@@ -464,7 +473,11 @@
                 END IS_ANOMALY,
            CASE WHEN zsd.PLANNED_COMP_DATE IS NOT NULL THEN  TO_CHAR(TO_NUMBER(zsd.PLANNED_COMP_DATE - SYSDATE),'FM9999990.00')
            ELSE ''
-           END  SURPLUS_DAY
+           END  SURPLUS_DAY,
+           CASE WHEN zsd.ACTUAL_START_DATE IS NOT null AND cf3.VALUE IS NOT null  AND cf3.VALUE != 0 AND zsd.ACTUAL_COMPLETE_DATE IS NULL
+           THEN ROUND(TO_NUMBER(SYSDATE - zsd.ACTUAL_START_DATE)/TO_NUMBER(cf3.VALUE),2) || '%'
+           ELSE ''
+           END  PROCESS_PROGRESS
     FROM Z_SFC_DISPATCH zsd
              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 AND wct.LOCALE = 'zh'
@@ -483,6 +496,9 @@
              LEFT JOIN OPERATION o2 ON o2.OPERATION = zsd.OPERATION AND o2.SITE = zsd.SITE
              LEFT JOIN OPERATION_T ot2 ON ot2.OPERATION_BO = o2.HANDLE AND ot2.LOCALE = 'zh'
              LEFT JOIN Z_ABNORMAL_BILL zab ON zab.SFC = zsd.SFC AND zab.OPERATION = zsd.OPERATION AND zab.SITE = zsd.SITE
+             LEFT JOIN ROUTER_STEP rs ON zsd.ROUTER_BO = rs.ROUTER_BO AND rs.STEP_ID = zsd.STEP_ID
+             LEFT JOIN ROUTER_OPERATION ro ON ro.ROUTER_STEP_BO = rs.HANDLE AND ro.OPERATION_BO = ss.OPERATION_BO
+             LEFT JOIN CUSTOM_FIELDS cf3 ON cf3.HANDLE = ro.HANDLE AND cf3."ATTRIBUTE" = 'PROD_TIME'
         <where>
             zsd.SITE = #{site}
             <if test="workCenter != null and workCenter != ''">