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 62f2f06..f69dcc5 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 @@ -80,33 +80,8 @@ public class BoxBroadController { @PostMapping("/getProductPlanInfo") @ResponseBody public String getProductPlanInfo() { - List> planInfoList = new ArrayList>(); - List planInfo = service.getUHullPlanInfo(); - - planInfo.forEach(x -> { - planInfoList.add( - new ArrayList() { - { - this.add(x.getOrderType()); - this.add(x.getPlannedProduction()); - this.add(x.getActualProduction()); - this.add(x.getPlannedProduction() - x.getActualProduction()); - if (x.getPlannedProduction() == 0 || x.getActualProduction() == 0) { - this.add("0%"); - } else { - this.add(((double) x.getActualProduction() / (double) x.getPlannedProduction() * 100) + "%"); - } - if (x.getEndTime() != null) { - this.add(dateFormat.format(x.getEndTime())); - } else { - this.add("-"); - } - } - }); - }); - - String jsonInfo = JSONArray.toJSONString(planInfoList); - + List planInfo = service.getUHullPlanInfo("1002"); + String jsonInfo = JSONArray.toJSONString(planInfo); System.out.println("MES生产计划信息查询：" + jsonInfo); return jsonInfo; } diff --git a/ruoyi-admin/src/main/resources/static/img/runImg.png b/ruoyi-admin/src/main/resources/static/img/runImg.png new file mode 100644 index 0000000..100bf0f Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/runImg.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/stopImg.png b/ruoyi-admin/src/main/resources/static/img/stopImg.png new file mode 100644 index 0000000..6475822 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/stopImg.png differ diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html new file mode 100644 index 0000000..bf68aed --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html @@ -0,0 +1,960 @@ + + + + + + 发泡SCADA数据平台 + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ + + + +
+
+
+ +
+
+
+ + +
+ +
+ - +
+ +
+ - +
+ +
+ - +
+ +
+ - +
+ + +
+ - +
+ +
+ - +
+ +
+ - +
+ +
+ - +
+ + +
+ - +
+ +
+ - +
+ +
+ - +
+ +
+ - +
+ + +
+ 运行状态 +
+ + +
+ 运行状态 +
+ +
+ 运行状态 +
+ +
+ 运行状态 +
+ + +
+ 运行状态 + +
+
+ 运行状态 + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java index edd5432..8e9b302 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java @@ -1,76 +1,60 @@ package com.ruoyi.system.domain; -import java.util.Date; public class OrderInfo { - private String orderType; + private String plan_code; + private String name; + private int plan_number; + private int actual_number; + private double rate; + private String day; - private String materialType; - - private long plannedProduction; - - private long actualProduction; - - private long recordTime; - - private Date endTime; - - private String planDate; - - public String getOrderType() { - return orderType; + public String getName() { + return name; } - public void setOrderType(String orderType) { - this.orderType = orderType; + public void setName(String name) { + this.name = name; } - public String getMaterialType() { - return materialType; + public double getRate() { + return rate; } - public void setMaterialType(String materialType) { - this.materialType = materialType; + public void setRate(double rate) { + this.rate = rate; } - public long getPlannedProduction() { - return plannedProduction; + public String getPlan_code() { + return plan_code; } - public void setPlannedProduction(long plannedProduction) { - this.plannedProduction = plannedProduction; + public void setPlan_code(String plan_code) { + this.plan_code = plan_code; } - public long getActualProduction() { - return actualProduction; + public int getPlan_number() { + return plan_number; } - public void setActualProduction(long actualProduction) { - this.actualProduction = actualProduction; + public void setPlan_number(int plan_number) { + this.plan_number = plan_number; } - public long getRecordTime() { - return recordTime; + public int getActual_number() { + return actual_number; } - public void setRecordTime(long recordTime) { - this.recordTime = recordTime; + public void setActual_number(int actual_number) { + this.actual_number = actual_number; } - public Date getEndTime() { - return endTime; + public String getDay() { + return day; } - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public String getPlanDate() { - return planDate; - } - - public void setPlanDate(String planDate) { - this.planDate = planDate; + public void setDay(String day) { + this.day = day; } } 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 39da4e3..d3c45ec 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 @@ -20,7 +20,21 @@ public interface BroadDataMapper { List selectOutputByType(); - List getUHullPlanInfo(); + List getUHullPlanInfo(String id); List selectOutputByTime(); + + /////////////////////////////////////////////////////////////////////////// + // 发泡线 + /////////////////////////////////////////////////////////////////////////// + List fp_selectOrderInfo(); + + /////////////////////////////////////////////////////////////////////////// + // 泡前库 + /////////////////////////////////////////////////////////////////////////// + + // 成品入库 + List pqk_selectProductInStore(); + + List pqk_selectOrderInfo(); } 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 95621b4..f94e97b 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 @@ -17,7 +17,20 @@ public interface IBroadDataService { List selectOutputByType(); - List getUHullPlanInfo(); + List getUHullPlanInfo(String id); List selectOutputByTime(); + + + + + List fp_selectOrderInfo(); + + + // 泡前库 成品入库 + List pqk_selectProductInStore(); + //泡前库 订单完成率 + List pqk_selectOrderInfo(); + + } 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 a3eac34..911b13d 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 @@ -39,12 +39,39 @@ public class BroadDataServiceImpl implements IBroadDataService } @Override - public List getUHullPlanInfo() { - return mapper.getUHullPlanInfo(); + public List getUHullPlanInfo(String id) { + return mapper.getUHullPlanInfo(id); } @Override public List selectOutputByTime() { return mapper.selectOutputByTime(); } + + + + + + /////////////////////////////////////////////////////////////////////////// + // 发泡线 + /////////////////////////////////////////////////////////////////////////// + @Override + public List fp_selectOrderInfo(){ + return mapper.fp_selectOrderInfo(); + } + + /////////////////////////////////////////////////////////////////////////// + // 泡前库 + /////////////////////////////////////////////////////////////////////////// + + // 成品入库 + @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 0a3653e..18ae98a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -71,39 +71,93 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and PROCESS_CODE = 1002 group by MATERIAL_NAME - - - - - - - - - - + select PLAN_NO as plan_code, + SUM(PLAN_QTY) as plan_number, + SUM(ACTUAL_QTY) as actual_number, + to_char(sysdate , 'yyyy-MM-dd') as day from IMOS_PR_PLAN t - where process_code = '1002' - and detial_type_code = '1002' + where process_code = #{id} and delete_flag = '0' and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') - group by PLAN_NO, MATERIAL_NAME + group by PLAN_NO + order by PLAN_NO desc + + + + + + + + + + \ No newline at end of file