From 0d611d1ee3678b3a8e367e892651e722fb50a608 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Tue, 4 Apr 2023 16:58:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=88=90=E5=93=81?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=BC=95=E8=B5=B7=E7=9A=84=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/RuoYiApplication.java | 2 +- .../broad/AllBroadHTMLController.java | 2 +- .../controller/broad/ZZJXBroadController.java | 6 +- .../ruoyi/system/mapper/BroadDataMapper.java | 2 +- .../system/service/IBroadDataService.java | 2 +- .../service/impl/BroadDataServiceImpl.java | 2 +- .../mapper/system/BroadDataMapper.xml | 167 +++++++++++------- 7 files changed, 111 insertions(+), 72 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 0e890c1..1e167dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -16,7 +16,7 @@ public class RuoYiApplication { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + + System.out.println("(♥◠‿◠)ﾉﾞ 启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java index 94c7c1f..c570c69 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java @@ -43,7 +43,7 @@ public class AllBroadHTMLController { return "broad/beforeLibrary"; } - //6 智能工厂二楼终检位置 + //6 智能工厂二楼终检位置——成品入库可视化平台 @GetMapping("/finalAssemblyProductionData") public String finalAssemblyProduction() { return "broad/finalAssemblyProductionData"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java index 9c0dfd4..1602ea6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java @@ -38,12 +38,12 @@ public class ZZJXBroadController { if (id == 0) { // int tag = service.zz_countNightProductIn(); - int tag = service.zz_countNightProductInTag(); - if (tag > 0) { + Integer tag = service.zz_countNightProductInTag(); + if (tag!=null&&tag > 0) { return JSONArray.toJSONString(service.zz_selectProductInByTeamNight()); } return JSONArray.toJSONString(service.zz_selectProductInByTeam()); - +//return null; } else { return JSONArray.toJSONString(service.zz_selectProductInByDay()); } 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 f95208a..cbac5a7 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 @@ -122,5 +122,5 @@ public interface BroadDataMapper { void deleteBoxOutput(); - int zz_countNightProductInTag(); + Integer zz_countNightProductInTag(); } 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 8f69c0c..54eb907 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 @@ -80,7 +80,7 @@ public interface IBroadDataService { List mtk_sselectQATop3(); - int zz_countNightProductInTag(); + Integer zz_countNightProductInTag(); List zz_selectLossInfo(int state); List mtk_selectQAZD(); 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 57aef91..35e4e98 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 @@ -170,7 +170,7 @@ public class BroadDataServiceImpl implements IBroadDataService } @Override - public int zz_countNightProductInTag() { + public Integer zz_countNightProductInTag() { return mapper.zz_countNightProductInTag(); } diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 8c99066..4e5982d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -736,83 +736,122 @@ from haiwei.BASE_PRODUCT_QTY where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7) union + select code, sum(qty), name + from ( + select wb.day as code, count(1) as qty, '产量' as name + from IMOS.IMOS_PR_PRODUCT_BARCODE ba + left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END + from haiwei.BASE_DAY_WBTIME + where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 1) + ) wb on 1 = 1 + where PRODUCTION_DATE between W_START and B_END + group by wb.day + + union + select to_char((TRUNC(sysdate, 'D') + 1), 'MM-dd') as code, 0 as qty, '产量' as name + from dual + ) group by code, name + + union + select code, sum(qty), name + from ( select wb.day as code, count(1) as qty, '产量' as name from IMOS.IMOS_PR_PRODUCT_BARCODE ba - left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END - from haiwei.BASE_PRODUCT_QTY bpq - left join haiwei.BASE_DAY_WBTIME wb - on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY - where DAY = (TRUNC(sysdate, 'D') + 1) + left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END + from haiwei.BASE_DAY_WBTIME + where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 2) ) wb on 1 = 1 where PRODUCTION_DATE between W_START and B_END group by wb.day union - select wb.day as code, count(1) as qty, '产量' as name - from IMOS.IMOS_PR_PRODUCT_BARCODE ba - left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END - from haiwei.BASE_PRODUCT_QTY bpq - left join haiwei.BASE_DAY_WBTIME wb - on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY - where DAY = (TRUNC(sysdate, 'D') + 2) - ) wb on 1 = 1 - where PRODUCTION_DATE between W_START and B_END - group by wb.day + select to_char((TRUNC(sysdate, 'D') + 2), 'MM-dd') as code, 0 as qty, '产量' as name + from dual + ) + group by code, name union + select code, sum(qty), name + from ( select wb.day as code, count(1) as qty, '产量' as name from IMOS.IMOS_PR_PRODUCT_BARCODE ba - left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END - from haiwei.BASE_PRODUCT_QTY bpq - left join haiwei.BASE_DAY_WBTIME wb - on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY - where DAY = (TRUNC(sysdate, 'D') + 3) - ) wb on 1 = 1 - where PRODUCTION_DATE between W_START and B_END - group by wb.day - union - select wb.day as code, count(1) as qty, '产量' as name - from IMOS.IMOS_PR_PRODUCT_BARCODE ba - left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END - from haiwei.BASE_PRODUCT_QTY bpq - left join haiwei.BASE_DAY_WBTIME wb - on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY - where DAY = (TRUNC(sysdate, 'D') + 4) - ) wb on 1 = 1 - where PRODUCTION_DATE between W_START and B_END - group by wb.day - union - select wb.day as code, count(1) as qty, '产量' as name - from IMOS.IMOS_PR_PRODUCT_BARCODE ba - left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END - from haiwei.BASE_PRODUCT_QTY bpq - left join haiwei.BASE_DAY_WBTIME wb - on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY - where DAY = (TRUNC(sysdate, 'D') + 5) - ) wb on 1 = 1 - where PRODUCTION_DATE between W_START and B_END - group by wb.day - union - select wb.day as code, count(1) as qty, '产量' as name - from IMOS.IMOS_PR_PRODUCT_BARCODE ba - left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END - from haiwei.BASE_PRODUCT_QTY bpq - left join haiwei.BASE_DAY_WBTIME wb - on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY - where DAY = (TRUNC(sysdate, 'D') + 6) - ) wb on 1 = 1 - where PRODUCTION_DATE between W_START and B_END - group by wb.day - union - select wb.day as code, count(1) as qty, '产量' as name - from IMOS.IMOS_PR_PRODUCT_BARCODE ba - left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END - from haiwei.BASE_PRODUCT_QTY bpq - left join haiwei.BASE_DAY_WBTIME wb - on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY - where DAY = (TRUNC(sysdate, 'D') + 7) + left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END + from haiwei.BASE_DAY_WBTIME + where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 3) ) wb on 1 = 1 where PRODUCTION_DATE between W_START and B_END group by wb.day + union + select to_char((TRUNC(sysdate, 'D') + 3), 'MM-dd') as code, 0 as qty, '产量' as name + from dual + ) + group by code, name + union + select code, sum(qty), name + from ( + select wb.day as code, count(1) as qty, '产量' as name + from IMOS.IMOS_PR_PRODUCT_BARCODE ba + left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END + from haiwei.BASE_DAY_WBTIME + where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss')= (TRUNC(sysdate, 'D') + 4) + ) wb on 1 = 1 + where PRODUCTION_DATE between W_START and B_END + group by wb.day + union + select to_char((TRUNC(sysdate, 'D') + 4), 'MM-dd') as code, 0 as qty, '产量' as name + from dual + ) + group by code, name + + union + select code, sum(qty), name + from ( + select wb.day as code, count(1) as qty, '产量' as name + from IMOS.IMOS_PR_PRODUCT_BARCODE ba + left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END + from haiwei.BASE_DAY_WBTIME + where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 5) + ) wb on 1 = 1 + where PRODUCTION_DATE between W_START and B_END + group by wb.day + + union + select to_char((TRUNC(sysdate, 'D') + 5), 'MM-dd') as code, 0 as qty, '产量' as name + from dual + ) + group by code, name + union + select code, sum(qty), name + from ( + select wb.day as code, count(1) as qty, '产量' as name + from IMOS.IMOS_PR_PRODUCT_BARCODE ba + left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END + from haiwei.BASE_DAY_WBTIME + where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 6) + ) wb on 1 = 1 + where PRODUCTION_DATE between W_START and B_END + group by wb.day + + union + select to_char((TRUNC(sysdate, 'D') + 6), 'MM-dd') as code, 0 as qty, '产量' as name + from dual + ) + group by code, name + union + select code, sum(qty), name + from ( + select wb.day as code, count(1) as qty, '产量' as name + from IMOS.IMOS_PR_PRODUCT_BARCODE ba + left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END + from haiwei.BASE_DAY_WBTIME + where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss')= (TRUNC(sysdate, 'D') + 7) + ) wb on 1 = 1 + where PRODUCTION_DATE between W_START and B_END + group by wb.day + union + select to_char((TRUNC(sysdate, 'D') + 7), 'MM-dd') as code, 0 as qty, '产量' as name + from dual + ) + group by code, name