Merge remote-tracking branch 'origin/master'

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

@@ -53,7 +53,7 @@ public class AdsorptionTankController {
             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());
@@ -109,51 +109,51 @@ public class AdsorptionTankController {
      * @date 2022/4/20 10:15
      * @return java.lang.String
      */
-    @GetMapping("/getStatisticalOutputByModel")
-    @ResponseBody
-    public String getStatisticalOutputByModel() {
-        String info =
-                "{\n"
-                        + "\t\"datas\":[\n"
-                        + "        {\"ranking\": 1,\"station\":\"SC227\",\"value\": 199999},\n"
-                        + "        {\"ranking\": 2,\"station\":\"SC228\",\"value\": 104970},\n"
-                        + "        {\"ranking\": 3,\"station\":\"SC229\",\"value\": 29034},\n"
-                        + "        {\"ranking\": 4,\"station\":\"SC223\",\"value\": 23489},\n"
-                        + "        {\"ranking\": 5,\"station\":\"SC224\",\"value\": 18203}\n"
-                        + "    ],\n"
-                        + "\t\"plan\":[290000, 290000, 290000, 290000, 290000, 290000]\n"
-                        + "}";
-        return info;
-    }
-
-    /**
-     * 库存 统计
-     *
-     * @author WenJY
-     * @date 2022/4/20 10:16
-     * @return java.lang.String
-     */
-    @GetMapping("/getInventoryStatistics")
-    @ResponseBody
-    public String getInventoryStatistics() {
-        String info =
-                "{\n"
-                        + "\t\"datas\":[\n"
-                        + "        {\n"
-                        + "            \"name\": \"SC528\",\n"
-                        + "            \"value\": 175.17\n"
-                        + "        },\n"
-                        + "        {\n"
-                        + "            \"name\": \"SC529\",\n"
-                        + "            \"value\": 148.35\n"
-                        + "        },\n"
-                        + "        {\n"
-                        + "            \"name\": \"SC327\",\n"
-                        + "            \"value\": 95.36\n"
-                        + "        }\n"
-                        + "    ]\n"
-                        + "}";
-        return info;
-    }
+//    @GetMapping("/getStatisticalOutputByModel")
+//    @ResponseBody
+//    public String getStatisticalOutputByModel() {
+//        String info =
+//                "{\n"
+//                        + "\t\"datas\":[\n"
+//                        + "        {\"ranking\": 1,\"station\":\"SC227\",\"value\": 199999},\n"
+//                        + "        {\"ranking\": 2,\"station\":\"SC228\",\"value\": 104970},\n"
+//                        + "        {\"ranking\": 3,\"station\":\"SC229\",\"value\": 29034},\n"
+//                        + "        {\"ranking\": 4,\"station\":\"SC223\",\"value\": 23489},\n"
+//                        + "        {\"ranking\": 5,\"station\":\"SC224\",\"value\": 18203}\n"
+//                        + "    ],\n"
+//                        + "\t\"plan\":[290000, 290000, 290000, 290000, 290000, 290000]\n"
+//                        + "}";
+//        return info;
+//    }
+//
+//    /**
+//     * 库存 统计
+//     *
+//     * @author WenJY
+//     * @date 2022/4/20 10:16
+//     * @return java.lang.String
+//     */
+//    @GetMapping("/getInventoryStatistics")
+//    @ResponseBody
+//    public String getInventoryStatistics() {
+//        String info =
+//                "{\n"
+//                        + "\t\"datas\":[\n"
+//                        + "        {\n"
+//                        + "            \"name\": \"SC528\",\n"
+//                        + "            \"value\": 175.17\n"
+//                        + "        },\n"
+//                        + "        {\n"
+//                        + "            \"name\": \"SC529\",\n"
+//                        + "            \"value\": 148.35\n"
+//                        + "        },\n"
+//                        + "        {\n"
+//                        + "            \"name\": \"SC327\",\n"
+//                        + "            \"value\": 95.36\n"
+//                        + "        }\n"
+//                        + "    ]\n"
+//                        + "}";
+//        return info;
+//    }
 
 }

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

@@ -17,6 +17,7 @@ import java.util.List;
 
 /**
  * 铝内胆可视化看板
+ *
  * @author WenJY
  * @date 2022年04月20日 14:40
  */
@@ -30,22 +31,22 @@ public class AluminumTtankController {
     private String prefix = "aluminumTank/index";
 
     @GetMapping()
-    public String index()
-    {
+    public String index() {
         return prefix;
     }
 
     /**
      * 班组统计
+     *
+     * @return java.lang.String
      * @author WenJY
      * @date 2022-06-09 16:38
-     * @return java.lang.String
      */
     @GetMapping("/getTeamStatisticsJson")
     @ResponseBody
-    public String getTeamStatisticsJson(){
+    public String getTeamStatisticsJson() {
         List<MesTeamStatistics> mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1006");
-        if(mesTeamStatisticsList.size()>0){
+        if (mesTeamStatisticsList.size() > 0) {
             return JSONArray.toJSONString(mesTeamStatisticsList.get(0));
         }
         return JSONArray.toJSONString(new MesTeamStatistics());
@@ -53,16 +54,17 @@ public class AluminumTtankController {
 
     /**
      * 通过工位号获取MES小时产量
+     *
+     * @return java.lang.String
      * @author WenJY
      * @date 2022-06-09 16:54
-     * @return java.lang.String
      */
     @GetMapping("/getHourProdutionJson")
     @ResponseBody
-    public String getHourProdutionStatisticsJson(){
+    public String getHourProdutionStatisticsJson() {
         List<MesHourProdutionStatistics> mesHourProdutionStatisticsList =
                 iMesProductionDataService.getMesHourProdutionStatisticsList("1006");
-        if(mesHourProdutionStatisticsList.size()>0){
+        if (mesHourProdutionStatisticsList.size() > 0) {
             return JSONArray.toJSONString(mesHourProdutionStatisticsList);
         }
         return JSONArray.toJSONString(new ArrayList<MesHourProdutionStatistics>());
@@ -70,13 +72,14 @@ public class AluminumTtankController {
 
     /**
      * 通过工位号获取MES物料产量
+     *
+     * @return java.lang.String
      * @author WenJY
      * @date 2022-06-09 17:06
-     * @return java.lang.String
      */
     @GetMapping("/getMaterialProdutionJson")
     @ResponseBody
-    public String getMaterialProdutionStatisticsJson(){
+    public String getMaterialProdutionStatisticsJson() {
 
         List<MesMaterialProductionStatistics> mesMaterialProductionStatisticsList =
                 iMesProductionDataService.getMesMaterialProductionStatisticsList("1006");
@@ -86,34 +89,28 @@ public class AluminumTtankController {
 
     /**
      * 获取MES物料库存
-     * @author WenJY
-     * @date 2022-06-09 17:18
+     *
      * @return java.lang.String
      * L001  内胆库存
      * U001  箱壳库存
+     * @author WenJY
+     * @date 2022-06-09 17:18
      */
     @GetMapping("/getMaterialStoreJson")
     @ResponseBody
-    public String getMesMaterialStoreStatisticsJson(){
-        List<String> list=new ArrayList<String>(2);
-        list.add("L001");
-        list.add("U001");
+    public String getMesMaterialStoreStatisticsJson() {
         List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList
-        =new ArrayList<>();
-        mesMaterialStoreStatisticsList.addAll(  iMesProductionDataService.getMesMaterialStoreStatisticsList("1006"));
-//        mesMaterialStoreStatisticsList.addAll(  iMesProductionDataService.getMesMaterialStoreStatisticsList("U001"));
-//             = iMesProductionDataService.getMesMaterialStoreStatisticsListByList(list);
+                = iMesProductionDataService.getMesMaterialStoreStatisticsList("1006");
         return JSONArray.toJSONString(mesMaterialStoreStatisticsList);
     }
 
 
-
     /**
      * 根据型号统计产量
      *
+     * @return java.lang.String
      * @author WenJY
      * @date 2022/4/20 10:15
-     * @return java.lang.String
      */
     @GetMapping("/getStatisticalOutputByModel")
     @ResponseBody
@@ -135,9 +132,9 @@ public class AluminumTtankController {
     /**
      * 库存 统计
      *
+     * @return java.lang.String
      * @author WenJY
      * @date 2022/4/20 10:16
-     * @return java.lang.String
      */
     @GetMapping("/getInventoryStatistics")
     @ResponseBody

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

@@ -1,7 +1,8 @@
 $(()=>{
     //班组统计
     $.getJSON('/aluminumTank/getTeamStatisticsJson', function (result) {
-        storageStatistics(result.className, result.planAmount, result.actualAmount, result.differenceAmount,)
+        console.log(result.planAmount+' 数据'+ result.actualAmount, result.differenceAmount)
+        storageStatistics('白班', result.planAmount, result.actualAmount, result.differenceAmount,)
     });
 
     //按型号统计产量

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

@@ -39,13 +39,11 @@ $(() => {
         dataType: 'JSON',
         success: function (res) {
             let Res = {}
-            console.log(res)
 
             Res.data=res.map(val => {
                 return [val.spe,val.oq,val.aq,val.cha,val.round,]
             })
             Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度']
-            console.log(Res)
             dynamicTable({
                 el: '#productionPlan',
                 rowNum: 5,
@@ -62,7 +60,6 @@ $(() => {
             });
         },
         error: function (e) {
-            console.log(e)
         }
     });
     tableAnimation('#productionPlan')

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

@@ -1,7 +1,8 @@
 $(()=>{
     //班组统计
     $.getJSON('/aluminumTank/getTeamStatisticsJson', function (result) {
-        storageStatistics(result.className, result.planAmount, result.actualAmount, result.differenceAmount,)
+        console.log(result.planAmount+' 数据'+ result.actualAmount, result.differenceAmount)
+        storageStatistics('白班', result.planAmount, result.actualAmount, result.differenceAmount,)
     });
 
     //按型号统计产量
@@ -16,6 +17,7 @@ $(()=>{
 
     //库存统计
     $.getJSON('/aluminumTank/getMaterialStoreJson', function (result) {
+        console.log(result)
         multipleThreeDimensionalCylindrical(result,document.getElementById("inventoryStatistics"));
     });
 })

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

@@ -55,7 +55,6 @@ const horizontalBarChart = (res, ids) => {
     let values = [];
 
 
-
     function dataFormat(data) {
         let arr = [];
         data.forEach(function (item, i) {
@@ -174,10 +173,9 @@ const horizontalBarChart = (res, ids) => {
                     fontSize: 12,
                     color: "#A8A6AB",
                     textBorderWidth: 2,
-                    position:'insideTopLeft',
+                    position: 'insideTopLeft',
                     padding: [-20, 0, 0, 0],
-                    formatter:function (params) {
-                        console.log(dataFormat(xValue)[params[`dataIndex`]])
+                    formatter: function (params) {
                         return dataFormat(xValue)[params[`dataIndex`]].value
                     }
                 },
@@ -566,7 +564,6 @@ const threeDimensionalCylindrical = (res, ids) => {
 //多个折线面积图
 const multipleBrokenLineAreaDiagram = (res, ids) => {
     let mycharts = echarts.init(ids);
-    console.log(res);
 
     let option = {
         tooltip: {
@@ -1172,15 +1169,15 @@ const bluePolygonHistogram = (res, ids) => {
 //多个立体柱状图
 const multipleThreeDimensionalCylindrical = (res, ids) => {
     let mycharts = echarts.init(ids);
-    const xValue = res.map(val => val.materialName)
-    const lineStoreAmount = res.map(val => val.lineStoreAmount)
-    const hullStoreAmount = res.map(val => val.hullStoreAmount)
+    const xValue = res.map(val => val.materialName?.split(',')[0] || ' ')
+    const lineStoreAmount = res.map(val => val.lineStoreAmount) || []
+    const hullStoreAmount = res.map(val => val.hullStoreAmount || '0')
     let lineColor = "#406A92";
     let labelColor = "#fff";
     let fontSize = "12";
     let lineWidth = 1;
     let isDataZoom = xValue.length > 3
-    let stepSize = 20
+    let stepSize = 1 / (xValue.length / 3) * 100
     // hullStoreAmount.forEach((val, index) => {
     //     if (val == 0) {
     //         hullStoreAmount[index] = 0
@@ -1228,6 +1225,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => {
                     lineHeight: 20,
                 },
                 axisLabel: {
+                    interval:0,
                     color: labelColor,
                     fontSize: fontSize,
                     margin: 30,
@@ -1519,7 +1517,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => {
     };
     if (isDataZoom) {
         option.dataZoom.push({
-            show:false,
+            show: false,
             type: 'slider',
             start: 0,
             end: stepSize,
@@ -1710,8 +1708,9 @@ const inventory = (res, ids) => {
     let barBottomColor = [
         "rgba(2,195,241,0.1)",
     ];
-    const xAxisData = res.map(val => val.materialName)
+    const xAxisData = res.map(val => val.materialName?.split(',')[0] )
     const seriesData1 = res.map(val => val.lineStoreAmount)
+    console.log(xAxisData,seriesData1)
     // Res.forEach((item) => {
     //     xAxisData.push(item.name);
     //     seriesData1.push(item.value);
@@ -2378,8 +2377,8 @@ const energyConsumption = (res, ids) => {
                         return value + ' °C';
                     }
                 },
-                lineStyle:{
-                    color:'#45b685'
+                lineStyle: {
+                    color: '#45b685'
                 },
                 data: yAxisDataTwo,
             },

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

@@ -213,7 +213,6 @@ let dynamicTable = resource => {
 	} else {
 		for (let i = 0; i < colWidth.length; i++) {
 			let emptyUnitColWidth = emptyUnit(colWidth[i]);
-			console.log(emptyUnitColWidth)
 			$(`${ele}>.table>.thead>.tr>.th:nth-child(${i+1})`).width(`${emptyUnitColWidth}%`);
 			$(`${ele}>.table>.tbody>.tr>.td:nth-child(${i+1})`).width(`${emptyUnitColWidth}%`);
 		}

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

@@ -13,7 +13,6 @@ const dataInformationFunction = (statusArray) => {
     $("#dataInformation").append(info);
 }
 const synthetic = (statusArray,param={a:0,b:0}) => {
-    console.log(statusArray);
     let info = `<table style="position: absolute;top: 9%;left: 30%;width: 40%;height:7%;">
     <tr style="width: 100%; height: 50%;">
         <td style="border:0px solid red;font-size:175%;text-align:center;width: 23%;color: #59B2F6;">${statusArray[0] || 0}</td>