From 91606b8a3d83895fa98ed49ed7801ff76e85d73c Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 30 Aug 2024 17:10:24 +0800 Subject: [PATCH] 2024-08-15 --- .../MesInspectionReportController.java | 13 +- .../op/mes/domain/MesInspectionReport.java | 24 ++- .../mes/mapper/MesInspectionReportMapper.java | 6 +- .../service/IMesInspectionReportService.java | 5 +- .../impl/MesInspectionReportServiceImpl.java | 168 ++++++++++++++++++ .../mapper/mes/MesInspectionReportMapper.xml | 52 +++++- 6 files changed, 256 insertions(+), 12 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesInspectionReportController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesInspectionReportController.java index 4f5a0d44..b7078cb7 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesInspectionReportController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesInspectionReportController.java @@ -1,8 +1,6 @@ package com.op.mes.controller; import com.op.common.core.web.controller.BaseController; -import com.op.common.core.web.domain.AjaxResult; -import com.op.common.core.web.page.TableDataInfo; import com.op.mes.domain.MesInspectionReport; import com.op.mes.service.IMesInspectionReportService; import org.springframework.beans.factory.annotation.Autowired; @@ -48,4 +46,15 @@ public class MesInspectionReportController extends BaseController { return iMesInspectionReportService.selectFirstInspectionRightList(mesInspectionReport); } + //点检记录 + @GetMapping("/listPointInspection") + public List listPointInspection(MesInspectionReport mesInspectionReport) { + return iMesInspectionReportService.selectPointInspectionList(mesInspectionReport); + } + + //点检记录 + @GetMapping("/listCheckBox") + public List listCheckBox(MesInspectionReport mesInspectionReport) { + return iMesInspectionReportService.selectCheckBoxList(mesInspectionReport); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java index b29a4aea..891a61ff 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java @@ -3,9 +3,6 @@ package com.op.mes.domain; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; -import java.util.HashMap; -import java.util.Map; - //MES自检互检 public class MesInspectionReport extends BaseEntity { private static final long serialVersionUID = 1L; @@ -68,6 +65,16 @@ public class MesInspectionReport extends BaseEntity { //设备名称 private String equipmentName; + //项目名 + private String projectName; + + //开线 + private String openLine; + //清换线 + private String clearLine; + //班组 + private String team; + //动态增加字段 // private Map dynamicTime; // @@ -132,4 +139,15 @@ public class MesInspectionReport extends BaseEntity { public void setEquipmentName(String equipmentName) { this.equipmentName = equipmentName; } public String getEquipmentName() { return equipmentName; } + public void setProjectName(String projectName) { this.projectName = projectName; } + public String getProjectName() { return projectName; } + + public void setOpenLine(String openLine) { this.openLine = openLine; } + public String getOpenLine() { return openLine; } + + public void setClearLine(String clearLine) { this.clearLine = clearLine; } + public String getClearLine() { return clearLine; } + + public void setTeam(String team) { this.team = team; } + public String getTeam() { return team; } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesInspectionReportMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesInspectionReportMapper.java index 134b64af..c2cb67c8 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesInspectionReportMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesInspectionReportMapper.java @@ -1,6 +1,5 @@ package com.op.mes.mapper; -import com.op.common.core.web.domain.AjaxResult; import com.op.mes.domain.MesInspectionReport; import java.util.List; @@ -11,4 +10,9 @@ public interface MesInspectionReportMapper { List selectTimeArray(MesInspectionReport mesInspectionReport);//查询所有时间 MesInspectionReport selectSelfMutualInspectionData(MesInspectionReport mesInspectionReport); List getLineCodeList(); + + List selectPointInspectionProjectList(String param);//点检项目 + List selectTeamArray(MesInspectionReport mesInspectionReport);//班组 + + List selectCheckBoxList(MesInspectionReport mesInspectionReport); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesInspectionReportService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesInspectionReportService.java index a27bec23..0f294218 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesInspectionReportService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesInspectionReportService.java @@ -1,6 +1,5 @@ package com.op.mes.service; -import com.op.common.core.web.domain.AjaxResult; import com.op.mes.domain.MesInspectionReport; import java.util.List; @@ -15,4 +14,8 @@ public interface IMesInspectionReportService { List selectFirstInspectionRightList(MesInspectionReport mesInspectionReport);//首检右报表 List selectFirstInspectionLeftList(MesInspectionReport mesInspectionReport);//首检左报表 + + List selectPointInspectionList(MesInspectionReport mesInspectionReport);//产品转换/完产清线点检表 + + List selectCheckBoxList(MesInspectionReport mesInspectionReport);//点检上方备选框 } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java index fbcb03bd..cbd99594 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java @@ -227,4 +227,172 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi return listDTO; } + @Override + @DS("#header.poolName") + public List selectPointInspectionList(MesInspectionReport mesInspectionReport) { + //1.报表名 + mesInspectionReport.setReportName("CheckReport"); + List list = mesInspectionReportMapper.selectSelfMutualInspectionList(mesInspectionReport); + String param = "finished_production_check"; + //查询点检项目 点检内容 + List projectList = mesInspectionReportMapper.selectPointInspectionProjectList(param); + + List teamArray = mesInspectionReportMapper.selectTeamArray(mesInspectionReport); + List listDTO = new ArrayList<>(); + + for(MesInspectionReport project : projectList){ + Map dynamicRow = new LinkedHashMap<>(); + dynamicRow.put("序号",project.getTableLine() + ""); + dynamicRow.put("点检项目",project.getProjectName()); + dynamicRow.put("点检内容",project.getInfoName()); + if(CollectionUtils.isEmpty(teamArray)){ + dynamicRow.put("", ""); + dynamicRow.put(" ", ""); + dynamicRow.put(" ", ""); + dynamicRow.put(" ", ""); + dynamicRow.put(" ", ""); + dynamicRow.put(" ", ""); + }else{ + for(String team : teamArray){ + List result = list.stream() + .filter(MesInspectionReport -> MesInspectionReport.getRemark().equals(team)) // 条件1：符合班组 + .filter(MesInspectionReport-> MesInspectionReport.getInfoName().equals(project.getInfoName())) // 条件2：符合当前项目内容 + .collect(Collectors.toList()); // 收集结果 + if(!CollectionUtils.isEmpty(result)){ + if(StringUtils.isNotBlank(result.get(0).getCheckResult())){ + dynamicRow.put(team, result.get(0).getCheckResult()); + }else{ + dynamicRow.put(team, ""); + } + }else{ + dynamicRow.put(team, ""); + } + } + } + + if(teamArray.size() < 6){ + for(int i = 0 ; i < 6-(teamArray.size()) ; i++){ + if(i == 0){ + dynamicRow.put("", ""); + }else if(i == 1){ + dynamicRow.put(" ", ""); + }else if(i == 2){ + dynamicRow.put(" ", ""); + }else if(i == 3){ + dynamicRow.put(" ", ""); + }else if(i == 4){ + dynamicRow.put(" ", ""); + }else if(i == 5){ + dynamicRow.put(" ", ""); + } + + } + } + + String s = JSON.toJSONString(dynamicRow); + JSONObject object = JSONObject.parseObject(s, Feature.OrderedField); + log.info("点检动态添加属性： = {}",object); + listDTO.add(object); + } + log.info("点检动态添加属性： = {}", JSON.toJSONString(listDTO)); + return listDTO; + } + + //点检上半部分数据 + @Override + @DS("#header.poolName") + public List selectCheckBoxList(MesInspectionReport mesInspectionReport) { + List listDTO = new ArrayList<>(); + //1.报表名 + mesInspectionReport.setReportName("CheckReport"); + List lists = mesInspectionReportMapper.selectCheckBoxList(mesInspectionReport); + + Map> dynamicRow1 = new LinkedHashMap<>(); + Map dynamicRow2 = new LinkedHashMap<>(); + String str = "str"; + int i = 0; + for(MesInspectionReport list :lists){ + Map dynamicRow10 = new LinkedHashMap<>(); + if(list.getBz().equals("1")){ + dynamicRow10.put("openLine",Boolean.TRUE); + dynamicRow10.put("clearLine",Boolean.FALSE); + dynamicRow1.put(str + i + "",dynamicRow10); + }else{ + dynamicRow10.put("clearLine",Boolean.TRUE); + dynamicRow10.put("openLine",Boolean.FALSE); + dynamicRow1.put(str + i + "",dynamicRow10); + } + + dynamicRow2.put(str + i + "","班组:" + list.getRemark()); + i++; + } + if(lists == null){ + Map dynamicRow10 = new LinkedHashMap<>(); + dynamicRow10.put("openLine",Boolean.FALSE); + dynamicRow10.put("clearLine",Boolean.FALSE); + dynamicRow1.put(str + 0 + "", dynamicRow10); + dynamicRow1.put(str + 1 + "", dynamicRow10); + dynamicRow1.put(str + 2 + "", dynamicRow10); + dynamicRow1.put(str + 3 + "", dynamicRow10); + dynamicRow1.put(str + 4 + "", dynamicRow10); + dynamicRow1.put(str + 5 + "", dynamicRow10); + + dynamicRow2.put(str + 0 + "", "班组:"); + dynamicRow2.put(str + 1 + "", "班组:"); + dynamicRow2.put(str + 2 + "", "班组:"); + dynamicRow2.put(str + 3 + "", "班组:"); + dynamicRow2.put(str + 4 + "", "班组:"); + dynamicRow2.put(str + 5 + "", "班组:"); + } + + if(dynamicRow1.size() < 6){ + for(int j = 0 ; j < 6-(lists.size()) ; j++){ + Map dynamicRow10 = new LinkedHashMap<>(); + dynamicRow10.put("openLine",Boolean.FALSE); + dynamicRow10.put("clearLine",Boolean.FALSE); + if(j == 0){ + dynamicRow1.put(str + 5 +"", dynamicRow10); + }else if(j == 1){ + dynamicRow1.put(str + 4 +"", dynamicRow10); + }else if(j == 2){ + dynamicRow1.put(str + 3 +"", dynamicRow10); + }else if(j == 3){ + dynamicRow1.put(str + 2 +"", dynamicRow10); + }else if(j == 4){ + dynamicRow1.put(str + 1 +"", dynamicRow10); + }else if(j == 5){ + dynamicRow1.put(str + 0 +"", dynamicRow10); + } + } + } + + if(dynamicRow2.size() < 6){ + for(int j = 0 ; j < 6-(lists.size()) ; j++){ + if(j == 0){ + dynamicRow2.put(str + 5 +"", "班组:"); + }else if(j == 1){ + dynamicRow2.put(str + 4 +"", "班组:"); + }else if(j == 2){ + dynamicRow2.put(str + 3 +"", "班组:"); + }else if(j == 3){ + dynamicRow2.put(str + 2 +"", "班组:"); + }else if(j == 4){ + dynamicRow2.put(str + 1 +"", "班组:"); + }else if(j == 5){ + dynamicRow2.put(str + 0 +"", "班组:"); + } + } + } + + String s1 = JSON.toJSONString(dynamicRow1); + String s2 = JSON.toJSONString(dynamicRow2); + JSONObject object1 = JSONObject.parseObject(s1, Feature.OrderedField); + JSONObject object2 = JSONObject.parseObject(s2, Feature.OrderedField); + log.info("点检动态添加属性： = {}",object1); + log.info("点检动态添加属性： = {}",object2); + listDTO.add(object1); + listDTO.add(object2); + log.info("点检动态添加属性： = {}", JSON.toJSONString(listDTO)); + return listDTO; + } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml index d12c334d..c35eb9f9 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml @@ -30,10 +30,11 @@ - - + + + + + + + + +