From 1db1a0ede43bbdea9c4d1b148cb420265f4ff4fb Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Tue, 19 Jul 2022 13:30:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/broad/BoxBroadController.java | 6 ++++++ .../main/java/com/ruoyi/system/mapper/BroadDataMapper.java | 2 ++ .../java/com/ruoyi/system/service/IBroadDataService.java | 2 ++ .../ruoyi/system/service/impl/BroadDataServiceImpl.java | 7 ++++--- .../src/main/resources/mapper/system/BroadDataMapper.xml | 7 +++++++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java index 0641a28..a5248ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.system.domain.*; import com.ruoyi.system.service.IBroadDataService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -44,6 +45,11 @@ public class BoxBroadController { return JSONObject.toJSONString(new EchartsDTO(xAxisInfo, seriesInfo)); } + @PostMapping("/selectStockOccupancy") + @ApiOperation("库存占有率") + public String selectStockOccupancy(){ + return JSONArray.toJSONString(service.xk_selectStockOccupancy()); + } @PostMapping("/selectOutputByType") diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index 5e79247..6d94a47 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -42,6 +42,8 @@ public interface BroadDataMapper { List fp_selectDeviceStation(); List fp_selectStationHourInfo(); + List xk_selectStockOccupancy(); + /////////////////////////////////////////////////////////////////////////// // 6 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index c10b7e2..aa57364 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -41,4 +41,6 @@ public interface IBroadDataService { List fp_selectDeviceStation(); List fp_selectStationHourInfo(); + + List xk_selectStockOccupancy(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index 7c99148..912f0c8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -48,9 +48,10 @@ public class BroadDataServiceImpl implements IBroadDataService return mapper.selectOutputByTime(); } - - - + @Override + public List xk_selectStockOccupancy() { + return mapper.xk_selectStockOccupancy(); + } /////////////////////////////////////////////////////////////////////////// // 发泡线 diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index ead3c14..f47f857 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -84,6 +84,13 @@ group by MATERIAL_NAME + @@ -74,11 +93,24 @@ SUM(ACTUAL_QTY) as qty from IMOS_PR_PLAN where --- to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') - CREATION_DATE between - to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', 'yyyy-MM-dd hh24:mi:ss') - and - to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss') + CREATION_DATE > + case + when to_char(sysdate, 'hh24') > 7 and to_char(sysdate, 'hh24') < 20 then to_date( + to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', + 'yyyy-MM-dd hh24:mi:ss') + when to_char(sysdate, 'hh24') < 7 then to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', + 'yyyy-MM-dd hh24:mi:ss') + else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss') + end + and CREATION_DATE < + case + when to_char(sysdate, 'hh24') > 7 and to_char(sysdate, 'hh24') < 20 then to_date( + to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', + 'yyyy-MM-dd hh24:mi:ss') + when to_char(sysdate, 'hh24') < 7 then to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', + 'yyyy-MM-dd hh24:mi:ss') + else to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '24:00:00', 'yyyy-MM-dd hh24:mi:ss') + end and PROCESS_CODE = 1002 and ACTUAL_QTY!=0 group by MATERIAL_NAME @@ -120,11 +152,28 @@ from IMOS_LO_TASK_HISTORY where detial_type_code = '1002' and TASK_TYPE != 'O' - - and CREATION_DATE between - to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', 'yyyy-MM-dd hh24:mi:ss') - and - to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss') + and CREATION_DATE > + case + when to_char(sysdate, 'hh24') > 7 and to_char(sysdate, 'hh24') < 20 then to_date( + to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', + 'yyyy-MM-dd hh24:mi:ss') + when to_char(sysdate, 'hh24') < 7 then to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', + 'yyyy-MM-dd hh24:mi:ss') + else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss') + end + and CREATION_DATE < + case + when to_char(sysdate, 'hh24') > 7 and to_char(sysdate, 'hh24') < 20 then to_date( + to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', + 'yyyy-MM-dd hh24:mi:ss') + when to_char(sysdate, 'hh24') < 7 then to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', + 'yyyy-MM-dd hh24:mi:ss') + else to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '24:00:00', 'yyyy-MM-dd hh24:mi:ss') + end +-- and CREATION_DATE between +-- to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', 'yyyy-MM-dd hh24:mi:ss') +-- and +-- to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss') ) group by TO_CHAR(CREATION_DATE, 'hh24') order by name From db9b8127f258fe4ca76083da3fb02e811f1eee14 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Tue, 19 Jul 2022 14:08:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/templates/broad/box.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 7845ee1..86910a4 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -18,7 +18,7 @@