Merge remote-tracking branch 'origin/master'

productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java

@@ -131,7 +131,7 @@ public class AluminumLinerkController {
     @GetMapping("/getStatisticalOutputByModel")
     @ResponseBody
     public String getStatisticalOutputByModel() {
-        List<DeviceFault> list=iMesProductionDataService.selectDeviceFaultByType("1#内胆吸附机");
+        List<DeviceFault> list=iMesProductionDataService.selectDeviceFaultByType("1005");
         return JSONArray.toJSONString(list);
     }
 

productionboard/src/main/java/com/productionboard/controller/PreassembleController.java

@@ -50,7 +50,7 @@ public class PreassembleController {
             mesTeamStatistics.setClassName("白班");
             int planAmount = Integer.parseInt(mesTeamStatistics.getPlanAmount() == null ? "0" : mesTeamStatistics.getPlanAmount());
             int  actualAmount= Integer.parseInt(mesTeamStatistics.getActualAmount() == null ? "0" : mesTeamStatistics.getActualAmount());
-            mesTeamStatistics.setDifferenceAmount((planAmount - actualAmount)+"");
+            mesTeamStatistics.setDifferenceAmount(Math.abs(planAmount - actualAmount)+"");
             return JSONArray.toJSONString(mesTeamStatistics);
         }
         return JSONArray.toJSONString(new MesTeamStatistics());

productionboard/src/main/java/com/productionboard/controller/TankShellController.java

@@ -32,7 +32,15 @@ public class TankShellController {
   public String index() {
     return prefix;
   }
-
+/**
+ * 工位号9.30前记录为
+ * 1001   	吸附内胆生产
+ * 1003 	铝内胆生产
+ * 1004 吸附内胆预装北
+ *  1005 铝内胆预装
+ *  Proce_Code =1029  发泡前出库南线
+ * Proce_Code =1012  发泡前出库北线
+ */
   /**
    * 班组统计
    * @author WenJY
@@ -90,9 +98,9 @@ public class TankShellController {
   @GetMapping("/getMaterialStoreJson")
   @ResponseBody
   public String getMesMaterialStoreStatisticsJson(){
-    List<String> list=new ArrayList<String>(2);
-    list.add("L001");
-    list.add("U001");
+//    List<String> list=new ArrayList<String>(2);
+//    list.add("L001");
+//    list.add("U001");
 //    List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList= iMesProductionDataService.getMesMaterialStoreStatisticsListByList(list);
     List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList= iMesProductionDataService.getMesMaterialStoreStatisticsList("1009");
     return JSONArray.toJSONString(mesMaterialStoreStatisticsList);

productionboard/src/main/java/com/productionboard/entity/MesProduction/DeviceFault.java

@@ -28,8 +28,9 @@ public class DeviceFault implements Serializable {
     private String value;
 
     /** 类型 */
-    @TableField("TYPE")
+    @TableField("NAME")
     private String hullStoreAmount;
+    private String name;
 
 
 }

productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java

@@ -1,6 +1,7 @@
 package com.productionboard.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.productionboard.entity.MesProduction.DeviceFault;
 import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics;
 import com.productionboard.entity.MesProduction.MesTeamStatistics;
 import org.apache.ibatis.annotations.Mapper;
@@ -67,5 +68,8 @@ public interface MesMaterialStoreStatisticsMapper extends BaseMapper<MesMaterial
      * @return
      */
     @Select("select materialName,LINERSTOREAMOUNT as lineStoreAmount,hullStoreAmount from table ( scada_absorb_kctj2(#{in_id}) )")
+
     List<MesMaterialStoreStatistics> getAdsorptionTankStoreStatistics4(@Param("in_id") Integer in_id);
+    @Select("select * from table ( scada_adsorb_fault(#{in_id})  )")
+    List<DeviceFault> selectDeviceFaultByType1005(int in_id);
 }

productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java

@@ -180,7 +180,10 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService {
                 mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics6(this.in_id);
                 break;
             case "1009":
-                mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics9(this.in_id);
+//                mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics9(this.in_id);
+
+//wh                跟铝内胆生产数据监控 看板查一样的两个仓库
+                mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics6(this.in_id);
                 break;
             case "1010":
                 mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics10(this.in_id);
@@ -202,9 +205,7 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService {
 
     @Override
     public List<DeviceFault> selectDeviceFaultByType(String type) {
-        QueryWrapper<DeviceFault> wrapper = new QueryWrapper<>();
-        wrapper.eq("TYPE",type);
-        return deviceFaultMapper.selectScadaAdsorbFault(this.in_id);
+        return materialStoreStatisticsMapper.selectDeviceFaultByType1005(this.in_id);
     }
 
     @Override

productionboard/src/main/resources/static/js/common/echarts.common.js

@@ -2151,7 +2151,7 @@ const equipmentFailure = (res, ids) => {
 
     res.forEach(function (it, index) {
 
-        stationData.push(it.station);
+        stationData.push(it.name);
         values.push(it.value);
     });
     let option = {

productionboard/src/main/resources/static/js/foamBox/index.js

@@ -2,7 +2,7 @@ $(() => {
 
     //班组计划统计
     $.getJSON(`/foamBox/getTeamStatisticsJson?ids=${ids}`, function (result) {
-        onDutyPlan(result.planAmount, result.actualAmount, result.differenceAmount,)
+        onDutyPlan(result.planAmount, result.actualAmount, result.planAmount- result.actualAmount)
     });
 
     //设备运行状态

productionboard/src/main/resources/static/js/tankShell/index.js

@@ -2,7 +2,7 @@ $(()=>{
     //班组统计
     // onDutyPlan(1234,1202,33);
     $.getJSON('/tankShell/getTeamStatisticsJson', function (result) {
-        storageStatistics(result.className, result.planAmount, result.actualAmount, result.differenceAmount,)
+        storageStatistics('白班', result.planAmount, result.actualAmount, result.differenceAmount,)
     });
 
     //按型号统计产量

productionboard/target/classes/static/js/common/echarts.common.js

@@ -365,7 +365,7 @@ const threeDimensionalCylindrical = (res, ids) => {
             axisLabel: {
                 show: true,
                 margin: 25,
-                align: "center",
+                // align: "center",
                 textStyle: {
                     fontSize: 14,
                     color: "#A8A6AB",
@@ -382,7 +382,7 @@ const threeDimensionalCylindrical = (res, ids) => {
                     },
                 },
             },
-            interval: 0,
+            interval: 3,
         },
         yAxis: {
             splitLine: {
@@ -1169,9 +1169,22 @@ const bluePolygonHistogram = (res, ids) => {
 //多个立体柱状图
 const multipleThreeDimensionalCylindrical = (res, ids) => {
     let mycharts = echarts.init(ids);
-    const xValue = res.map(val => val.materialName?.split(',')[0] || ' ')
-    const lineStoreAmount = res.map(val => val.lineStoreAmount) || []
-    const hullStoreAmount = res.map(val => val.hullStoreAmount || '0')
+    const value = []
+    res.forEach(e=>{
+        if(!(value.includes(e.materialName))){
+            value.push(e.materialName)
+        }
+    })
+    const data = value.map(e => {
+        return {
+            materialName:e,
+            lineStoreAmount:res.filter( val => val.materialName === e).filter(val => val.hullStoreAmount === 'L001')?.[0]?.lineStoreAmount || 0,
+            hullStoreAmount:res.filter( val => val.materialName === e).filter(val => val.hullStoreAmount === 'U001')?.[0]?.lineStoreAmount || 0
+        }
+    })
+    const xValue = data.map(val => val.materialName)
+    const lineStoreAmount = data.map(val => val.lineStoreAmount)
+    const hullStoreAmount = data.map(val => val.hullStoreAmount)
     let lineColor = "#406A92";
     let labelColor = "#fff";
     let fontSize = "12";
@@ -2138,7 +2151,7 @@ const equipmentFailure = (res, ids) => {
 
     res.forEach(function (it, index) {
 
-        stationData.push(it.station);
+        stationData.push(it.name);
         values.push(it.value);
     });
     let option = {

productionboard/target/classes/static/js/foamBox/index.js

@@ -2,7 +2,7 @@ $(() => {
 
     //班组计划统计
     $.getJSON(`/foamBox/getTeamStatisticsJson?ids=${ids}`, function (result) {
-        onDutyPlan(result.planAmount, result.actualAmount, result.differenceAmount,)
+        onDutyPlan(result.planAmount, result.actualAmount, result.planAmount- result.actualAmount)
     });
 
     //设备运行状态

productionboard/target/classes/static/js/tankShell/index.js

@@ -2,7 +2,7 @@ $(()=>{
     //班组统计
     // onDutyPlan(1234,1202,33);
     $.getJSON('/tankShell/getTeamStatisticsJson', function (result) {
-        storageStatistics(result.className, result.planAmount, result.actualAmount, result.differenceAmount,)
+        storageStatistics('白班', result.planAmount, result.actualAmount, result.differenceAmount,)
     });
 
     //按型号统计产量