From 4520e851d9ae2f660b88536478d4422d9f04a33f Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Mon, 29 Aug 2022 08:45:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?add=E4=BA=A4=E4=BB=98=E5=8F=8A=E6=97=B6?=
 =?UTF-8?q?=E7=8E=87=E6=8A=A5=E8=A1=A8(=E5=91=A8=E7=BB=B4=E5=BA=A6)(?=
 =?UTF-8?q?=E6=9C=88=E7=BB=B4=E5=BA=A6)=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8A=A0=E5=B7=A5=E5=91=A8=E6=9C=9F=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E6=97=B6=E9=97=B4=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anomaly/controller/ReportController.java  |  54 +++++
 .../mesnac/anomaly/mapper/ReportMapper.java   |  23 +++
 .../mesnac/anomaly/service/ReportService.java |  28 +++
 .../service/impl/ReportServiceImpl.java       | 142 ++++++++++++++
 .../mesnac/anomaly/utils/DateReportUtils.java | 141 +++++++++++++
 .../main/resources/mapper/ReportMapper.xml    | 185 +++++++++++++++++-
 6 files changed, 572 insertions(+), 1 deletion(-)
 create mode 100644 anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
index c78821dd..6ae93559 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
@@ -300,6 +300,60 @@ public class ReportController {
             return R.failed(e.getMessage());
         }
     }
+    /**
+     * 交付及时率报表(周维度)
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/weekDeliveryRateReport")
+    public R weekDeliveryRateReport(@RequestParam(required = false) Map paramMap){
+        try{
+            return R.ok(reportService.weekDeliveryRateReport(paramMap));
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
+
+    /**
+     * 交付及时率报表(周维度)
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/monthDeliveryRateReport")
+    public R monthDeliveryRateReport(@RequestParam(required = false) Map paramMap){
+        try{
+            return R.ok(reportService.monthDeliveryRateReport(paramMap));
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
 
+    /**
+     * 项目生产加工周期报表
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/itemProductProgressReport")
+    public R itemProductProgressReport(@RequestParam(required = false) Map paramMap){
+        try{
+            return R.ok(reportService.itemProductProgressReport(paramMap));
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
+
+    /**
+     * 质量检验响应时间报表
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/qualityInspectionResponseReport")
+    public R qualityInspectionResponseReport(@RequestParam(required = false) Map paramMap){
+        try{
+            return R.ok(reportService.qualityInspectionResponseReport(paramMap));
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
 
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
index 61939735..6e6cabf8 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
@@ -125,4 +125,27 @@ public interface ReportMapper {
      * @return
      */
     List<Map<String, Object>> monthLoadRateReport(Map paramMap);
+
+    /**
+     * 交付及时率报表(周维度)
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> weekDeliveryRateReport(Map paramMap);
+
+    /**
+     * 交付及时率报表(周维度)
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> monthDeliveryRateReport(Map paramMap);
+
+    List<Map<String, Object>> itemProductProgressReport(Map paramMap);
+
+    /**
+     * 质量检验响应时间报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> qualityInspectionResponseReport(Map paramMap);
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
index cd7a37e2..a72e3ddb 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
@@ -131,4 +131,32 @@ public interface ReportService {
      * @return
      */
     List<Map<String, Object>> monthLoadRateReport(Map paramMap);
+
+    /**
+     * 交付及时率报表(周维度)
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> weekDeliveryRateReport(Map paramMap);
+
+    /**
+     * 交付及时率报表(月维度)
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> monthDeliveryRateReport(Map paramMap);
+
+    /**
+     * 项目生产加工周期报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> itemProductProgressReport(Map paramMap);
+
+    /**
+     * 质量检验响应时间报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> qualityInspectionResponseReport(Map paramMap);
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
index 7ed67f5e..4873f717 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
@@ -1,9 +1,11 @@
 package com.foreverwin.mesnac.anomaly.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.foreverwin.mesnac.anomaly.dto.IntegrationLogDto;
 import com.foreverwin.mesnac.anomaly.mapper.ReportMapper;
 import com.foreverwin.mesnac.anomaly.service.ReportService;
+import com.foreverwin.mesnac.anomaly.utils.DateReportUtils;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.util.DateUtil;
 import com.foreverwin.mesnac.meapi.mapper.DataFieldListMapper;
@@ -533,6 +535,146 @@ public class ReportServiceImpl implements ReportService {
         return reportMapper.monthLoadRateReport(paramMap);
     }
 
+    /**
+     * 交付及时率报表(周维度)
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public  List<Map<String, Object>> weekDeliveryRateReport(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        HashMap<String, List<Map<String, String>>> result = new HashMap<>();
+
+/*        QueryWrapper<Object> wrapper = new QueryWrapper<>();
+        //columnData
+        ArrayList<Map<String,String>> columnDataList = new ArrayList<>();
+        HashMap<String, String> columnMap0 = new LinkedHashMap<>();
+        columnMap0.put("colName","序号");
+        columnMap0.put("width","30");
+        columnDataList.add(columnMap0);
+        HashMap<String, String> columnMap1 = new LinkedHashMap<>();
+        columnMap1.put("colName","车间描述");
+        columnDataList.add(columnMap1);
+        HashMap<String, String> columnMap2 = new LinkedHashMap<>();
+        columnMap2.put("colName","资源编号");
+        columnDataList.add(columnMap2);
+        HashMap<String, String> columnMap3 = new LinkedHashMap<>();
+        columnMap3.put("colName","工序描述");
+        columnDataList.add(columnMap3);
+        HashMap<String, String> columnMap4 = new LinkedHashMap<>();
+        columnMap4.put("colName","资源描述");
+        columnDataList.add(columnMap4);
+        List<Map<String, String>> weekOfDate = DateReportUtils.getWeekOfDate(String.valueOf(paramMap.get("startDate")), String.valueOf(paramMap.get("endDate")));
+
+        //rowData
+        ArrayList<Map<String,String>> rowDataList = new ArrayList<>();
+        int week = 1;
+        for (Map<String, String> weekOfDateMap : weekOfDate) {
+            HashMap<String, String> columnMap5 = new LinkedHashMap<>();
+            columnMap5.put("colName",week + "计划数量");
+            columnDataList.add(columnMap5);
+            HashMap<String, String> columnMap6 = new LinkedHashMap<>();
+            columnMap6.put("colName",week + "按期完工数量");
+            columnDataList.add(columnMap6);
+            HashMap<String, String> columnMap7 = new LinkedHashMap<>();
+            columnMap7.put("colName",week + "零件交付及时率");
+            columnDataList.add(columnMap7);
+            HashMap<String, String> columnMap8 = new LinkedHashMap<>();
+            columnMap8.put("colName",week + "工时量");
+            columnDataList.add(columnMap8);
+            HashMap<String, String> columnMap9 = new LinkedHashMap<>();
+            columnMap9.put("colName",week + "按期完工工时");
+            columnDataList.add(columnMap9);
+            HashMap<String, String> columnMap10 = new LinkedHashMap<>();
+            columnMap10.put("colName",week + "工时交付及时率");
+            columnDataList.add(columnMap10);
+
+
+
+            paramMap.put("startDate",weekOfDateMap.get("start"));
+            paramMap.put("endDate",weekOfDateMap.get("end"));
+            List<Map<String, String>> weekList = reportMapper.weekDeliveryRateReport(paramMap);
+
+            int i = 1;
+            for (Map<String, String> weekResultMap : weekList) {
+                HashMap<String, String> rowMap = new LinkedHashMap<>();
+                rowMap.put("序号",String.valueOf(i));
+                rowMap.put("车间描述",weekResultMap.get("workCenter"));
+                rowMap.put("资源编号",weekResultMap.get("resrceCode"));
+                rowMap.put("工序描述",weekResultMap.get("operationDescription"));
+                rowMap.put("资源描述",weekResultMap.get("resrceDescription"));
+                rowMap.put(week + "计划数量",weekResultMap.get("sumQTY"));
+                rowMap.put(week + "按期完工数量",weekResultMap.get("sumDoneQTY"));
+                rowMap.put(week + "零件交付及时率",weekResultMap.get("QTYrate"));
+                rowMap.put(week + "工时量",weekResultMap.get("sumHours"));
+                rowMap.put(week + "按期完工工时",weekResultMap.get("sumDoneHours"));
+                rowMap.put(week + "工时交付及时率",weekResultMap.get("HOURSrate"));
+
+                i++;
+                rowDataList.add(rowMap);
+            }
+            week++;
+        }
+
+        result.put("columnData",columnDataList);
+        result.put("rowData",rowDataList);*/
+        return reportMapper.weekDeliveryRateReport(paramMap);
+    }
+
+    /**
+     * 交付及时率报表(周维度)
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> monthDeliveryRateReport(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        return reportMapper.monthDeliveryRateReport(paramMap);
+    }
+
+    /**
+     * 项目生产加工周期报表
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> itemProductProgressReport(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        List<Map<String, Object>> mapList = reportMapper.itemProductProgressReport(paramMap);
+
+        for (Map<String, Object> objectMap : mapList) {
+            String workOrder = String.valueOf(objectMap.get("workOrder"));
+            if (workOrder.indexOf("/") != -1){
+                if (workOrder.split("/").length > 2){
+                    objectMap.put("career",workOrder.split("/")[1]);
+                }else {
+                    objectMap.put("career","");
+                }
+            }else {
+                objectMap.put("career","");
+            }
+        }
+        return mapList;
+    }
+
+    /**
+     * 质量检验响应时间报表
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> qualityInspectionResponseReport(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        return reportMapper.qualityInspectionResponseReport(paramMap);
+    }
 
     /**
      * 事业部质量看板数据接口
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java
new file mode 100644
index 00000000..7c51401b
--- /dev/null
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java
@@ -0,0 +1,141 @@
+package com.foreverwin.mesnac.anomaly.utils;
+
+import org.apache.commons.lang.time.DateUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @Author YinQ
+ * @create 2022-08-25 12:40
+ */
+public class DateReportUtils {
+
+    public static final String sdf2 = "yyyy-MM-dd";
+
+    /**
+     * 指定时间计算有几周，并返回每周起止日期
+     *
+     * @param start 开始时间
+     * @param end 结束时间
+     * @return week：第几周 start：每周开始时间 end：每周结束时间
+     */
+    public static List<Map<String, String>> getWeekOfDate(String start, String end) {
+        List<Map<String, String>> list = new ArrayList<>();
+        Map<String, String> map;
+        Date startDate = stringToDate(start, sdf2);
+        Date endDate = stringToDate(end, sdf2);
+
+        assert endDate != null;
+        assert startDate != null;
+        long howLong = howLong("d", startDate, endDate);
+        int weekNum = Math.toIntExact(howLong / 7);
+        if (howLong % 7 > 0) {
+            weekNum++;
+        }
+
+        Calendar cal = Calendar.getInstance();
+        // 设置一个星期的第一天，按中国的习惯一个星期的第一天是星期一
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
+        cal.setTime(startDate);
+        // 获得当前日期是一个星期的第几天
+        int dayWeek = cal.get(Calendar.DAY_OF_WEEK);
+        if (1 == dayWeek) {
+            cal.add(Calendar.DAY_OF_MONTH, -1);
+        }
+        for (int i = 1; i <= weekNum; i++) {
+            map = new HashMap<>();
+            map.put("week", String.valueOf(i));
+
+            if (i == 1) {//第一周以 start 开始
+                map.put("start", dateFormat(startDate, sdf2));
+            }else {
+                map.put("start",dateFormat(cal.getTime(),sdf2));
+            }
+
+            if (i == weekNum) {//最后一周以 end 结束
+                map.put("end", dateFormat(endDate, sdf2));
+            }else {
+                //设置这周的周日日期，1代表周日，取值范围1~7，设置1~7之外会从周日开始往前后推算，负前正后，DAY_OF_WEEK的日期变更范围只会是在当前日期的周
+                cal.set(Calendar.DAY_OF_WEEK,1);
+                map.put("end",dateFormat(cal.getTime(),sdf2));
+            }
+            list.add(map);
+
+            //调用 org.apache.commons.lang.time.DateUtils 包下的方法
+            //新增一天到下一周的开始日期
+            cal.setTime(DateUtils.addDays(cal.getTime(), 1));
+        }
+
+        return list;
+    }
+
+
+    /**
+     * 将date类型转为String类型
+     *
+     * @param date 时间
+     * @param type 格式
+     * @return
+     */
+    public static String dateFormat(Date date, String type) {
+        if (date == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat(type);
+        return sdf.format(date);
+    }
+
+
+    /**
+     * 将Sting类型转为date类型
+     *
+     * @param str  待转换的字符
+     * @param date 时间类型，如：yyyy-MM-dd HH:mm:ss
+     * @return
+     * @throws ParseException
+     */
+    public static Date stringToDate(String str, String date) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat(date);
+            return sdf.parse(str);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 计算时间差 (时间单位,开始时间,结束时间)
+     *
+     * @param unit  时间单位 s - 秒,m - 分,h - 时,d - 天 ,M - 月 y - 年
+     * @param begin 开始时间
+     * @param end   结束时间
+     * @return
+     */
+    public static long howLong(String unit, Date begin, Date end) {
+        long ltime = begin.getTime() - end.getTime() < 0 ? end.getTime() - begin.getTime()
+                : begin.getTime() - end.getTime();
+        if (unit.equals("s")) {
+            return ltime / 1000;// 返回秒
+        } else if (unit.equals("m")) {
+            return ltime / 60000;// 返回分钟
+        } else if (unit.equals("h")) {
+            return ltime / 3600000;// 返回小时
+        } else if (unit.equals("d")) {
+            return ltime / 86400000;// 返回天数
+        } else if (unit.equals("y")) {
+            long res = ltime / 86400000;
+            return res / 365;
+        } else if (unit.equals("M")) {
+            long res = ltime / 86400000;
+            return res / 30;
+        } else {
+            return 0;
+        }
+    }
+
+}
+
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 61292008..09871fd0 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -1205,6 +1205,7 @@
         LEFT JOIN ROUTER r ON zsd.ROUTER_BO = R.HANDLE
         LEFT JOIN ROUTER_STEP rs ON rs.ROUTER_BO = r.HANDLE AND rs.STEP_ID = zsd.STEP_ID
         WHERE zsd.SITE = '1000'
+        AND zsd.DISPATCH_STATUS != 'CANCEL'
         AND cf.VALUE IS NOT NULL
         AND cf2.VALUE IS NOT NULL
         GROUP BY zsd.SITE, cf.VALUE, cf2.VALUE, zsd.SHOP_ORDER, zsd.SFC, it.DESCRIPTION, rs.REWORK
@@ -1284,7 +1285,7 @@
     </select>
     <select id="documentInformation" parameterType="java.util.HashMap" resultType="java.util.HashMap">
         --近半年单据信息
-        WITH acc AS (SELECT COUNT(DISPATCH_QTY) QTY
+        WITH acc AS (SELECT SUM(DISPATCH_QTY) QTY
         FROM (SELECT ZSD.SFC, MAX(ZSD.DISPATCH_QTY) DISPATCH_QTY
         FROM Z_SFC_DISPATCH ZSD
         LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
@@ -1326,6 +1327,7 @@
         WHERE DF.DATA_FIELD = 'REASON_CATEGORY'
     </select>
     <select id="abnormalQuality" parameterType="java.util.HashMap" resultType="java.util.HashMap">
+        --近半年质量异常情况
         SELECT TO_CHAR(zab.CREATED_DATE_TIME,'yyyy-mm') DATE_TIME,
         SUM(zab.NC_QTY) NC_QTY
         FROM Z_ABNORMAL_BILL zab
@@ -1643,4 +1645,185 @@
             </if>
         </where>
     </select>
+    <select id="weekDeliveryRateReport" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT WIP.WORK_CENTER "workCenter",
+        WIP.RESRCE "resrceCode",
+        WIP.OPERATION_DESCRIPTION "operationDescription",
+        WIP.RESRCE_DESCRIPTION "resrceDescription",
+        WIP.SUM_QTY "sumQTY",
+        WIP.SUM_DONE_QTY "sumDoneQTY",
+        TO_CHAR(DECODE(WIP.SUM_QTY,0,0,WIP.SUM_DONE_QTY / WIP.SUM_QTY) * 100, '99990.99') || '%' "QTYrate",
+        WIP.SUM_HOURS "sumHours",
+        WIP.SUM_DONE_HOURS "sumDoneHours",
+        TO_CHAR(DECODE(WIP.SUM_HOURS,0,0,WIP.SUM_DONE_HOURS / WIP.SUM_HOURS) * 100, '99990.99') || '%' "HOURSrate"
+        FROM
+        (SELECT wct.DESCRIPTION WORK_CENTER,
+        r.RESRCE,
+        OT.DESCRIPTION OPERATION_DESCRIPTION,
+        r.DESCRIPTION RESRCE_DESCRIPTION,
+        SUM(zsd.DISPATCH_QTY) SUM_QTY,
+        SUM(CASE
+        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND SYSDATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.DISPATCH_QTY
+        ELSE 0 END) SUM_DONE_QTY,
+        SUM(zsd.PROD_HOURS) SUM_HOURS,
+        SUM(CASE
+        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND SYSDATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.PROD_HOURS
+        ELSE 0 END) SUM_DONE_HOURS
+        FROM Z_SFC_DISPATCH zsd
+        LEFT JOIN WORK_CENTER wc ON zsd.WORK_CENTER = wc.WORK_CENTER
+        LEFT JOIN WORK_CENTER_T wct ON wc.HANDLE = wct.WORK_CENTER_BO
+        LEFT JOIN RESRCE r ON r.RESRCE = zsd.RESRCE AND r.SITE = zsd.SITE
+        LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = ZSD.SITE
+        LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO
+        WHERE zsd.DISPATCH_STATUS != 'CANCEL'
+        AND zsd.SFC != 'NEW'
+        AND zsd.RESRCE IS NOT NULL
+        <if test="startDate != null and startDate != ''">
+            AND zsd.PLANNED_COMP_DATE >= TO_DATE(#{startDate},'YYYY-mm-dd')
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND zsd.PLANNED_COMP_DATE &lt;= TO_DATE(#{endDate},'YYYY-mm-dd')
+        </if>
+        GROUP BY wct.DESCRIPTION, r.RESRCE, r.DESCRIPTION, OT.DESCRIPTION) WIP
+        <where>
+        1=1
+        <if test="resrce != null and resrce != ''">
+            AND WIP."resrceCode" = #{resrce}
+        </if>
+            <if test="operationDescription != null and operationDescription != ''">
+                AND WIP."operationDescription" = #{operationDescription}
+            </if>
+        </where>
+        ORDER BY WIP.SUM_HOURS DESC
+    </select>
+    <select id="monthDeliveryRateReport" parameterType="java.util.HashMap" resultType="java.util.Map" >
+        SELECT WIP.WORK_CENTER "workCenter",
+        WIP.RESRCE "resrceCode",
+        WIP.OPERATION_DESCRIPTION "operationDescription",
+        WIP.RESRCE_DESCRIPTION "resrceDescription",
+        WIP.SUM_QTY "sumQTY",
+        WIP.SUM_DONE_QTY "sumDoneQTY",
+        TO_CHAR(DECODE(WIP.SUM_QTY,0,0,WIP.SUM_DONE_QTY / WIP.SUM_QTY) * 100, '99990.99') || '%' "QTYrate",
+        WIP.SUM_HOURS "sumHours",
+        WIP.SUM_DONE_HOURS "sumDoneHours",
+        TO_CHAR(DECODE(WIP.SUM_HOURS,0,0,WIP.SUM_DONE_HOURS / WIP.SUM_HOURS) * 100, '99990.99') || '%' "HOURSrate"
+        FROM
+        (SELECT wct.DESCRIPTION WORK_CENTER,
+        r.RESRCE,
+        OT.DESCRIPTION OPERATION_DESCRIPTION,
+        r.DESCRIPTION RESRCE_DESCRIPTION,
+        SUM(zsd.DISPATCH_QTY) SUM_QTY,
+        SUM(CASE
+        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND SYSDATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.DISPATCH_QTY
+        ELSE 0 END) SUM_DONE_QTY,
+        SUM(zsd.PROD_HOURS) SUM_HOURS,
+        SUM(CASE
+        WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND SYSDATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.PROD_HOURS
+        ELSE 0 END) SUM_DONE_HOURS
+        FROM Z_SFC_DISPATCH zsd
+        LEFT JOIN WORK_CENTER wc ON zsd.WORK_CENTER = wc.WORK_CENTER
+        LEFT JOIN WORK_CENTER_T wct ON wc.HANDLE = wct.WORK_CENTER_BO
+        LEFT JOIN RESRCE r ON r.RESRCE = zsd.RESRCE AND r.SITE = zsd.SITE
+        LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = ZSD.SITE
+        LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO
+        WHERE zsd.DISPATCH_STATUS != 'CANCEL'
+        AND zsd.SFC != 'NEW'
+        AND zsd.RESRCE IS NOT NULL
+        <if test="startDate != null and startDate != ''">
+            AND zsd.PLANNED_COMP_DATE >= TO_DATE(#{startDate},'YYYY-mm-dd')
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND zsd.PLANNED_COMP_DATE &lt;= TO_DATE(#{endDate},'YYYY-mm-dd')
+        </if>
+        GROUP BY wct.DESCRIPTION, r.RESRCE, r.DESCRIPTION, OT.DESCRIPTION) WIP
+        <where>
+            1=1
+            <if test="resrce != null and resrce != ''">
+                AND WIP."resrceCode" = #{resrce}
+            </if>
+            <if test="operationDescription != null and operationDescription != ''">
+                AND WIP."operationDescription" = #{operationDescription}
+            </if>
+        </where>
+        ORDER BY WIP.SUM_HOURS DESC
+    </select>
+    <select id="itemProductProgressReport" parameterType="java.util.HashMap" resultType="java.util.Map">
+        SELECT cf.VALUE                                                                        "projectNo",--项目号
+               cf2.VALUE                                                                       "workOrder",--工作令
+               zsd.SHOP_ORDER                                                                  "shopOrder",--订单编号
+               i.ITEM                                                                          "item", --物料编号
+               it.DESCRIPTION                                                                  "itemDescription",--物料描述
+               MIN(zsd.ACTUAL_START_DATE)                                                      "actualStartDate",--最小实际开始时间
+               MAX(zsd.ACTUAL_COMPLETE_DATE)                                                   "actualCompeteDate",--最大实际完成时间
+               TO_CHAR(MAX(zsd.ACTUAL_COMPLETE_DATE) - MIN(zsd.ACTUAL_START_DATE), '99990.99') "productProgress"
+        FROM Z_SFC_DISPATCH zsd
+                 LEFT JOIN SFC s ON s.SFC = zsd.SFC AND s.SITE = zsd.SITE
+                 LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
+                 LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'ITEM_NUMBER'
+                 LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
+                 LEFT JOIN ITEM i On i.HANDLE = so.ITEM_BO AND I.SITE = SO.SITE
+                 LEFT JOIN ITEM_T it ON it.ITEM_BO = so.ITEM_BO AND it.LOCALE = 'zh'
+        WHERE zsd.SITE = '1000'
+          AND ZSD.DISPATCH_STATUS != 'CANCEL'
+  AND ZSD.DISPATCH_STATUS != 'PAUSE'
+  AND zsd.ACTUAL_COMPLETE_DATE IS NOT NULL
+  AND cf.VALUE IS NOT NULL
+  AND cf2.VALUE IS NOT NULL
+        <if test="item != null and item != ''">
+            AND cf.VALUE = #{item}
+        </if>
+        <if test="career != null and career != ''">
+            AND cf2.VALUE LIKE '%${career}%'
+        </if>
+        <if test="startDate != null and startDate != ''">
+            AND zsd.ACTUAL_START_DATE >= TO_DATE(#{startDate},'YYYY-mm-dd')
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND zsd.ACTUAL_COMPLETE_DATE &lt;= TO_DATE(#{endDate},'YYYY-mm-dd')
+        </if>
+        GROUP BY cf.VALUE, cf2.VALUE, zsd.SHOP_ORDER, i.ITEM, it.DESCRIPTION
+        ORDER BY cf.VALUE DESC
+    </select>
+    <select id="qualityInspectionResponseReport" parameterType="java.util.HashMap" resultType="java.util.Map">
+        --质量检验响应时间报表
+        SELECT WT.DESCRIPTION           "workCenter",
+               C2.VALUE                 "projectNo",
+               C1.VALUE                 "workOrder",
+               SO.SHOP_ORDER            "shopOrder",
+               IM.ITEM                  "item",
+               IT.DESCRIPTION           "itemDescription",
+               zsd.DISPATCH_QTY         "inspectionQTY",
+               OT.DESCRIPTION           "operationDescription",
+               zsd.EMPLOYEE_DESCRIPTION "declarationUser",
+               ZT.CREATED_DATE_TIME     "declarationTime",
+               ZT.MODIFIED_DATE_TIME    "inspectionDoneTime",
+               TO_CHAR((ZT.MODIFIED_DATE_TIME - ZT.CREATED_DATE_TIME) * 24,'99990.99')  "hoursDiff",
+               ZNU.FULL_NAME            "inspectionUser"
+        FROM Z_INSPECTION_TASK ZT
+                 LEFT JOIN WORK_CENTER WC ON WC.SITE = ZT.SITE AND WC.WORK_CENTER = ZT.WORK_CENTER
+                 LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
+                 INNER JOIN SHOP_ORDER SO ON ZT.SITE = SO.SITE AND ZT.SHOP_ORDER = SO.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
+                 INNER JOIN OPERATION OP ON OP.SITE = ZT.SITE AND OP.OPERATION = ZT.OPERATION AND OP.CURRENT_REVISION = 'true'
+                 LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = OP.HANDLE
+                 LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZT.MODIFY_USER
+                 INNER JOIN Z_SFC_DISPATCH zsd ON zsd.HANDLE = ZT.SFC_DISPATCH_BO
+        WHERE ZT.CREATED_DATE_TIME &lt; ZT.MODIFIED_DATE_TIME
+        <if test="projectNo != null and projectNo != ''">
+            AND WT.DESCRIPTION = #{projectNo}
+        </if>
+        <if test="workCenter != null and workCenter != ''">
+            AND ZT.WORK_CENTER = #{workCenter}
+        </if>
+        <if test="shopOrder != null and shopOrder != ''">
+            AND  SO.SHOP_ORDER = #{shopOrder}
+        </if>
+        <if test="item != null and item != ''">
+            AND  IM.ITEM = #{item}
+        </if>
+        ORDER BY ZT.MODIFIED_DATE_TIME DESC
+    </select>
 </mapper>
\ No newline at end of file

From 598769bd2fd853dc4dc2e75eebbc98bb08795445 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Tue, 30 Aug 2022 10:26:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=91=A8=E6=9C=9F=E7=9C=8B=E6=9D=BF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anomaly/controller/ReportController.java  | 14 ++++
 .../mesnac/anomaly/mapper/ReportMapper.java   |  2 +
 .../mesnac/anomaly/service/ReportService.java |  7 ++
 .../service/impl/ReportServiceImpl.java       | 64 ++++++++++++++++++-
 .../main/resources/mapper/ReportMapper.xml    | 32 ++++++++++
 5 files changed, 117 insertions(+), 2 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
index 6ae93559..a4e9b860 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
@@ -356,4 +356,18 @@ public class ReportController {
         }
     }
 
+    /**
+     * 项目生产加工周期看板
+     * @param
+     * @return
+     */
+    @GetMapping("/projectPlanningProgress")
+    public R projectPlanningProgress(String user){
+        try {
+            return R.ok(reportService.projectPlanningProgress(user));
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+    }
+
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
index 6e6cabf8..6c83b2c9 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
@@ -105,6 +105,8 @@ public interface ReportMapper {
 
     List<Map<String, String>> projectScheduleShow(@Param("user") String user);
 
+    List<Map<String, String>> projectPlanningProgress(@Param("user") String user);
+
     /**
      * 质量返修报表
      * @param paramMap
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
index a72e3ddb..ea8db759 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
@@ -159,4 +159,11 @@ public interface ReportService {
      * @return
      */
     List<Map<String, Object>> qualityInspectionResponseReport(Map paramMap);
+
+    /**
+     * 项目生产加工周期看板
+     * @param userGroup
+     * @return
+     */
+    Map<String, Object> projectPlanningProgress(String userGroup);
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
index 4873f717..369ef429 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
@@ -1,11 +1,9 @@
 package com.foreverwin.mesnac.anomaly.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.foreverwin.mesnac.anomaly.dto.IntegrationLogDto;
 import com.foreverwin.mesnac.anomaly.mapper.ReportMapper;
 import com.foreverwin.mesnac.anomaly.service.ReportService;
-import com.foreverwin.mesnac.anomaly.utils.DateReportUtils;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.util.DateUtil;
 import com.foreverwin.mesnac.meapi.mapper.DataFieldListMapper;
@@ -676,6 +674,68 @@ public class ReportServiceImpl implements ReportService {
         return reportMapper.qualityInspectionResponseReport(paramMap);
     }
 
+    /**
+     * 项目生产加工周期看板
+     * @param userGroup
+     * @return
+     */
+    @Override
+    public Map<String, Object> projectPlanningProgress(String userGroup) {
+        List<Map<String, String>> abnormalQualityList = reportMapper.projectPlanningProgress(userGroup);
+        Map<String, Object> result = new HashMap<>();
+        Map<String, List<Map<String, String>>> workOrderMap = abnormalQualityList.stream()
+                .collect(Collectors.groupingBy(e -> {
+                    String career =e.get("workOrder");
+                    try {
+                        if (career.indexOf("硫化") != -1) {
+                            return "硫化";
+                        }else if (career.indexOf("全钢") != -1) {
+                            return "全钢";
+                        }else if (career.indexOf("半钢") != -1) {
+                            return "半钢";
+                        }else if (career.indexOf("鼓") != -1) {
+                            return "鼓";
+                        }else if (career.indexOf("裁断") != -1) {
+                            return "裁断";
+                        }else if (career.indexOf("检测") != -1) {
+                            return "检测";
+                        }else if (career.indexOf("橡塑") != -1) {
+                            return "橡塑";
+                        } else if (career.indexOf("非公路") != -1) {
+                            return "非公路";
+                        } else if (career.indexOf("塞班") != -1) {
+                            return "塞班";
+                        } else {
+                            return "外部";
+                        }
+                    } catch (Exception exception) {
+                        exception.printStackTrace();
+                    }
+                    return "";
+                }));
+
+        for (String workOrder : workOrderMap.keySet()) {
+            HashMap<String, Object> resultMap = new HashMap<>();
+            ArrayList<String> items = new ArrayList<>();
+            ArrayList<String> shopOrderQTYs = new ArrayList<>();
+            ArrayList<String> doneQTY = new ArrayList<>();
+            ArrayList<String> rate = new ArrayList<>();
+            List<Map<String, String>> maps = workOrderMap.get(workOrder);
+            maps.forEach(e -> {
+                items.add(e.get("item"));
+                shopOrderQTYs.add(e.get("shopOrderQTY"));
+                doneQTY.add(e.get("doneQTY"));
+                rate.add(e.get("rate"));
+            });
+            resultMap.put("items",items);
+            resultMap.put("shopOrderQTY",shopOrderQTYs);
+            resultMap.put("doneQTY",doneQTY);
+            resultMap.put("rate",rate);
+            result.put(workOrder,resultMap);
+        }
+        return result;
+    }
+
     /**
      * 事业部质量看板数据接口
      * @param user
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 09871fd0..59ad2f9f 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -1397,6 +1397,38 @@
         </where>
         ORDER BY WIP."rate" DESC
     </select>
+    <select id="projectPlanningProgress" parameterType="java.util.HashMap" resultType="java.util.HashMap">
+        SELECT *
+        FROM (
+        SELECT OWIP.workOrder         "workOrder",
+        OWIP.item              "item",--项目号
+        SUM(OWIP.shopOrderQTY) "shopOrderQTY",
+        SUM(OWIP.doneQTY)  "doneQTY",
+        TO_CHAR(SUM(OWIP.doneQTY) / SUM(OWIP.shopOrderQTY)  * 100, '99990.99') "rate"
+        FROM (SELECT cf.VALUE              item,--项目号
+        cf2.VALUE             workOrder,--工作令
+        zsd.SFC,
+        MAX(zsd.DISPATCH_QTY) shopOrderQTY,--订单数量
+        MIN(CASE WHEN zsd.DISPATCH_STATUS = 'COMPLETE' THEN zsd.DISPATCH_QTY ELSE 0 END ) doneQTY
+        FROM Z_SFC_DISPATCH zsd
+        LEFT JOIN SFC s ON s.SFC = zsd.SFC AND s.SITE = zsd.SITE
+        LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
+        LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'ITEM_NUMBER'
+        LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
+        WHERE zsd.DISPATCH_STATUS != 'CANCEL'
+        AND cf.VALUE IS NOT NULL
+        AND cf2.VALUE IS NOT NULL
+        GROUP BY zsd.SITE, cf.VALUE, cf2.VALUE, zsd.SFC
+        ) OWIP
+        GROUP BY OWIP.item, OWIP.workOrder
+        ) WIP
+        <where>
+            <if test="user != null and user != ''">
+                AND WIP."workOrder" like '%${user}%'
+            </if>
+        </where>
+        ORDER BY WIP."workOrder" DESC
+    </select>
     <select id="qualityRepairReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
         SELECT * FROM
         (SELECT zab.WORK_ORDER "workOrder",

From 4ff779f7ecaa4f9b67bb9d692786966be6888b55 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 31 Aug 2022 11:36:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B4=9F=E8=8D=B7?=
 =?UTF-8?q?=E7=8E=87=E6=8A=A5=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anomaly/controller/ReportController.java  |  14 ++
 .../mesnac/anomaly/mapper/ReportMapper.java   |  10 +-
 .../mesnac/anomaly/service/ReportService.java |   9 +-
 .../service/impl/ReportServiceImpl.java       |  71 +++++++++-
 .../mesnac/anomaly/utils/DateReportUtils.java |  50 ++++++++
 .../main/resources/mapper/ReportMapper.xml    | 121 +++++++++++++++---
 6 files changed, 252 insertions(+), 23 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
index a4e9b860..9494dcfc 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
@@ -370,4 +370,18 @@ public class ReportController {
         }
     }
 
+    /**
+     * 设备产能负荷看板
+     * @param
+     * @return
+     */
+    @GetMapping("/capacityLoad")
+    public R capacityLoad(String user){
+        try {
+            return R.ok(reportService.capacityLoad(user));
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+    }
+
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
index 6c83b2c9..328e769f 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
@@ -119,7 +119,7 @@ public interface ReportMapper {
      * @param paramMap
      * @return
      */
-    List<Map<String, Object>> weekLoadRateReport(Map paramMap);
+    List<Map<String, String>> weekLoadRateReport(Map paramMap);
 
     /**
      * 资源负荷率报表(月维度)
@@ -150,4 +150,12 @@ public interface ReportMapper {
      * @return
      */
     List<Map<String, Object>> qualityInspectionResponseReport(Map paramMap);
+
+    /**
+     * 设备产能负荷看板
+     * @param workCenter
+     * @return
+     */
+    List<Map<String, String>> capacityLoad(String workCenter);
+
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
index ea8db759..b3665852 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
@@ -123,7 +123,7 @@ public interface ReportService {
      * @param paramMap
      * @return
      */
-    List<Map<String, Object>> weekLoadRateReport(Map paramMap);
+    List<Map<String, String>> weekLoadRateReport(Map paramMap);
 
     /**
      * 资源负荷率报表(周维度)
@@ -166,4 +166,11 @@ public interface ReportService {
      * @return
      */
     Map<String, Object> projectPlanningProgress(String userGroup);
+
+    /**
+     * 设备产能负荷看板
+     * @param workCenter
+     * @return
+     */
+    Map<String, Object> capacityLoad(String workCenter);
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
index 369ef429..70c0a6ee 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.foreverwin.mesnac.anomaly.dto.IntegrationLogDto;
 import com.foreverwin.mesnac.anomaly.mapper.ReportMapper;
 import com.foreverwin.mesnac.anomaly.service.ReportService;
+import com.foreverwin.mesnac.anomaly.utils.DateReportUtils;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.util.DateUtil;
 import com.foreverwin.mesnac.meapi.mapper.DataFieldListMapper;
@@ -21,6 +22,10 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -510,10 +515,22 @@ public class ReportServiceImpl implements ReportService {
      * @return
      */
     @Override
-    public List<Map<String, Object>> weekLoadRateReport(Map paramMap) {
+    public List<Map<String, String>> weekLoadRateReport(Map paramMap) {
         String site = CommonMethods.getSite();
         paramMap.put("site", site);
         paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        if (!StringUtils.isBlank(String.valueOf(paramMap.get("week")))){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            LocalDateTime now = LocalDateTime.now();
+            DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            int dayOfWeek = now.getDayOfWeek().getValue();
+            LocalDateTime weekStart = now.minusDays(dayOfWeek - 1).with(LocalTime.MIN);
+            LocalDateTime weekEnd = now.plusDays(7 * 8 - dayOfWeek).with(LocalTime.MAX);
+            System.out.println("当前周的开始时间:" + weekStart.format(fmt));
+            System.out.println("当前周的结束时间:" + weekEnd.format(fmt));
+            List<Map<String, String>> weekOfDate = DateReportUtils.getWeekOfDate3(weekStart.format(fmt), weekEnd.format(fmt));
+            return weekOfDate;
+        }
         return reportMapper.weekLoadRateReport(paramMap);
     }
 
@@ -527,8 +544,8 @@ public class ReportServiceImpl implements ReportService {
         String site = CommonMethods.getSite();
         paramMap.put("site", site);
         paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
-        if (StringUtils.isBlank((String) paramMap.get("month"))){
-            paramMap.put("month",(Integer)paramMap.get("month"));
+        if (!StringUtils.isBlank(String.valueOf(paramMap.get("month")))){
+            paramMap.put("month",Integer.valueOf(String.valueOf(paramMap.get("month"))));
         }
         return reportMapper.monthLoadRateReport(paramMap);
     }
@@ -622,7 +639,7 @@ public class ReportServiceImpl implements ReportService {
     }
 
     /**
-     * 交付及时率报表(周维度)
+     * 交付及时率报表(月维度)
      * @param paramMap
      * @return
      */
@@ -736,6 +753,52 @@ public class ReportServiceImpl implements ReportService {
         return result;
     }
 
+    /**
+     * 设备产能负荷看板
+     * @param workCenter
+     * @return
+     */
+    @Override
+    public Map<String, Object> capacityLoad(String workCenter) {
+        List<Map<String, String>> capacityLoadList = reportMapper.capacityLoad(workCenter);
+        HashMap<String, Object> result = new HashMap<>();
+        /*Map<String, List<Map<String, String>>> resourceListMap = capacityLoadList.stream().
+                collect(Collectors.groupingBy(e -> e.get("resourceDescription")));*/
+        //八个柱状图：计划工时list、计划产能、未完成工时、设备描述
+        /*for (String resource : resourceListMap.keySet()) {
+            HashMap<String, Object> resourceMap = new HashMap<>();
+            //计划工时
+            ArrayList<String> planList = new ArrayList<>();
+            List<Map<String, String>> mapList = resourceListMap.get(resource);
+            mapList.forEach(e -> {
+                e.
+            });*/
+        capacityLoadList.forEach(e -> {
+            HashMap<String, Object> resourceMap = new HashMap<>();
+            //计划工时
+            ArrayList<String> planList = new ArrayList<>();
+            planList.add(e.get("planCapacity1"));
+            planList.add(e.get("planCapacity2"));
+            planList.add(e.get("planCapacity3"));
+            planList.add(e.get("planCapacity4"));
+            planList.add(e.get("planCapacity5"));
+            planList.add(e.get("planCapacity6"));
+            planList.add(e.get("planCapacity7"));
+            planList.add(e.get("planCapacity8"));
+            resourceMap.put("planCapacity",planList);
+            //计划产能
+            resourceMap.put("standardWeekCapacity",e.get("standardWeekCapacity"));
+            //未完成工时
+            resourceMap.put("tardinessWork",e.get("tardinessWork"));
+            //
+        });
+
+
+
+
+        return null;
+    }
+
     /**
      * 事业部质量看板数据接口
      * @param user
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java
index 7c51401b..a8d8b262 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java
@@ -13,6 +13,7 @@ import java.util.*;
 public class DateReportUtils {
 
     public static final String sdf2 = "yyyy-MM-dd";
+    public static final String sdf3 = "yyyy.MM.dd";
 
     /**
      * 指定时间计算有几周，并返回每周起止日期
@@ -71,6 +72,55 @@ public class DateReportUtils {
         return list;
     }
 
+    public static List<Map<String, String>> getWeekOfDate3(String start, String end) {
+        List<Map<String, String>> list = new ArrayList<>();
+        Map<String, String> map;
+        Date startDate = stringToDate(start, sdf2);
+        Date endDate = stringToDate(end, sdf2);
+
+        assert endDate != null;
+        assert startDate != null;
+        long howLong = howLong("d", startDate, endDate);
+        int weekNum = Math.toIntExact(howLong / 7);
+        if (howLong % 7 > 0) {
+            weekNum++;
+        }
+
+        Calendar cal = Calendar.getInstance();
+        // 设置一个星期的第一天，按中国的习惯一个星期的第一天是星期一
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
+        cal.setTime(startDate);
+        // 获得当前日期是一个星期的第几天
+        int dayWeek = cal.get(Calendar.DAY_OF_WEEK);
+        if (1 == dayWeek) {
+            cal.add(Calendar.DAY_OF_MONTH, -1);
+        }
+        for (int i = 1; i <= weekNum; i++) {
+            map = new HashMap<>();
+            map.put("week", String.valueOf(i));
+
+            if (i == 1) {//第一周以 start 开始
+                map.put("start", dateFormat(startDate, sdf3));
+            }else {
+                map.put("start",dateFormat(cal.getTime(),sdf3));
+            }
+
+            if (i == weekNum) {//最后一周以 end 结束
+                map.put("end", dateFormat(endDate, sdf3));
+            }else {
+                //设置这周的周日日期，1代表周日，取值范围1~7，设置1~7之外会从周日开始往前后推算，负前正后，DAY_OF_WEEK的日期变更范围只会是在当前日期的周
+                cal.set(Calendar.DAY_OF_WEEK,1);
+                map.put("end",dateFormat(cal.getTime(),sdf3));
+            }
+            list.add(map);
+
+            //调用 org.apache.commons.lang.time.DateUtils 包下的方法
+            //新增一天到下一周的开始日期
+            cal.setTime(DateUtils.addDays(cal.getTime(), 1));
+        }
+
+        return list;
+    }
 
     /**
      * 将date类型转为String类型
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 59ad2f9f..e4e32c15 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -1571,7 +1571,7 @@
         LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = ZSD.SITE
         LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO
         CROSS JOIN WEEK
-        WHERE (ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE')
+        WHERE (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND ZSD.DISPATCH_STATUS != 'COMPLETE')
         AND ZSD.PLANNED_COMP_DATE IS NOT NULL
         -- AND ZSD.CREATED_DATE_TIME  > TO_DATE(TRUNC(TO_DATE(to_char(sysdate,'yyyy-MM-dd'),'yyyy-MM-dd'),'IW') - 8 * 7)
         GROUP BY O.OPERATION,OT.DESCRIPTION
@@ -1662,8 +1662,9 @@
         LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = ZSD.SITE
         LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO
         CROSS JOIN MONTH
-        WHERE (ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE')
+        WHERE (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE')
         AND ZSD.PLANNED_COMP_DATE IS NOT NULL
+
         GROUP BY O.OPERATION,OT.DESCRIPTION
         ORDER BY O.OPERATION DESC ) WIP
         LEFT JOIN CUSTOM_FIELDS CF ON CF.ATTRIBUTE ='MONTH_CAPACITY' AND CF.HANDLE = 'OperationBO:1000,'|| WIP."operation" || ',1.0'
@@ -1708,8 +1709,11 @@
         LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = ZSD.SITE
         LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO
         WHERE zsd.DISPATCH_STATUS != 'CANCEL'
-        AND zsd.SFC != 'NEW'
+        AND zsd.DISPATCH_STATUS != 'NEW'
         AND zsd.RESRCE IS NOT NULL
+        <if test="workCenter != null and workCenter != ''">
+            AND wc.WORK_CENTER = #{workCenter}
+        </if>
         <if test="startDate != null and startDate != ''">
             AND zsd.PLANNED_COMP_DATE >= TO_DATE(#{startDate},'YYYY-mm-dd')
         </if>
@@ -1719,11 +1723,11 @@
         GROUP BY wct.DESCRIPTION, r.RESRCE, r.DESCRIPTION, OT.DESCRIPTION) WIP
         <where>
         1=1
-        <if test="resrce != null and resrce != ''">
-            AND WIP."resrceCode" = #{resrce}
-        </if>
+            <if test="resrce != null and resrce != ''">
+                AND WIP.RESRCE = #{resrce}
+            </if>
             <if test="operationDescription != null and operationDescription != ''">
-                AND WIP."operationDescription" = #{operationDescription}
+                AND  WIP.OPERATION_DESCRIPTION = #{operationDescription}
             </if>
         </where>
         ORDER BY WIP.SUM_HOURS DESC
@@ -1759,22 +1763,25 @@
         LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = ZSD.SITE
         LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO
         WHERE zsd.DISPATCH_STATUS != 'CANCEL'
-        AND zsd.SFC != 'NEW'
+        AND zsd.DISPATCH_STATUS != 'NEW'
         AND zsd.RESRCE IS NOT NULL
+        <if test="workCenter != null and workCenter != ''">
+            AND wc.WORK_CENTER = #{workCenter}
+        </if>
         <if test="startDate != null and startDate != ''">
-            AND zsd.PLANNED_COMP_DATE >= TO_DATE(#{startDate},'YYYY-mm-dd')
+            AND zsd.PLANNED_COMP_DATE >= TO_DATE(#{startDate},'YYYY-mm')
         </if>
         <if test="endDate != null and endDate != ''">
-            AND zsd.PLANNED_COMP_DATE &lt;= TO_DATE(#{endDate},'YYYY-mm-dd')
+            AND zsd.PLANNED_COMP_DATE &lt;= TO_DATE(#{endDate},'YYYY-mm')
         </if>
         GROUP BY wct.DESCRIPTION, r.RESRCE, r.DESCRIPTION, OT.DESCRIPTION) WIP
         <where>
             1=1
             <if test="resrce != null and resrce != ''">
-                AND WIP."resrceCode" = #{resrce}
+                AND WIP.RESRCE = #{resrce}
             </if>
             <if test="operationDescription != null and operationDescription != ''">
-                AND WIP."operationDescription" = #{operationDescription}
+                AND  WIP.OPERATION_DESCRIPTION = #{operationDescription}
             </if>
         </where>
         ORDER BY WIP.SUM_HOURS DESC
@@ -1807,11 +1814,17 @@
         <if test="career != null and career != ''">
             AND cf2.VALUE LIKE '%${career}%'
         </if>
-        <if test="startDate != null and startDate != ''">
-            AND zsd.ACTUAL_START_DATE >= TO_DATE(#{startDate},'YYYY-mm-dd')
+        <if test="startFromDate != null and startFromDate != ''">
+            AND zsd.ACTUAL_START_DATE >= TO_DATE(#{startFromDate},'YYYY-mm-dd')
         </if>
-        <if test="endDate != null and endDate != ''">
-            AND zsd.ACTUAL_COMPLETE_DATE &lt;= TO_DATE(#{endDate},'YYYY-mm-dd')
+        <if test="startToDate != null and startToDate != ''">
+            AND zsd.ACTUAL_START_DATE &lt;= TO_DATE(#{startToDate},'YYYY-mm-dd')
+        </if>
+        <if test="completeFromDate != null and completeFromDate != ''">
+            AND zsd.ACTUAL_COMPLETE_DATE >= TO_DATE(#{completeFromDate},'YYYY-mm-dd')
+        </if>
+        <if test="completeToDate != null and completeToDate != ''">
+            AND zsd.ACTUAL_COMPLETE_DATE &lt;= TO_DATE(#{completeToDate},'YYYY-mm-dd')
         </if>
         GROUP BY cf.VALUE, cf2.VALUE, zsd.SHOP_ORDER, i.ITEM, it.DESCRIPTION
         ORDER BY cf.VALUE DESC
@@ -1845,7 +1858,7 @@
                  INNER JOIN Z_SFC_DISPATCH zsd ON zsd.HANDLE = ZT.SFC_DISPATCH_BO
         WHERE ZT.CREATED_DATE_TIME &lt; ZT.MODIFIED_DATE_TIME
         <if test="projectNo != null and projectNo != ''">
-            AND WT.DESCRIPTION = #{projectNo}
+            AND C2.VALUE = #{projectNo}
         </if>
         <if test="workCenter != null and workCenter != ''">
             AND ZT.WORK_CENTER = #{workCenter}
@@ -1858,4 +1871,78 @@
         </if>
         ORDER BY ZT.MODIFIED_DATE_TIME DESC
     </select>
+    <select id="capacityLoad" resultType="java.util.Map">
+        --设备产能负荷看板看板接口
+        SELECT WIP.* FROM (WITH WEEK AS (
+        SELECT TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW')         WEEK0,
+        TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 1 WEEK1,
+        TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 2 WEEK2,
+        TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 3 WEEK3,
+        TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 4 WEEK4,
+        TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 5 WEEK5,
+        TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 6 WEEK6,
+        TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 7 WEEK7,
+        TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 8 WEEK8
+        FROM DUAL)
+        SELECT wct.DESCRIPTION "descripion",
+        rt.RESOURCE_TYPE "resourceType",
+        rt.DESCRIPTION "resourceDescription",
+        SUM(CASE
+        WHEN SYSDATE > ZSD.PLANNED_COMP_DATE THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        ELSE 0 END) "tardinessWork",
+        SUM(CASE
+        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK0) AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(WEEK.WEEK1)
+        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        ELSE 0 END) "planCapacity1",
+        SUM(CASE
+        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK1) AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(WEEK.WEEK2)
+        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        ELSE 0 END) "planCapacity2",
+        SUM(CASE
+        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK2) AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(WEEK.WEEK3)
+        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        ELSE 0 END) "planCapacity3",
+        SUM(CASE
+        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK3) AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(WEEK.WEEK4)
+        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        ELSE 0 END) "planCapacity4",
+        SUM(CASE
+        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK4) AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(WEEK.WEEK5)
+        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        ELSE 0 END) "planCapacity5",
+        SUM(CASE
+        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK5) AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(WEEK.WEEK6)
+        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        ELSE 0 END) "planCapacity6",
+        SUM(CASE
+        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK6) AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(WEEK.WEEK7)
+        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        ELSE 0 END) "planCapacity7",
+        SUM(CASE
+        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK7) AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(WEEK.WEEK8)
+        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        ELSE 0 END) "planCapacity8",
+        MAX(CF.VALUE)       "standardWeekCapacity",
+        MAX(CF2.VALUE)       "standardMonthCapacity"
+        FROM Z_SFC_DISPATCH ZSD
+        LEFT JOIN WORK_CENTER wc ON zsd.WORK_CENTER = wc.WORK_CENTER
+        LEFT JOIN WORK_CENTER_T wct ON wc.HANDLE = wct.WORK_CENTER_BO
+        LEFT JOIN RESOURCE_TYPE rt ON rt.RESOURCE_TYPE = ZSD.RESOURCE_TYPE
+        CROSS JOIN WEEK
+        LEFT JOIN OPERATION O ON O.RESOURCE_TYPE_BO = rt.HANDLE AND O.SITE = rt.SITE
+        LEFT JOIN CUSTOM_FIELDS CF ON CF.ATTRIBUTE = 'WEEK_CAPACITY'
+        AND CF.HANDLE = 'OperationBO:1000,' || o.OPERATION || ',1.0'
+        LEFT JOIN CUSTOM_FIELDS CF2 ON CF2.ATTRIBUTE = 'MONTH_CAPACITY'
+        AND CF2.HANDLE = 'OperationBO:1000,' || o.OPERATION || ',1.0'
+        WHERE zsd.DISPATCH_STATUS != 'CANCEL'
+        AND zsd.DISPATCH_STATUS != 'COMPLETE'
+        AND CF.VALUE IS NOT NULL
+        AND CF2.VALUE IS NOT NULL
+        <if test="workCenter != null and workCenter != ''">
+            AND  wc.WORK_CENTER = #{workCenter}
+        </if>
+        GROUP BY wct.DESCRIPTION, rt.RESOURCE_TYPE, rt.DESCRIPTION
+        ORDER BY "planCapacity1" DESC ) WIP
+        WHERE 8 >= ROWNUM
+    </select>
 </mapper>
\ No newline at end of file