From adf071cd8dfeb55ce237af8c580d7404328b6e4c Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 12 Nov 2021 11:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9C=8B=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/BoardController.java | 29 +++++++ .../mesnac/common/mapper/BoardMapper.java | 5 ++ .../src/main/resources/mapper/BoardMapper.xml | 80 ++++++++++++++++++- 3 files changed, 112 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/BoardController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/BoardController.java index 93ffcb76..b7d4098c 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/BoardController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/BoardController.java @@ -350,4 +350,33 @@ public class BoardController { } } + /** + * 异常类型数量 + */ + @GetMapping("/abnormalTypeQty") + public R abnormalTypeQty(@RequestParam(required = false) Map paramMap) { + try { + paramMap.put("site", CommonMethods.getSite()); + List> result = boardMapper.abnormalTypeQty(paramMap); + return R.ok(result); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + + /** + * 异常详情 + */ + @GetMapping("/abnormalDataDetails") + public R abnormalDataDetails(@RequestParam(required = false) Map paramMap) { + try { + paramMap.put("site", CommonMethods.getSite()); + List> result = boardMapper.abnormalDataDetails(paramMap); + return R.ok(result); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/BoardMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/BoardMapper.java index 7c5b6ab4..2456e827 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/BoardMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/BoardMapper.java @@ -62,4 +62,9 @@ public interface BoardMapper { List> resourceQtyDow(Map paramMap); List> resourceQtyAll(Map paramMap); + // 异常类型数据 + List> abnormalTypeQty(Map paramMap); + // 异常详情 + List> abnormalDataDetails(Map paramMap); + } diff --git a/common/src/main/resources/mapper/BoardMapper.xml b/common/src/main/resources/mapper/BoardMapper.xml index e3b678d8..3a104634 100644 --- a/common/src/main/resources/mapper/BoardMapper.xml +++ b/common/src/main/resources/mapper/BoardMapper.xml @@ -487,7 +487,7 @@ FROM DUAL , (SELECT ROUND( SUM(SO.QTY_DONE) / SUM(SO.QTY_TO_BUILD) , 4 ) * 100 RATE FROM SHOP_ORDER SO LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF.ATTRIBUTE = 'FACTORY' - WHERE SITE = '1000' --AND CF.VALUE = '6106' + WHERE SITE = '1000' AND TO_CHAR(SO.PLANNED_COMP_DATE,'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM') GROUP BY TO_CHAR(PLANNED_COMP_DATE,'YYYY-MM') ) T @@ -515,7 +515,7 @@ AND R.RESRCE NOT IN (SELECT RESRCE FROM Z_RESOURCE_STATUS_RECEIVE zrsr WHERE ZRSR.STATUS IN ('DOW' ,'WARN')) ) N ) Z - + + + + + + \ No newline at end of file