修改 铝内胆设备看板

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

@@ -95,12 +95,19 @@ public class AluminumTtankController {
     @GetMapping("/getMaterialStoreJson")
     @ResponseBody
     public String getMesMaterialStoreStatisticsJson(){
-        List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList =
-
-                iMesProductionDataService.getMesMaterialStoreStatisticsList("L001");
+        List<String> list=new ArrayList<String>(2);
+        list.add("L001");
+        list.add("U001");
+        List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList
+        =new ArrayList<>();
+        mesMaterialStoreStatisticsList.addAll(  iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"));
+        mesMaterialStoreStatisticsList.addAll(  iMesProductionDataService.getMesMaterialStoreStatisticsList("U001"));
+//             = iMesProductionDataService.getMesMaterialStoreStatisticsListByList(list);
         return JSONArray.toJSONString(mesMaterialStoreStatisticsList);
     }
 
+
+
     /**
      * 根据型号统计产量
      *

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.productionboard.entity.MesProduction.MesHourProdutionStatistics;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -12,6 +13,7 @@ import java.util.List;
  * @date 2022年06月09日 16:45
  */
 @Mapper
+@Repository
 public interface MesHourProdutionStatisticsMapper extends BaseMapper<MesHourProdutionStatistics> {
 
 }

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

@@ -3,11 +3,13 @@ package com.productionboard.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author WenJY
  * @date 2022年06月09日 17:02
  */
 @Mapper
+@Repository
 public interface MesMaterialProductionStatisticsMapper extends BaseMapper<MesMaterialProductionStatistics> {
 }

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

@@ -3,6 +3,7 @@ package com.productionboard.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * MES物料库存统计
@@ -10,5 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2022年06月09日 17:14
  */
 @Mapper
+@Repository
 public interface MesMaterialStoreStatisticsMapper extends BaseMapper<MesMaterialStoreStatistics>{
 }

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

@@ -3,6 +3,7 @@ package com.productionboard.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.productionboard.entity.MesProduction.MesTeamStatistics;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * Mes班组生产统计
@@ -10,5 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2022年06月09日 16:26
  */
 @Mapper
+@Repository
 public interface MesTeamStatisticsMapper extends BaseMapper<MesTeamStatistics> {
 }

productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java

@@ -51,4 +51,6 @@ public interface IMesProductionDataService {
     List<DeviceFault> selectDeviceFaultByType(String type);
 
     List<PlanInfo> getProductionPlan();
+
+    List<MesMaterialStoreStatistics> getMesMaterialStoreStatisticsListByList(List<String> list);
 }

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

@@ -93,6 +93,14 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService {
         return mesMaterialStoreStatistics;
     }
 
+    @Override
+    public List<MesMaterialStoreStatistics> getMesMaterialStoreStatisticsListByList(List<String> list) {
+         QueryWrapper<MesMaterialStoreStatistics> wrapper = new QueryWrapper<>();
+        wrapper.in("POSIONID",list);
+        List<MesMaterialStoreStatistics> mesMaterialStoreStatistics = materialStoreStatisticsMapper.selectList(wrapper);
+        return mesMaterialStoreStatistics;
+    }
+
     @Override
     public List<DeviceFault> selectDeviceFaultByType(String type) {
         QueryWrapper<DeviceFault> wrapper = new QueryWrapper<>();

productionboard/target/classes/static/css/aluminumLiner/style.css

@@ -1,9 +1,5 @@
 body {
-    background-color: aquamarine;
-    background: url(../../img/aluminumLiner/aluminumLiner.jpg);
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-attachment: fixed;
+    background: aquamarine url(../../img/aluminumLiner/aluminumLiner.jpg) no-repeat fixed center center;
     background-size: 100% 100%;
 }
 
@@ -66,4 +62,7 @@ body {
     top: 44.5%;
     left: 3.5%;
     font-size: 9%;
+}
+.productionPlan .tbody .tr .td:first-child{
+    font-size: 12px;
 }

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

@@ -39,6 +39,7 @@ $(() => {
         dataType: 'JSON',
         success: function (res) {
             let Res = {}
+            console.log(res)
 
             Res.data=res.map(val => {
                 return [val.spe,val.aq,val.oq,val.cha,val.round,]

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

@@ -16,7 +16,7 @@ const horizontalBarChart = (res, ids) => {
     const xValue = res.map(val => val.xValue)
     const yValue = res.map(val => val.yValue)
 
-    //参考：https://www.makeapie.com/editor.html?c=xqjNqqjc_U
+
     let seriesName = "产量";
 
     let attackSourcesColor = [
@@ -54,10 +54,7 @@ const horizontalBarChart = (res, ids) => {
     let stationData = [];
     let values = [];
 
-    // res.forEach(function (it, index) {
-    //     stationData.push(it.station);
-    //     values.push(it.value);
-    // });
+
 
     function dataFormat(data) {
         let arr = [];
@@ -82,7 +79,7 @@ const horizontalBarChart = (res, ids) => {
         },
         grid: {
             top: "9%",
-            left: "-9%",
+            left: "-30%",
             right: "4%",
             bottom: "3%",
             containLabel: true,
@@ -344,7 +341,6 @@ const threeDimensionalCylindrical = (res, ids) => {
     let mycharts = echarts.init(ids);
     const xValue = res.map(val => val.materialName)
     const yValue = res.map(val => val.lineStoreAmount)
-
     let barTopColor = ["#02c3f1"];
     let barBottomColor = [
         "rgba(2,195,241,0.1)",