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 01747f9..6a4905e 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 @@ -63,14 +63,14 @@ public class BoxBroadController { return jsonInfo; } - /* @PostMapping("/selectOutputByTime") + @PostMapping("/selectOutputByTime") @ApiOperation("箱壳按小时查询产量") public String selectOutputByTime() { Integer state=BroadDruidServiceImpl.selectTeamGroups(); if (state==0){ - List info = service.selectOutputByTime(); + return JSONArray.toJSONString(service.selectOutputByTime()); } - return JSONArray.toJSONString(); + return JSONArray.toJSONString(service.selectOutputByTime1()); // BoxOutput boxOutput= info.get(0); // info.remove(0); // int qty = BroadDruidServiceImpl.selectNowXkOutPut();//实时的数量 @@ -90,7 +90,7 @@ public class BoxBroadController { // String jsonInfo = JSONArray.toJSONString(info); // System.out.println("根据型号统计产量:" + jsonInfo); // return jsonInfo; - }*/ + } 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 35d4d81..aaf51df 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 @@ -21,6 +21,7 @@ public interface BroadDataMapper { List getUHullPlanInfo(String id); List selectOutputByTime(); + List selectOutputByTime1(); /////////////////////////////////////////////////////////////////////////// // 发泡线 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 61d82ef..49f7430 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 @@ -20,6 +20,7 @@ public interface IBroadDataService { List getUHullPlanInfo(String id); List selectOutputByTime(); + List selectOutputByTime1(); @@ -94,4 +95,6 @@ public interface IBroadDataService { int zz_countNightProductIn(); List yue_selectMonthQANumber(); + + } 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 9a42901..092e528 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 @@ -49,6 +49,10 @@ public class BroadDataServiceImpl implements IBroadDataService public List selectOutputByTime() { return mapper.selectOutputByTime(); } + @Override + public List selectOutputByTime1() { + return mapper.selectOutputByTime1(); + } @Override public List 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 d730215..3cbca41 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -67,7 +67,7 @@ when instr(name, '/', 1, 1) = 0 then instr(name, ',', 1, 1) + 1 else instr(name, '/', 1, 1) + 1 end) as name, - sum(QTY3) + sum(QTY3) as qty from IMOS.BASE_BOX_OUTPUT_RECORD xhq left join (select * from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 @@ -111,11 +111,121 @@