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 f69dcc5..32d0d2b 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 @@ -33,7 +33,7 @@ public class BoxBroadController { @ResponseBody @ApiOperation("箱壳查询计划数量完成情况") public String selectplanCompletion() { - BoxPlanCompletion completion = service.selectplanCompletion(); + BoxPlanCompletion completion = service.selectplanCompletion("1002"); return JSONObject.toJSONString(completion); } 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 new file mode 100644 index 0000000..02cb837 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java @@ -0,0 +1,54 @@ +package com.ruoyi.web.controller.broad; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.system.domain.BoxPlanCompletion; +import com.ruoyi.system.domain.OrderInfo; +import com.ruoyi.system.service.IBroadDataService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * @author wanghao + * @date 2022/7/14 9:49 + */ +@Controller +@RequestMapping("/broad/fp") +@ApiOperation("发泡") +public class FPBroadController { + @Autowired + IBroadDataService service; + + @GetMapping() + private String getBroad() { + return "/broad/fp"; + } + + @PostMapping("/selectOrderExecution") + @ApiOperation("订单执行、生产统计") + @ResponseBody + private String selectOrderExecution() { + return JSONArray.toJSONString(service.fp_selectOrderExecution()); + } + + @PostMapping("/selectOrderInfo") + @ApiOperation("中间生产数量统计") + @ResponseBody + private String selectProductionStatistics() { + return JSONObject.toJSONString(service.selectplanCompletion("1005")); + } + + @PostMapping("/selectDeviceStation") + @ResponseBody + @ApiOperation("POL压力、SO温度") + private String selectDeviceStation() { + return JSONObject.toJSONString(service.fp_selectDeviceStation()); + } +} diff --git a/ruoyi-admin/src/main/resources/static/img/foamer2.jpg b/ruoyi-admin/src/main/resources/static/img/foamer2.jpg new file mode 100644 index 0000000..eedad6c Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/foamer2.jpg differ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DeviceStation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DeviceStation.java new file mode 100644 index 0000000..d80ed06 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DeviceStation.java @@ -0,0 +1,50 @@ +package com.ruoyi.system.domain; + +/** + * @author wanghao + * 发泡线 压力、温度 + * @date 2022/7/14 15:00 + */ +public class DeviceStation { + private String station_no, pol_yl, so_yl, pol_wd, so_wd; + + public String getStation_no() { + return station_no; + } + + public void setStation_no(String station_no) { + this.station_no = station_no; + } + + public String getPol_yl() { + return pol_yl; + } + + public void setPol_yl(String pol_yl) { + this.pol_yl = pol_yl; + } + + public String getSo_yl() { + return so_yl; + } + + public void setSo_yl(String so_yl) { + this.so_yl = so_yl; + } + + public String getPol_wd() { + return pol_wd; + } + + public void setPol_wd(String pol_wd) { + this.pol_wd = pol_wd; + } + + public String getSo_wd() { + return so_wd; + } + + public void setSo_wd(String so_wd) { + this.so_wd = so_wd; + } +} 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 2777057..9a50d8d 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 @@ -11,7 +11,7 @@ import java.util.List; */ @Repository public interface BroadDataMapper { - BoxPlanCompletion selectplanCompletion(); + BoxPlanCompletion selectplanCompletion(String gxid); List selectStock(String id); @@ -24,7 +24,7 @@ public interface BroadDataMapper { /////////////////////////////////////////////////////////////////////////// // 发泡线 /////////////////////////////////////////////////////////////////////////// - List fp_selectOrderInfo(); + List fp_selectOrderExecution(); /////////////////////////////////////////////////////////////////////////// // 泡前库 @@ -38,4 +38,6 @@ public interface BroadDataMapper { List pqk_selectQualityItem(); List pqk_selectQualityInfo(); + + List fp_selectDeviceStation(); } 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 8b083d3..6fa254c 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 @@ -11,7 +11,7 @@ import java.util.List; public interface IBroadDataService { - BoxPlanCompletion selectplanCompletion(); + BoxPlanCompletion selectplanCompletion(String gxid); List selectStock(String id); @@ -24,7 +24,6 @@ public interface IBroadDataService { - List fp_selectOrderInfo(); // 泡前库 成品入库 @@ -36,4 +35,8 @@ public interface IBroadDataService { List pqk_selectQualityItem(); List pqk_selectQualityInfo(); + + List fp_selectOrderExecution(); + + List fp_selectDeviceStation(); } 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 1e1a508..7d6d439 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 @@ -24,8 +24,8 @@ public class BroadDataServiceImpl implements IBroadDataService @Override - public BoxPlanCompletion selectplanCompletion() { - return mapper.selectplanCompletion(); + public BoxPlanCompletion selectplanCompletion(String gxid) { + return mapper.selectplanCompletion(gxid); } @Override @@ -56,11 +56,16 @@ public class BroadDataServiceImpl implements IBroadDataService // 发泡线 /////////////////////////////////////////////////////////////////////////// @Override - public List fp_selectOrderInfo(){ - return mapper.fp_selectOrderInfo(); + public List fp_selectOrderExecution(){ + return mapper.fp_selectOrderExecution(); } - /////////////////////////////////////////////////////////////////////////// + @Override + public List fp_selectDeviceStation() { + return mapper.fp_selectDeviceStation(); + } + +/////////////////////////////////////////////////////////////////////////// // 泡前库 /////////////////////////////////////////////////////////////////////////// diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index b55483d..0f78b22 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -14,11 +14,10 @@ - select substr(MATERIAL_NAME, case when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1 @@ -111,12 +110,10 @@ else instr(MATERIAL_NAME, '/', 1, 1) + 1 end) as name, sum(PLAN_QTY) as plan_number, - SUM(ACTUAL_QTY) as actual_number + SUM(ACTUAL_QTY) as qty from IMOS_PR_PLAN where to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') - and DETIAL_TYPE_CODE = '1001' - and delete_flag = '0' - -- and PLAN_STATE !=8 + and PROCESS_CODE = '1005' and delete_flag = '0' group by MATERIAL_NAME @@ -182,4 +179,14 @@ and to_char(record.CREATION_DATE, 'yyyy-MM-dd') between to_char(sysdate-1,'yyyy-mm-dd') and to_char(sysdate+1,'yyyy-mm-dd') order by record.CREATION_DATE desc + + \ No newline at end of file