From 98556d1f94d4732ce7799305322d65e5eaf1618c Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Tue, 12 Jul 2022 13:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/broad/BoxBroadController.java | 53 ++++++++++--- .../main/resources/templates/broad/box.html | 8 +- .../ruoyi/system/mapper/BroadDataMapper.java | 3 + .../system/service/IBroadDataService.java | 7 +- .../service/impl/BroadDataServiceImpl.java | 10 ++- .../mapper/system/BroadDataMapper.xml | 78 +++++++++++++++---- 6 files changed, 122 insertions(+), 37 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java index f3100bb..2fda6c1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java @@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONPObject; import com.ruoyi.common.core.text.Convert; -import com.ruoyi.system.domain.BoxOutputByType; -import com.ruoyi.system.domain.BoxPlanCompletion; -import com.ruoyi.system.domain.BoxStock; -import com.ruoyi.system.domain.EchartsDTO; +import com.ruoyi.system.domain.*; import com.ruoyi.system.service.IBroadDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -15,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -58,7 +56,7 @@ public class BoxBroadController { return JSONObject.toJSONString(new EchartsDTO(xAxisInfo,seriesInfo)); } - + private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); // 按类型查询产量 @PostMapping("/selectOutputByType") @ResponseBody @@ -69,11 +67,16 @@ public class BoxBroadController { List xAxisInfo = new ArrayList(); List info = service.selectOutputByType(); - Map> orderInfoMap = info.stream().collect(Collectors.groupingBy(BoxOutputByType:: getPlan_type)); +// Map> orderInfoMap = info.stream().collect(Collectors.groupingBy(BoxOutputByType:: getPlan_type)); +// +// for (String key : orderInfoMap.keySet()) { +// xAxisInfo.add(key); +// seriesInfo.add(Convert.toLong(orderInfoMap.get(key).stream().mapToDouble(BoxOutputByType:: getActual_production).sum())); +// } - for (String key : orderInfoMap.keySet()) { - xAxisInfo.add(key); - seriesInfo.add(Convert.toLong(orderInfoMap.get(key).stream().mapToDouble(BoxOutputByType:: getActual_production).sum())); + for (BoxOutputByType byType:info ) { + xAxisInfo.add(byType.getPlan_type()); + seriesInfo.add(Long.valueOf(byType.getActual_production())); } echarts.setSeriesInfo(seriesInfo); @@ -86,7 +89,39 @@ public class BoxBroadController { } + @PostMapping("/getProductPlanInfo") + @ResponseBody + public String getProductPlanInfo(){ + List> planInfoList = new ArrayList>(); + List planInfo = service.getUHullPlanInfo(); + planInfo.forEach(x->{ + planInfoList.add( + new ArrayList() { + { + this.add(x.getOrderType()); + this.add(x.getPlannedProduction()); + this.add(x.getActualProduction()); + this.add(x.getPlannedProduction()-x.getActualProduction()); + if(x.getPlannedProduction() == 0 || x.getActualProduction() ==0){ + this.add("0%"); + }else { + this.add(((double)x.getActualProduction()/(double)x.getPlannedProduction()*100)+"%"); + } + if (x.getEndTime() != null) { + this.add(dateFormat.format(x.getEndTime())); + } else { + this.add("-"); + } + } + }); + }); + + String jsonInfo = JSONArray.toJSONString(planInfoList); + + System.out.println("MES生产计划信息查询："+jsonInfo); + return jsonInfo; + } } diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 52287ff..d023585 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -351,7 +351,7 @@ const planWorkOrderTable = new AutoScrollTable(document.getElementById("plan-work-order"), planWorkOrderColumns, {width: ['30%', null, null, null, '17%']}) const planTable = new AutoScrollTable(document.getElementById("plan-table"), [], { width: ['15%', '5%', null, null, null, null, null, null, null, null, null, null, null, null, null, null, "5%", "5%", "5%"], - // caption: "生产计划统计", + caption: "生产计划统计", }) const inventoryInfoDataMerger = new DataMerger({ @@ -376,12 +376,12 @@ }) } - const rowName1 = '箱体壳' - const rowName2 = '内胆库' + const rowName1 = '内胆积存库' + const rowName2 = '围板积存库' var url='/broad/box' $(() => { //生产计划工单 - // autoUpdate('/broad/box/order ', INTERVAL, data => { + // autoUpdate(url+"/getProductPlanInfo ', INTERVAL, data => { // planWorkOrderTable.loadData(data.map(value => [value[0], value[1], value[2], value[3], value[5]]), Object.keys(planWorkOrderColumns)) // }) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index 9d86480..7ec1e5a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -5,6 +5,7 @@ import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.system.domain.BoxOutputByType; import com.ruoyi.system.domain.BoxPlanCompletion; import com.ruoyi.system.domain.BoxStock; +import com.ruoyi.system.domain.OrderInfo; import org.springframework.stereotype.Repository; import javax.swing.*; @@ -21,4 +22,6 @@ public interface BroadDataMapper { List selectStock(String id); List selectOutputByType(); + + List getUHullPlanInfo(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index 289a651..84401c4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -1,9 +1,6 @@ package com.ruoyi.system.service; -import com.ruoyi.system.domain.BoxOutputByType; -import com.ruoyi.system.domain.BoxPlanCompletion; -import com.ruoyi.system.domain.BoxStock; -import com.ruoyi.system.domain.SysOperLog; +import com.ruoyi.system.domain.*; import java.util.List; @@ -19,4 +16,6 @@ public interface IBroadDataService { List selectStock(String id); List selectOutputByType(); + + List getUHullPlanInfo(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index 2edf0de..52ebd2d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -8,10 +8,7 @@ import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.CacheUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.BoxOutputByType; -import com.ruoyi.system.domain.BoxPlanCompletion; -import com.ruoyi.system.domain.BoxStock; -import com.ruoyi.system.domain.SysConfig; +import com.ruoyi.system.domain.*; import com.ruoyi.system.mapper.BroadDataMapper; import com.ruoyi.system.mapper.SysConfigMapper; import com.ruoyi.system.service.IBroadDataService; @@ -49,4 +46,9 @@ public class BroadDataServiceImpl implements IBroadDataService public List selectOutputByType() { return mapper.selectOutputByType(); } + + @Override + public List getUHullPlanInfo() { + return mapper.getUHullPlanInfo(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 287b9a6..7d128e9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -26,30 +26,76 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + \ No newline at end of file