From c291217871534cc28bc1a5f8fac66d67ec768c00 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Tue, 8 Nov 2022 10:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=9F=E8=8D=B7=E7=9C=8B=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TemporaryFixController.java    | 21 +++++++++++++++++++
 .../main/resources/mapper/ReportMapper.xml    |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java
index a88fe084..bbba314d 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java
@@ -1,8 +1,11 @@
 package com.foreverwin.mesnac.anomaly.controller;
 
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
 import com.foreverwin.mesnac.anomaly.utils.DateReportUtils;
 import com.foreverwin.mesnac.common.util.DataUtils;
 import com.foreverwin.mesnac.common.util.DateUtil;
+import com.foreverwin.mesnac.common.util.HttpUtils;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.modular.core.util.R;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -153,6 +156,24 @@ public class TemporaryFixController {
         return R.ok(result);
     }
 
+    /**
+     * 测试
+     * @param paramMap
+     * @return
+     */
+    @PostMapping("/getURL")
+    @ResponseBody
+    public R getURL(Map paramMap) {
+        paramMap.put("materialCode","A10000");
+        String respBody = null;
+        try {
+            String jsonStr = JSONUtil.toJsonStr(paramMap);
+            respBody = HttpUtil.post("http://121.36.58.109:6088/hand/instore/info?materialCode=A10000", jsonStr);
+        } catch (Exception e) {
+            return R.failed(e.toString());
+        }
+        return R.ok(respBody);
+    }
 
 /*
     @PostMapping("/import")
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index c1e38048..91fd1eb2 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -2621,7 +2621,7 @@ SELECT zab.CREATED_DATE_TIME,
         FROM DUAL)
         SELECT WCT.DESCRIPTION     "workCenterDescription",
         cf2.VALUE           "workOrder",
-        ROUND(ROUND(SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
         ZSD.DISPATCH_STATUS != 'COMPLETE'
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
@@ -2712,7 +2712,7 @@ SELECT zab.CREATED_DATE_TIME,
         GROUP BY WCT.DESCRIPTION, cf2.VALUE) WIP
              ) KHW
         GROUP BY KHW."workCenterDescription", KHW."shortHandWorkOrder"
-        ORDER BY KHW."workCenterDescription" DESC, KHW."shortHandWorkOrder"
+        ORDER BY "totalWorkingHours" DESC
     </select>
     <select id="workingHoursEachWorkshop" resultType="java.util.Map" parameterType="java.util.HashMap">
         -- 工时看板(各车间总工时完成情况)
@@ -2723,7 +2723,7 @@ SELECT zab.CREATED_DATE_TIME,
         SELECT WCT.DESCRIPTION               WORK_CENTER,
                M_MONTH.MONTH,
                SUM(ROUND(CASE
-                             WHEN M_MONTH.MONTH = TO_CHAR(ZSD.ACTUAL_COMPLETE_DATE, 'yyyy-mm') THEN
+                             WHEN M_MONTH.MONTH = TO_CHAR(ZSD.ACTUAL_COMPLETE_DATE + 8/24, 'yyyy-mm') THEN
                                  ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
                              ELSE 0 END, 2)) QTY
         FROM Z_SFC_DISPATCH ZSD