diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java index 4d9b9c4..fcbe050 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java @@ -95,12 +95,19 @@ public class AluminumTtankController { @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List mesMaterialStoreStatisticsList = - - iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); + List list=new ArrayList(2); + list.add("L001"); + list.add("U001"); + List mesMaterialStoreStatisticsList + =new ArrayList<>(); + mesMaterialStoreStatisticsList.addAll( iMesProductionDataService.getMesMaterialStoreStatisticsList("L001")); + mesMaterialStoreStatisticsList.addAll( iMesProductionDataService.getMesMaterialStoreStatisticsList("U001")); +// = iMesProductionDataService.getMesMaterialStoreStatisticsListByList(list); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } + + /** * 根据型号统计产量 * diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesHourProdutionStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesHourProdutionStatisticsMapper.java index 416cbc7..0ff699b 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesHourProdutionStatisticsMapper.java +++ b/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 { } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java index 7699b9d..7f95d62 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.java +++ b/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 { } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java index 801d9fa..c821cfc 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java +++ b/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{ } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java index f91f26c..57187da 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java +++ b/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 { } diff --git a/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java b/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java index b856ed6..4dd5a41 100644 --- a/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java +++ b/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java @@ -51,4 +51,6 @@ public interface IMesProductionDataService { List selectDeviceFaultByType(String type); List getProductionPlan(); + + List getMesMaterialStoreStatisticsListByList(List list); } diff --git a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java index b487858..dec28ed 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java @@ -93,6 +93,14 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { return mesMaterialStoreStatistics; } + @Override + public List getMesMaterialStoreStatisticsListByList(List list) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.in("POSIONID",list); + List mesMaterialStoreStatistics = materialStoreStatisticsMapper.selectList(wrapper); + return mesMaterialStoreStatistics; + } + @Override public List selectDeviceFaultByType(String type) { QueryWrapper wrapper = new QueryWrapper<>(); diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class index 18b4c8f..e148cac 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class and b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class index 7b483c7..a9b4124 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class index aeba075..f482f63 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class index 35b6a30..a3f5db5 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class index e96c840..e4b5a19 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class index 3b792d2..9f88eb8 100644 Binary files a/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class and b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class index 96926f3..6718f17 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class index 4304f86..f69e746 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/static/css/aluminumLiner/style.css b/productionboard/target/classes/static/css/aluminumLiner/style.css index 2456141..8261de2 100644 --- a/productionboard/target/classes/static/css/aluminumLiner/style.css +++ b/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; } \ No newline at end of file diff --git a/productionboard/target/classes/static/js/aluminumLiner/index.js b/productionboard/target/classes/static/js/aluminumLiner/index.js index debe601..824287d 100644 --- a/productionboard/target/classes/static/js/aluminumLiner/index.js +++ b/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,] diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index 10fb100..8cf5959 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/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)",