diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java index e390ea9..4ce948c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java @@ -40,6 +40,13 @@ public class FPBroadController { @ApiOperation("订单执行、生产统计") private String selectOrderExecution() { return JSONArray.toJSONString(service.fp_selectOrderExecution()); + + } + @PostMapping("/selectOrderExecutionPlan") + @ApiOperation("订单执行") + private String fp_selectOrderExecutionPlan() { + return JSONArray.toJSONString(service.fp_selectOrderExecutionPlan()); + } @PostMapping("/selectFpOrderInfo") 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 42c1e45..e6c902d 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 @@ -26,6 +26,7 @@ public interface BroadDataMapper { // 发泡线 /////////////////////////////////////////////////////////////////////////// List fp_selectOrderExecution(); + List fp_selectOrderExecutionPlan(); /////////////////////////////////////////////////////////////////////////// // 泡前库 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 8f5fe19..fab9697 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 @@ -37,6 +37,7 @@ public interface IBroadDataService { List pqk_selectQualityInfo(); List fp_selectOrderExecution(); + List fp_selectOrderExecutionPlan(); List fp_selectDeviceStation(); @@ -75,4 +76,6 @@ public interface IBroadDataService { List zz_selectInstoreNumByday(); List mtk_sselectQATop3(); + + } 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 3db867b..b64c5f8 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 @@ -62,6 +62,10 @@ public class BroadDataServiceImpl implements IBroadDataService public List fp_selectOrderExecution(){ return mapper.fp_selectOrderExecution(); } + @Override + public List fp_selectOrderExecutionPlan(){ + return mapper.fp_selectOrderExecutionPlan(); + } @Override public BoxOutput selectOutputByTimeDY() { diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 09aad97..6224c59 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -217,6 +217,33 @@ FROM (select PLAN_NUMBER where PRODUCT_QTY > 0 group by MATERIAL_NAME, plan_number + +