增加 发泡看板

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);
     }
 

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());
+    }
+}

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;
+    }
+}

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<BoxStock> selectStock(String id);
 
@@ -24,7 +24,7 @@ public interface BroadDataMapper {
     ///////////////////////////////////////////////////////////////////////////
     // 发泡线
     ///////////////////////////////////////////////////////////////////////////
-    List<OrderInfo> fp_selectOrderInfo();
+    List<OrderInfo> fp_selectOrderExecution();
 
     ///////////////////////////////////////////////////////////////////////////
     // 泡前库
@@ -38,4 +38,6 @@ public interface BroadDataMapper {
     List<BoxOutput> pqk_selectQualityItem();
 
     List<QualityInfo> pqk_selectQualityInfo();
+
+    List<DeviceStation> fp_selectDeviceStation();
 }

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<BoxStock> selectStock(String id);
 
@@ -24,7 +24,6 @@ public interface IBroadDataService {
 
 
 
-    List<OrderInfo> fp_selectOrderInfo();
 
 
     // 泡前库   成品入库
@@ -36,4 +35,8 @@ public interface IBroadDataService {
     List<BoxOutput> pqk_selectQualityItem();
 
     List<QualityInfo> pqk_selectQualityInfo();
+
+    List<OrderInfo> fp_selectOrderExecution();
+
+    List<DeviceStation> fp_selectDeviceStation();
 }

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() {
+    public BoxPlanCompletion selectplanCompletion(String gxid) {
-        return mapper.selectplanCompletion();
+        return mapper.selectplanCompletion(gxid);
     }
 
     @Override
@@ -56,11 +56,16 @@ public class BroadDataServiceImpl implements IBroadDataService
     // 发泡线
     ///////////////////////////////////////////////////////////////////////////
     @Override
-    public List<OrderInfo> fp_selectOrderInfo(){
+    public List<OrderInfo> fp_selectOrderExecution(){
-        return mapper.fp_selectOrderInfo();
+        return mapper.fp_selectOrderExecution();
     }
 
-    ///////////////////////////////////////////////////////////////////////////
+    @Override
+    public List<DeviceStation> fp_selectDeviceStation() {
+        return mapper.fp_selectDeviceStation();
+    }
+
+///////////////////////////////////////////////////////////////////////////
     // 泡前库
     ///////////////////////////////////////////////////////////////////////////
 

ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml

@@ -17,8 +17,7 @@
                plan_shift
         from IMOS_PR_PLAN
         where plan_date is not null
-          and process_code = '1002'
+          and process_code = #{gxid}
-          and detial_type_code = '1002'
           and delete_flag = '0'
           and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
         group by to_char(plan_date, 'yyyy-MM-dd'), PLAN_SHIFT
@@ -95,7 +94,7 @@
     </select>
 
 
-    <select id="fp_selectOrderInfo" resultType="com.ruoyi.system.domain.OrderInfo">
+    <select id="fp_selectOrderExecution" resultType="com.ruoyi.system.domain.OrderInfo">
         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 PROCESS_CODE = '1005'  and delete_flag = '0'
-          and delete_flag = '0'
-        --   and PLAN_STATE !=8
         group by MATERIAL_NAME
     </select>
 
@@ -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
     </select>
+
+    <select id="fp_selectDeviceStation" resultType="com.ruoyi.system.domain.DeviceStation">
+        select STATION_NO,
+               nvl(FOAMING_PARA_POLPRESSURE,'0')    as pol_yl,
+               nvl(FOAMING_PARA_SOPRESSURE, '0')     as so_yl,
+               nvl(FOAMING_PARA_POLTEMPERATURE, '0') as pol_wd,
+               nvl(FOAMING_PARA_SOTEMPERATURE, '0')  as so_wd
+        from IMOS_PR_FOAMING_STATION
+        order by to_number(STATION_NO);
+    </select>
 </mapper>