diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java index 0ceeab0..97af3e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java @@ -48,13 +48,13 @@ public class BeforeLibraryController { return JSONArray.toJSONString(list); } -// @PostMapping("/selectProductInStore") -// @ApiOperation("泡前库 成品入库") -// @ResponseBody -// public String pqk_selectProductInStore() { -// List list = service.pqk_selectProductInStore(); -// return JSONArray.toJSONString(list); -// } + @PostMapping("/selectProductInStore") + @ApiOperation("成品入库统计") + @ResponseBody + public String pqk_selectProductInStore() { + List list = service.pqk_selectProductInStore(); + return JSONArray.toJSONString(list); + } // @PostMapping("/selectQualityItem") diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 3e533a0..4da19e3 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,7 +7,9 @@ spring: # 主库数据源 master: url: jdbc:oracle:thin:@10.100.70.5:1521:aucma +# url: jdbc:oracle:thin:@124.70.0.226:1521:ORCL username: haiwei +# username: C##USERNAME password: 123456 # 从库数据源 slave: diff --git a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js index ae0c7cd..409a2ed 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js +++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js @@ -94,7 +94,8 @@ $(() => { }) //成品入库统计轮询 - autoUpdate("/broad/mtk/selectInstoreNumByday", INTERVAL, data => { + // autoUpdate("/broad/mtk/selectInstoreNumByday", INTERVAL, data => { + autoUpdate("/broad/beforeLibrary/selectProductInStore", INTERVAL, data => { data.sort((a, b) => { return b.qty - a.qty }) 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 aaf51df..59d3869 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 @@ -113,4 +113,6 @@ public interface BroadDataMapper { List yue_selectMonthQANumber(); + + List pqk_selectProductInStore(); } 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 49f7430..3f22738 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 @@ -97,4 +97,5 @@ public interface IBroadDataService { List yue_selectMonthQANumber(); + List pqk_selectProductInStore(); } 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 092e528..71dd108 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 @@ -101,6 +101,11 @@ public class BroadDataServiceImpl implements IBroadDataService // 成品入库 + @Override + public List pqk_selectProductInStore() { + return mapper.pqk_selectProductInStore(); + } + @Override public List pqk_selectOrderInfo() { return mapper.pqk_selectOrderInfo(); diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index a5ffcff..2c68fc1 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -941,6 +941,24 @@ where 600 < ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM ) + select count(1) from IMOS.IMOS_PR_PRODUCT_BARCODE + where PRODUCTION_DATE > ( select W_END + interval '5' MINUTE from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc )