Merge remote-tracking branch 'mesnac/master'

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java

@@ -25,7 +25,7 @@ public class ReportController {
     /**
      * 接口日志表
      * @param map
-     * @return
+     * @returnresourceRepair
      */
     @PostMapping("/findIntegrationLog")
     public R findIntegrationLog(@RequestBody(required = false)Map<String, Object> map){
@@ -110,4 +110,19 @@ public class ReportController {
             return R.failed(e.getMessage());
         }
     }
+
+    /**
+     * 异常记录表
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/findAbnormalRecord")
+    public R findAbnormalRecord(@RequestBody(required = false) Map paramMap){
+        try{
+            List<Map<String, Object>> result = reportService.findAbnormalRecord(paramMap);
+            return R.ok(result);
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java

@@ -34,4 +34,6 @@ public interface ReportMapper {
      * @return
      */
     List<Map<String,Object>> findQualityInspectionReport(Map paramMap);
+
+    List<Map<String,Object>> findAbnormalRecord(Map paramMap);
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java

@@ -33,4 +33,11 @@ public interface ReportService {
      * @return
      */
     List<Map<String, Object>> findQualityInspectionReport(Map paramMap);
+
+    /**
+     * 查询异常记录表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> findAbnormalRecord(Map paramMap);
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java

@@ -230,6 +230,15 @@ public class ReportServiceImpl implements ReportService {
 
         return qualityInspectionReport;
     }
+
+    @Override
+    public List<Map<String, Object>> findAbnormalRecord(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site",site);
+        paramMap.put("locale",LocaleContextHolder.getLocale().getLanguage());
+        List<Map<String, Object>> findAbnormalRecord = reportMapper.findAbnormalRecord(paramMap);
+        return null;
+    }
 }
 
 

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

@@ -141,11 +141,25 @@
                 END ITEM_DESCRIPTION,
             CF.VALUE ITEM_SPEC,
             ZRRT.ACTUAL_START_DATE ACTUAL_START_DATE,ZRRT.ACTUAL_COMPLETE_DATE ACTUAL_COMPLETE_DATE,
-            TRUNC(TO_NUMBER((ZRRT.ACTUAL_COMPLETE_DATE-ZRRT.ACTUAL_START_DATE)*24),2) SHUT_DOWN_TIME,
-            TRUNC(TO_NUMBER((ZRRT.WAIT_END_DATE -ZRRT.WAIT_START_DATE)*24),2) REPAIR_WAIT_TIME,
-            TRUNC(TO_NUMBER((ZRRT.ACTUAL_COMPLETE_DATE-ZRRT.ACTUAL_START_DATE-ZRRT.WAIT_TIME)*24),2) REPAIR_TIME,
-            ZRRT. STATUS ,ZRRT.REPORT_USER REPORT_USER,ZNU.FULL_NAME REPORT_USER_DESCRIPTION,
-               ZRRT.REPAIR_USERS ,ZRRT.REMARK
+            CASE WHEN ZRRT.STOP_MACHINE = 'Y' THEN TRUNC(TO_NUMBER((ZRRT.ACTUAL_COMPLETE_DATE-ZRRT.CREATED_DATE_TIME)*24),2)
+                 WHEN ZRRT.STOP_MACHINE = 'N' THEN TRUNC(TO_NUMBER((SYSDATE-ZRRT.CREATED_DATE_TIME)*24),2)
+                 END SHUT_DOWN_TIME,
+            CASE WHEN ZRRT.STOP_MACHINE = 'Y' THEN TRUNC(TO_NUMBER((ZRRT.WAIT_END_DATE -ZRRT.WAIT_START_DATE)*24),2)
+                 WHEN ZRRT.STOP_MACHINE = 'N' THEN TRUNC(TO_NUMBER((SYSDATE-ZRRT.WAIT_START_DATE)*24),2)
+                 END REPAIR_WAIT_TIME,
+
+            CASE WHEN ZRRT.STOP_MACHINE = 'Y' THEN TRUNC(TO_NUMBER((ZRRT.ACTUAL_COMPLETE_DATE-ZRRT.CREATED_DATE_TIME-ZRRT.WAIT_TIME)*24),2)
+                 WHEN ZRRT.STOP_MACHINE = 'N' THEN TRUNC(TO_NUMBER((SYSDATE-ZRRT.CREATED_DATE_TIME-ZRRT.WAIT_TIME)*24),2)
+                 END REPAIR_TIME,
+            CASE WHEN ZRRT.STATUS = '401' THEN '待维修'
+                 WHEN ZRRT.STATUS = '501' THEN '维修中'
+                 WHEN ZRRT.STATUS = '502' THEN '维修等待'
+                 WHEN ZRRT.STATUS = '302' THEN '关闭'
+                 WHEN ZRRT.STATUS = '301' THEN '维修完成'
+                 WHEN ZRRT.STATUS = '601' THEN '报修单确认'
+                END STATUS
+            ,ZRRT.REPORT_USER REPORT_USER,ZNU.FULL_NAME REPORT_USER_DESCRIPTION,
+            ZRRT.REPAIR_USERS ,ZRRT.REMARK
         FROM
             Z_RESOURCE_REPAIR_TASK ZRRT
                 INNER JOIN RESRCE R ON R.RESRCE = ZRRT.RESOURCE_NO AND R.SITE = ZRRT.SITE
@@ -325,4 +339,57 @@
                  rt.DESCRIPTION, dflt.DATA_TAG,zabd.DUTY_CAUSE_TYPE,zabd.DUTY_TYPE ,zabd.DUTY_DEPART
         ORDER BY zab.CREATED_DATE_TIME DESC
     </select>
+
+    <select id="findAbnormalRecord" parameterType="java.util.HashMap" resultType="java.util.HashMap">
+        SELECT wc.WORK_CENTER ,zab.PRODUCT_CATEGORY ,cf.VALUE WORK_ORDER,so.SHOP_ORDER SHOP_ORDER ,
+               i.ITEM ITEM,it.DESCRIPTION ITEM_DESCRIPTION,zab.SFC SFC,zab.ABNORMAL_NO ABNORMAL_NO,
+               CASE WHEN zab."TYPE" = 'Z' THEN '质量异常'
+                    WHEN zab."TYPE" = 'S' THEN '设备异常'
+                    WHEN zab."TYPE" = 'Q' THEN '其他异常' END ABNORMAL_TYPE,
+               zab.OPERATION OPERATION ,ot.DESCRIPTION OPERATION_DESCRIPTION,r.RESRCE RESRCE,r.DESCRIPTION RESRCE_DESCRIPTION,
+               zab.CREATED_DATE_TIME CREATED_DATE_TIME ,znu.FULL_NAME PB_USER,znu2.FULL_NAME REPORT_USER,
+               LISTAGG(nct.DESCRIPTION , ';') WITHIN GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE_DESCRIPTION,
+               CASE WHEN zab.STATUS = 'N' THEN '新建'
+                    WHEN zab.STATUS = 'X' THEN '响应中'
+                    WHEN zab.STATUS = 'F' THEN '方案确认'
+                    WHEN zab.STATUS = 'J' THEN '纠防确认'
+                    WHEN zab.STATUS = 'Q' THEN '取消'
+                    WHEN zab.STATUS = 'G' THEN '关闭' END ABNORMAL_STATUS,
+               CASE WHEN zabd.ABNORMAL_METHOD = 'X' THEN '线下换料'
+                    WHEN zabd.ABNORMAL_METHOD = 'S' THEN '试装'
+                    WHEN zabd.ABNORMAL_METHOD = 'R' THEN '让步放心'
+                    WHEN zabd.ABNORMAL_METHOD = 'C' THEN '报废'
+                    WHEN zabd.ABNORMAL_METHOD = 'P' THEN '配作'
+                    WHEN zabd.ABNORMAL_METHOD = 'F' THEN '返修'
+                    ELSE ''
+                   END ABNORMAL_METHOD,zabd.RESOLVE_DATE_TIME RESOLVE_DATE_TIME,
+               znu3.FULL_NAME RESOLVE_USER,zabd.CLOSED_DATE_TIME CANCEL_DATE_TIME ,
+               znu4.FULL_NAME CANCEL_USER,zabd.RESOLVE_REMARK RESOLVE_REMARK,
+               zabd.ABNORMAL_REASON ABNORMAL_REASON,zabd.BEFORE_MEASURE BEFORE_MEASURE
+        FROM Z_ABNORMAL_BILL zab
+                 LEFT JOIN Z_ABNORMAL_NC_CODE zanc ON zanc.ABNORMAL_BILL_BO = zab.HANDLE
+                 LEFT JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zabd.ABNORMAL_BILL_BO = zab.HANDLE
+                 LEFT JOIN WORK_CENTER wc ON wc.WORK_CENTER = SUBSTR(zab.OPERATION,1,INSTR(zab.OPERATION,'_')-1)
+                 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
+                 INNER 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
+                 LEFT JOIN OPERATION_T ot ON ot.OPERATION_BO = o.HANDLE AND ot.LOCALE = 'zh'
+                 LEFT JOIN RESRCE r ON r.RESRCE = zab.RESRCE AND r.SITE = zab.SITE
+                 LEFT JOIN Z_NWA_USER znu ON znu.USER_NAME = zab.PB_USER
+                 LEFT JOIN Z_NWA_USER znu2 ON znu2.USER_NAME = zab.CREATED_USER
+                 LEFT JOIN Z_NWA_USER znu3 ON znu3.USER_NAME = zabd.RESOLVE_USER
+                 LEFT JOIN Z_NWA_USER znu4 ON znu4.USER_NAME = zabd.CLOSED_USER
+        GROUP BY wc.WORK_CENTER ,zab.PRODUCT_CATEGORY ,cf.VALUE ,so.SHOP_ORDER ,
+                 i.ITEM ,it.DESCRIPTION,zab.SFC,zab."TYPE" ,zab.ABNORMAL_NO,
+                 zab.OPERATION,ot.DESCRIPTION,r.RESRCE,r.DESCRIPTION,
+                 zab.CREATED_DATE_TIME ,znu.FULL_NAME,znu2.FULL_NAME,
+                 zab.STATUS,zabd.ABNORMAL_METHOD,zabd.RESOLVE_DATE_TIME ,
+                 znu3.FULL_NAME,zabd.CLOSED_DATE_TIME ,znu4.FULL_NAME,
+                 zabd.RESOLVE_REMARK,zabd.ABNORMAL_REASON,zabd.BEFORE_MEASURE
+        ORDER BY zab.CREATED_DATE_TIME DESC
+    </select>
 </mapper>

common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java

@@ -57,21 +57,22 @@ public class ReportDataController {
     }
 
     /**
-     * 设备负荷率报表
+     * 设备、设备类型负荷率报表
      * 查询设备每日的负荷率
      * @param paramMap
      * @return
      */
-    @GetMapping("/findResourceLoadRateInfo")
+    @GetMapping("/findResourceOrResourceTypeLoadRateInfo")
     public R findResourceLoadRateInfo(@RequestParam(required = false) Map paramMap) {
         try {
-            List<Map<String, Object>> result = reportDataService.findResourceLoadRateInfo(paramMap);
+            List<Map<String, Object>> result = reportDataService.findResourceOrResourceTypeLoadRateInfo(paramMap);
             return R.ok(result);
         } catch (Exception e) {
             return R.failed(e.getMessage());
         }
     }
 
+
     /**
      * 设备维修数据统计报表
      *

common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java

@@ -15,13 +15,15 @@ public interface ReportDataMapper {
 
     List<Map<String, Object>> findResourceLoadRateInfo(Map paramMap);
 
+    List<Map<String, Object>> findResourceTypeLoadRateInfo(Map paramMap);
+
     List<Map<String, Object>> findResourceRepairDataStatInfo(Map paramMap);
 
     List<Map<String, Object>> findProductStateInfo(Map paramMap);
 
-    void insertReportDateTimeByStartToDate(@Param("site") String site ,@Param("startFromDate") String startFromDate,@Param("startToDate") String startToDate);
+/*    void insertReportDateTimeByStartToDate(@Param("site") String site ,@Param("startFromDate") String startFromDate,@Param("startToDate") String startToDate);
 
-    void deleteAllReportDateTime();
+    void deleteAllReportDateTime();*/
 
     List<Map<String, Object>> findWorkShopPassRate(Map paramMap);
 

common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java

@@ -21,12 +21,13 @@ public interface ReportDataService {
     List<Map<String, Object>> findInspectionTaskDetail(Map paramMap);
 
     /**
-     * 设备负荷率报表
+     * 设备、设备类型负荷率报表
      *
      * @param paramMap
      * @return
      */
-    List<Map<String, Object>> findResourceLoadRateInfo(Map paramMap);
+    List<Map<String, Object>> findResourceOrResourceTypeLoadRateInfo(Map paramMap);
+
     /**
      * 设备维修数据统计报表
      *

common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -30,7 +31,7 @@ public class ReportDataServiceImpl implements ReportDataService{
     }
 
     @Override
-    public List<Map<String, Object>> findResourceLoadRateInfo(Map paramMap) {
+    public List<Map<String, Object>> findResourceOrResourceTypeLoadRateInfo(Map paramMap) {
         String site = CommonMethods.getSite();
         paramMap.put("site",site);
         String startFromDate = (String) paramMap.get("startFromDate");
@@ -41,11 +42,18 @@ public class ReportDataServiceImpl implements ReportDataService{
         }catch (Exception e){
             throw BusinessException.build("时间格式错误！");
         }
-        // 清空日期表数据
-        reportDataMapper.deleteAllReportDateTime();
-        // 插入日期查询范围
-        reportDataMapper.insertReportDateTimeByStartToDate(site,startFromDate,startToDate);
-        List<Map<String, Object>> resourceLoadRateInfo = reportDataMapper.findResourceLoadRateInfo(paramMap);
+        String resourceOrResourceType = (String) paramMap.get("resourceOrResourceType");
+        List<Map<String, Object>> resourceLoadRateInfo;
+        switch (resourceOrResourceType){
+            case "RESOURCE_TYPE":
+                resourceLoadRateInfo = reportDataMapper.findResourceTypeLoadRateInfo(paramMap);
+                break;
+            case "RESOURCE":
+                resourceLoadRateInfo = reportDataMapper.findResourceLoadRateInfo(paramMap);
+                break;
+            default:
+                throw  BusinessException.build("未找到查询路径！");
+        }
         if (resourceLoadRateInfo.size() < 1){
             throw BusinessException.build("按条件查询未找到数据！");
         }

common/src/main/resources/mapper/ReportDataMapper.xml

@@ -54,31 +54,25 @@
 
     <!--设备负荷率报表-->
     <select id="findResourceLoadRateInfo" resultType="java.util.HashMap" parameterType="java.util.HashMap" >
-        WITH TEMP AS (
+        WITH
+            TEMP AS (
         SELECT  ZSD.PLANNED_COMP_DATE ,ZSD.PLANNED_START_DATE ,ZSD.RESRCE
-        FROM Z_SFC_DISPATCH ZSD WHERE ZSD.SITE = #{site}  AND ZSD.DISPATCH_STATUS IN ('START','COMPLETE','RELEASE')
-        )
-        SELECT T.*,T.RATE_DATA_INT || '%' RATE_DATA FROM
-        (
-        SELECT RDT.* ,  ROUND((SUM( (DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
-        + DECODE(E.CNT,NULL,0,E.CNT) + DECODE(F.CNT,NULL,0,F.CNT) + DECODE(G.CNT,NULL,0,G.CNT) + DECODE(H.CNT,NULL,0,H.CNT)
-        + DECODE(I.CNT,NULL,0,I.CNT) + DECODE(J.CNT,NULL,0,J.CNT) ) + DECODE(K.CNT,NULL,0,K.CNT) + DECODE(L.CNT,NULL,0,L.CNT) ) * RDT.CAPACITY_MAN_HOUR / 8),4)   PLAN_HOUR
-        ,CASE WHEN RDT.CAPACITY_MAN_HOUR = 0 THEN 0
-        ELSE ROUND(SUM( ( DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
-        + DECODE(E.CNT,NULL,0,E.CNT) + DECODE(F.CNT,NULL,0,F.CNT) + DECODE(G.CNT,NULL,0,G.CNT) + DECODE(H.CNT,NULL,0,H.CNT)
-        + DECODE(I.CNT,NULL,0,I.CNT) + DECODE(J.CNT,NULL,0,J.CNT) + DECODE(K.CNT,NULL,0,K.CNT) + DECODE(L.CNT,NULL,0,L.CNT)
-        ) ) / 8 , 4) * 100
-        END RATE_DATA_INT
-        FROM
-        ( SELECT R.SITE,R.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION, DATE_TIME, DECODE(CF.VALUE,NULL,0,CF.VALUE) CAPACITY_MAN_HOUR ,  WCA.WORK_CENTER CENTER ,
+        FROM Z_SFC_DISPATCH ZSD WHERE ZSD.SITE = #{site}  AND ZSD.DISPATCH_STATUS IN ('START','COMPLETE','RELEASE') ),
+            Z_REPORT_DATE_TIME AS (SELECT '1000' SITE ,TO_CHAR(TO_DATE(#{startFromDate},'YYYY-MM-DD') + ROWNUM -1, 'YYYY-MM-DD') DATE_TIME,
+        TO_DATE(#{startFromDate} || '00:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_START_DATE_TIME,
+        TO_DATE(#{startFromDate} || '04:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_END_DATE_TIME,
+        TO_DATE(#{startFromDate} || '05:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 PM_START_DATE_TIME ,
+        TO_DATE(#{startFromDate} || '09:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 PM_END_DATE_TIME
+        FROM dual CONNECT BY rownum &lt;= to_date( #{startToDate}, 'yyyy-mm-dd') - to_date( #{startFromDate}, 'yyyy-mm-dd') + 1 ) ,
+        RDT AS ( SELECT R.SITE,R.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION, DATE_TIME, DECODE(CF.VALUE,NULL,0,CF.VALUE) CAPACITY_MAN_HOUR ,  WCA.WORK_CENTER CENTER ,
         WCTA.DESCRIPTION CENTER_DESCRIPTION , WCB.WORK_CENTER , WCTB.DESCRIPTION WORK_CENTER_DESCRIPTION ,RT.RESOURCE_TYPE ,RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION
         FROM  RESRCE R
         LEFT JOIN WORK_CENTER_MEMBER WCMA ON  WCMA.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
         LEFT JOIN WORK_CENTER WCA ON WCA.HANDLE = WCMA.WORK_CENTER_BO
-        INNER JOIN WORK_CENTER_T WCTA ON WCTA.WORK_CENTER_BO = WCA.HANDLE AND WCTA.LOCALE = 'zh'
+        LEFT JOIN WORK_CENTER_T WCTA ON WCTA.WORK_CENTER_BO = WCA.HANDLE AND WCTA.LOCALE = 'zh'
         LEFT JOIN WORK_CENTER_MEMBER WCMB ON WCMB.WORK_CENTER_OR_RESOURCE_GBO = WCMA.WORK_CENTER_BO
-        INNER JOIN WORK_CENTER WCB ON WCB.HANDLE = WCMB.WORK_CENTER_BO
-        INNER JOIN WORK_CENTER_T WCTB ON WCTB.WORK_CENTER_BO = WCB.HANDLE AND WCTB.LOCALE = 'zh'
+        LEFT JOIN WORK_CENTER WCB ON WCB.HANDLE = WCMB.WORK_CENTER_BO
+        LEFT JOIN WORK_CENTER_T WCTB ON WCTB.WORK_CENTER_BO = WCB.HANDLE AND WCTB.LOCALE = 'zh'
         LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CAPACITY_MAN_HOUR'
         LEFT JOIN Z_REPORT_DATE_TIME  ON 1=1
         LEFT JOIN RESOURCE_TYPE_RESOURCE RTR ON  RTR.RESOURCE_BO = R.HANDLE
@@ -95,7 +89,20 @@
         </if>
         <if test="resourceType != null and resourceType != ''" >
             AND RT.RESOURCE_TYPE = #{resourceType}
-        </if>) RDT
+        </if> )
+        SELECT T.*,T.RATE_DATA_INT || '%' RATE_DATA FROM
+        (
+        SELECT RDT.* ,  ROUND((SUM( (DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
+        + DECODE(E.CNT,NULL,0,E.CNT) + DECODE(F.CNT,NULL,0,F.CNT) + DECODE(G.CNT,NULL,0,G.CNT) + DECODE(H.CNT,NULL,0,H.CNT)
+        + DECODE(I.CNT,NULL,0,I.CNT) + DECODE(J.CNT,NULL,0,J.CNT) ) + DECODE(K.CNT,NULL,0,K.CNT) + DECODE(L.CNT,NULL,0,L.CNT) ) * RDT.CAPACITY_MAN_HOUR / 8),4)   PLAN_HOUR
+        ,CASE WHEN RDT.CAPACITY_MAN_HOUR = 0 THEN 0
+        ELSE ROUND(SUM( ( DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
+        + DECODE(E.CNT,NULL,0,E.CNT) + DECODE(F.CNT,NULL,0,F.CNT) + DECODE(G.CNT,NULL,0,G.CNT) + DECODE(H.CNT,NULL,0,H.CNT)
+        + DECODE(I.CNT,NULL,0,I.CNT) + DECODE(J.CNT,NULL,0,J.CNT) + DECODE(K.CNT,NULL,0,K.CNT) + DECODE(L.CNT,NULL,0,L.CNT)
+        ) ) / 8 , 4) * 100
+        END RATE_DATA_INT
+        FROM
+             RDT
         LEFT JOIN
         (SELECT  DATE_TIME ,RESRCE , COUNT(*) * 8 CNT  FROM Z_REPORT_DATE_TIME
         LEFT JOIN TEMP ON PLANNED_START_DATE &lt;= AM_START_DATE_TIME AND PLANNED_COMP_DATE &gt;= PM_END_DATE_TIME
@@ -155,51 +162,50 @@
         </if>
     </select>
 
-
     <!--设备类型负荷率报表-->
     <select id="findResourceTypeLoadRateInfo" resultType="java.util.HashMap" parameterType="java.util.HashMap" >
         WITH TEMP AS (
         SELECT  ZSD.PLANNED_COMP_DATE ,ZSD.PLANNED_START_DATE ,ZSD.RESRCE
-        FROM Z_SFC_DISPATCH ZSD WHERE ZSD.SITE = #{site}  AND ZSD.DISPATCH_STATUS IN ('START','COMPLETE','RELEASE')
-        )
-        SELECT T.*,T.RATE_DATA_INT || '%' RATE_DATA FROM
-        (
-        SELECT RDT.* ,  ROUND((SUM( (DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
-        + DECODE(E.CNT,NULL,0,E.CNT) + DECODE(F.CNT,NULL,0,F.CNT) + DECODE(G.CNT,NULL,0,G.CNT) + DECODE(H.CNT,NULL,0,H.CNT)
-        + DECODE(I.CNT,NULL,0,I.CNT) + DECODE(J.CNT,NULL,0,J.CNT) ) + DECODE(K.CNT,NULL,0,K.CNT) + DECODE(L.CNT,NULL,0,L.CNT) ) * RDT.CAPACITY_MAN_HOUR / 8),4)   PLAN_HOUR
-        ,CASE WHEN RDT.CAPACITY_MAN_HOUR = 0 THEN 0
-        ELSE ROUND(SUM( ( DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
-        + DECODE(E.CNT,NULL,0,E.CNT) + DECODE(F.CNT,NULL,0,F.CNT) + DECODE(G.CNT,NULL,0,G.CNT) + DECODE(H.CNT,NULL,0,H.CNT)
-        + DECODE(I.CNT,NULL,0,I.CNT) + DECODE(J.CNT,NULL,0,J.CNT) + DECODE(K.CNT,NULL,0,K.CNT) + DECODE(L.CNT,NULL,0,L.CNT)
-        ) ) / 8 , 4) * 100
-        END RATE_DATA_INT
-        FROM
-        ( SELECT R.SITE,R.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION, DATE_TIME, DECODE(CF.VALUE,NULL,0,CF.VALUE) CAPACITY_MAN_HOUR ,  WCA.WORK_CENTER CENTER ,
-        WCTA.DESCRIPTION CENTER_DESCRIPTION , WCB.WORK_CENTER , WCTB.DESCRIPTION WORK_CENTER_DESCRIPTION ,RT.RESOURCE_TYPE ,RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION
+        FROM Z_SFC_DISPATCH ZSD WHERE ZSD.SITE = #{site}  AND ZSD.DISPATCH_STATUS != 'CANCEL'
+            AND ZSD.PLANNED_COMP_DATE IS NOT NULL  AND ZSD.PLANNED_START_DATE IS NOT NULL
+        ),
+        Z_REPORT_DATE_TIME AS (SELECT '1000' SITE ,TO_CHAR(TO_DATE(#{startFromDate},'YYYY-MM-DD') + ROWNUM -1, 'YYYY-MM-DD') DATE_TIME,
+        TO_DATE(#{startFromDate} || '00:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_START_DATE_TIME,
+        TO_DATE(#{startFromDate} || '04:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_END_DATE_TIME,
+        TO_DATE(#{startFromDate} || '05:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 PM_START_DATE_TIME ,
+        TO_DATE(#{startFromDate} || '09:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 PM_END_DATE_TIME
+        FROM dual CONNECT BY rownum &lt;= to_date( #{startToDate}, 'yyyy-mm-dd') - to_date( #{startFromDate}, 'yyyy-mm-dd') + 1) ,
+        RDT AS ( SELECT R.SITE,R.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION, DATE_TIME, DECODE(CF.VALUE,NULL,0,CF.VALUE) CAPACITY_MAN_HOUR ,
+        WCB.WORK_CENTER , WCTB.DESCRIPTION WORK_CENTER_DESCRIPTION ,RT.RESOURCE_TYPE ,RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION
         FROM  RESRCE R
         LEFT JOIN WORK_CENTER_MEMBER WCMA ON  WCMA.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
         LEFT JOIN WORK_CENTER WCA ON WCA.HANDLE = WCMA.WORK_CENTER_BO
-        INNER JOIN WORK_CENTER_T WCTA ON WCTA.WORK_CENTER_BO = WCA.HANDLE AND WCTA.LOCALE = 'zh'
+        LEFT JOIN WORK_CENTER_T WCTA ON WCTA.WORK_CENTER_BO = WCA.HANDLE AND WCTA.LOCALE = 'zh'
         LEFT JOIN WORK_CENTER_MEMBER WCMB ON WCMB.WORK_CENTER_OR_RESOURCE_GBO = WCMA.WORK_CENTER_BO
-        INNER JOIN WORK_CENTER WCB ON WCB.HANDLE = WCMB.WORK_CENTER_BO
-        INNER JOIN WORK_CENTER_T WCTB ON WCTB.WORK_CENTER_BO = WCB.HANDLE AND WCTB.LOCALE = 'zh'
+        LEFT JOIN WORK_CENTER WCB ON WCB.HANDLE = WCMB.WORK_CENTER_BO
+        LEFT JOIN WORK_CENTER_T WCTB ON WCTB.WORK_CENTER_BO = WCB.HANDLE AND WCTB.LOCALE = 'zh'
         LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CAPACITY_MAN_HOUR'
         LEFT JOIN Z_REPORT_DATE_TIME  ON 1=1
         LEFT JOIN RESOURCE_TYPE_RESOURCE RTR ON  RTR.RESOURCE_BO = R.HANDLE
         LEFT JOIN RESOURCE_TYPE RT ON RT.HANDLE = RTR.RESOURCE_TYPE_BO
         WHERE R.SITE = #{site}
-        <if test="center != null and center != ''" >
-            AND WCA.WORK_CENTER = #{center}
-        </if>
         <if test="workCenter != null and workCenter != ''" >
             AND WCB.WORK_CENTER = #{workCenter}
         </if>
-        <if test="resrce != null and resrce != ''" >
-            AND R.RESRCE = #{resrce}
-        </if>
         <if test="resourceType != null and resourceType != ''" >
             AND RT.RESOURCE_TYPE = #{resourceType}
-        </if>) RDT
+        </if>)
+        SELECT M.*,M.RATE_DATA_INT || '%' RATE_DATA FROM (
+        SELECT T.SITE,T.RESOURCE_TYPE, T.RESOURCE_TYPE_DESCRIPTION, T.WORK_CENTER, T.WORK_CENTER_DESCRIPTION,T.DATE_TIME,
+                ROUND(SUM(T.PLAN_HOUR) * SUM(T.CAPACITY_MAN_HOUR) / 8 ,4) PLAN_HOUR, SUM(T.CAPACITY_MAN_HOUR) CAPACITY_MAN_HOUR,
+               CASE WHEN SUM(T.PLAN_HOUR) = 0 THEN 0 ELSE ROUND(SUM(T.PLAN_HOUR)/8,4)*100 END RATE_DATA_INT
+            FROM
+        (
+        SELECT RDT.* , SUM( (DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
+        + DECODE(E.CNT,NULL,0,E.CNT) + DECODE(F.CNT,NULL,0,F.CNT) + DECODE(G.CNT,NULL,0,G.CNT) + DECODE(H.CNT,NULL,0,H.CNT)
+        + DECODE(I.CNT,NULL,0,I.CNT) + DECODE(J.CNT,NULL,0,J.CNT) ) + DECODE(K.CNT,NULL,0,K.CNT) + DECODE(L.CNT,NULL,0,L.CNT) )  PLAN_HOUR
+        FROM
+             RDT
         LEFT JOIN
         (SELECT  DATE_TIME ,RESRCE , COUNT(*) * 8 CNT  FROM Z_REPORT_DATE_TIME
         LEFT JOIN TEMP ON PLANNED_START_DATE &lt;= AM_START_DATE_TIME AND PLANNED_COMP_DATE &gt;= PM_END_DATE_TIME
@@ -248,16 +254,17 @@
         (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PM_END_DATE_TIME - PLANNED_START_DATE)*24 , 4) ) CNT FROM Z_REPORT_DATE_TIME
         LEFT JOIN TEMP ON PLANNED_START_DATE &gt; PM_START_DATE_TIME AND PLANNED_START_DATE &lt; PM_END_DATE_TIME AND PLANNED_COMP_DATE &gt;= PM_END_DATE_TIME
         GROUP BY RESRCE , DATE_TIME ) L ON L.DATE_TIME = RDT.DATE_TIME  AND L.RESRCE = RDT.RESRCE
-        GROUP BY RDT.SITE,RDT.RESRCE, RDT.RESOURCE_DESCRIPTION, RDT.DATE_TIME ,RDT.CAPACITY_MAN_HOUR , RDT.CENTER ,RDT.CENTER_DESCRIPTION ,RDT.WORK_CENTER ,RDT.WORK_CENTER_DESCRIPTION ,RDT.RESOURCE_TYPE ,RDT.RESOURCE_TYPE_DESCRIPTION
-        ORDER BY RDT.WORK_CENTER ,RDT.RESRCE, RDT.DATE_TIME ) T
-        WHERE T.SITE = #{site}
+        GROUP BY RDT.SITE,RDT.RESRCE, RDT.RESOURCE_DESCRIPTION, RDT.DATE_TIME ,RDT.CAPACITY_MAN_HOUR , RDT.WORK_CENTER ,RDT.WORK_CENTER_DESCRIPTION ,RDT.RESOURCE_TYPE ,RDT.RESOURCE_TYPE_DESCRIPTION
+        ) T
+        GROUP BY T.RESOURCE_TYPE, T.RESOURCE_TYPE_DESCRIPTION, T.WORK_CENTER, T.WORK_CENTER_DESCRIPTION,T.SITE,T.DATE_TIME ) M
+        WHERE M.SITE = #{site}
         <if test="startRate != null and startRate != ''">
-            AND T.RATE_DATA_INT &gt;= #{startRate}
+            AND M.RATE_DATA_INT &gt;= #{startRate}
         </if>
         <if test="endRate != null and endRate != ''">
-            AND T.RATE_DATA_INT &lt;= #{endRate}
+            AND M.RATE_DATA_INT &lt;= #{endRate}
         </if>
-
+        ORDER BY M.WORK_CENTER,M.RESOURCE_TYPE,M.DATE_TIME
     </select>
 
     <!--设备维修数据统计报表-->
@@ -365,10 +372,10 @@
         </foreach>
     </insert>
 
-    <!---->
+    <!--创建数据日期表-->
     <insert id="insertReportDateTimeByStartToDate"  >
         INSERT INTO Z_REPORT_DATE_TIME
-        SELECT '1000' ,TO_CHAR(TO_DATE(#{startFromDate},'YYYY-MM-DD') + ROWNUM -1, 'YYYY-MM-DD') DATE_TIME,
+        SELECT '1000' SITE ,TO_CHAR(TO_DATE(#{startFromDate},'YYYY-MM-DD') + ROWNUM -1, 'YYYY-MM-DD') DATE_TIME,
         TO_DATE(#{startFromDate} || '00:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_START_DATE_TIME,
         TO_DATE(#{startFromDate} || '04:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_END_DATE_TIME,
         TO_DATE(#{startFromDate} || '05:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 PM_START_DATE_TIME ,

console/src/main/resources/application-dev.yml

@@ -32,7 +32,7 @@ ws:
     port: 8000
     user: mesd001
     pwd: a123456
-    valid: N
+    enabled: false
 
 ftp:
   host: 106.52.244.124

console/src/main/resources/application-local.yml

@@ -68,6 +68,7 @@ ws:
     user: mes001
     pwd: mesprd
     valid: Y
+    enabled: false
 
 #quartz任务启用
 quartz:

console/src/main/resources/application-prd.yml

@@ -33,6 +33,7 @@ ws:
     user: mes001
     pwd: mesprd
     valid: Y
+    enabled: true
 
 #ftp
 ftp:

console/src/main/resources/application-qas.yml

@@ -38,6 +38,7 @@ ws:
     user: mesd001
     pwd: a123456
     valid: N
+    enabled: false
 
 #ftp
 ftp:

meapi/src/main/resources/mapper/NcCodeMapper.xml

@@ -433,7 +433,6 @@
                 UPPER(#{item})
             </foreach>
             AND NC.STATUS_BO = 'StatusBO:' || #{site} || ',101'
-            AND NG.NC_GROUP LIKE 'QC\_%' ESCAPE '\'
         </where>
     </select>
 

production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java

@@ -31,7 +31,10 @@ import com.foreverwin.mesnac.production.mapper.SfcCrossMapper;
 import com.foreverwin.mesnac.production.mapper.SfcDataAssembleMapper;
 import com.foreverwin.mesnac.production.model.LoadInventory;
 import com.foreverwin.mesnac.production.model.SfcHoldLog;
-import com.foreverwin.mesnac.production.service.*;
+import com.foreverwin.mesnac.production.service.LoadInventoryService;
+import com.foreverwin.mesnac.production.service.PodTemplateService;
+import com.foreverwin.mesnac.production.service.SfcCrossService;
+import com.foreverwin.mesnac.production.service.SfcHoldLogService;
 import com.foreverwin.modular.core.exception.BaseException;
 import com.foreverwin.modular.core.meext.MEServices;
 import com.foreverwin.modular.core.util.CommonMethods;
@@ -40,6 +43,7 @@ import com.sap.me.production.AssemblyComponent;
 import com.sap.me.production.AssemblyDataField;
 import com.sap.me.production.AssemblyServiceInterface;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +59,8 @@ import java.util.*;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class PodTemplateServiceImpl implements PodTemplateService {
+    @Value("${ws.erp.enabled}")
+    private boolean enabled;
     @Autowired
     private ResrceService resrceService;
     @Autowired
@@ -334,7 +340,9 @@ public class PodTemplateServiceImpl implements PodTemplateService {
             //更改派工单状态
             sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode(),workHour);
             //报工
-            sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour);
+            if (enabled){
+                sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour);
+            }
         } catch (Exception e) {
             ExceptionUtil.throwException(e);
         }

production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java

@@ -81,6 +81,9 @@ public class SfcScrapServiceImpl extends ServiceImpl<SfcScrapMapper, SfcScrap> i
     @Autowired
     private SplitSfcMapper splitSfcMapper;
 
+    @Value("${ws.erp.enabled}")
+    private boolean enabled;
+
     @Override
     public IPage<SfcScrap> selectPage(FrontPage<SfcScrap> frontPage, SfcScrap sfcScrap) {
         QueryWrapper<SfcScrap> queryWrapper = new QueryWrapper<>();
@@ -159,8 +162,9 @@ public class SfcScrapServiceImpl extends ServiceImpl<SfcScrapMapper, SfcScrap> i
             sfcScrap.setModifiedDateTime(now);
 
             //向生产派工那边发送数据
-            podTemplateService.sendErp(sfcScrap.getSfc(),sfcScrap.getStepId(),BigDecimal.valueOf(0L),BigDecimal.valueOf(sfcScrap.getQty()),BigDecimal.valueOf(0L));
-
+            if (enabled) {
+                podTemplateService.sendErp(sfcScrap.getSfc(), sfcScrap.getStepId(), BigDecimal.valueOf(0L), BigDecimal.valueOf(sfcScrap.getQty()), BigDecimal.valueOf(0L));
+            }
             try{
                 //调用mes公共接口，报废
                 ScrapSfcRequest scrapSfcRequest = new ScrapSfcRequest();