Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
mengjiao 7 months ago
parent cc87add6d2 91606b8a3d
commit f791cc3439
6 changed files with 256 additions and 12 deletions
Show Stats Download Patch File Download Diff File

13
op-modules/op-mes/src/main/java/com/op/mes/controller/MesInspectionReportController.java
Unescape Escape View File

@ -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<MesInspectionReport> listPointInspection(MesInspectionReport mesInspectionReport) {
return iMesInspectionReportService.selectPointInspectionList(mesInspectionReport);
}
//点检记录
@GetMapping("/listCheckBox")
public List<MesInspectionReport> listCheckBox(MesInspectionReport mesInspectionReport) {
return iMesInspectionReportService.selectCheckBoxList(mesInspectionReport);
}
}

24
op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java
Unescape Escape View File

@ -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<String,String> 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; }
}

6
op-modules/op-mes/src/main/java/com/op/mes/mapper/MesInspectionReportMapper.java
Unescape Escape View File

@ -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<String> selectTimeArray(MesInspectionReport mesInspectionReport);//查询所有时间
MesInspectionReport selectSelfMutualInspectionData(MesInspectionReport mesInspectionReport);
List<MesInspectionReport> getLineCodeList();
List<MesInspectionReport> selectPointInspectionProjectList(String param);//点检项目
List<String> selectTeamArray(MesInspectionReport mesInspectionReport);//班组
List<MesInspectionReport> selectCheckBoxList(MesInspectionReport mesInspectionReport);
}

5
op-modules/op-mes/src/main/java/com/op/mes/service/IMesInspectionReportService.java
Unescape Escape View File

@ -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<MesInspectionReport> selectFirstInspectionRightList(MesInspectionReport mesInspectionReport);//首检右报表
List<MesInspectionReport> selectFirstInspectionLeftList(MesInspectionReport mesInspectionReport);//首检左报表
List<MesInspectionReport> selectPointInspectionList(MesInspectionReport mesInspectionReport);//产品转换/完产清线点检表
List<MesInspectionReport> selectCheckBoxList(MesInspectionReport mesInspectionReport);//点检上方备选框
}

168
op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java
Unescape Escape View File

@ -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<MesInspectionReport> list = mesInspectionReportMapper.selectSelfMutualInspectionList(mesInspectionReport);
String param = "finished_production_check";
//查询点检项目 点检内容
List<MesInspectionReport> projectList = mesInspectionReportMapper.selectPointInspectionProjectList(param);
List<String> teamArray = mesInspectionReportMapper.selectTeamArray(mesInspectionReport);
List<Object> listDTO = new ArrayList<>();
for(MesInspectionReport project : projectList){
Map<String,String> 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<MesInspectionReport> 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<Object> listDTO = new ArrayList<>();
//1.报表名
mesInspectionReport.setReportName("CheckReport");
List<MesInspectionReport> lists = mesInspectionReportMapper.selectCheckBoxList(mesInspectionReport);
Map<String,Map<String,Boolean>> dynamicRow1 = new LinkedHashMap<>();
Map<String,String> dynamicRow2 = new LinkedHashMap<>();
String str = "str";
int i = 0;
for(MesInspectionReport list :lists){
Map<String,Boolean> 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<String,Boolean> 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<String,Boolean> 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;
}
}

52
op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml
Unescape Escape View File

@ -30,10 +30,11 @@
<result property="checkDate" column="check_date"/>
<result property="bz" column="bz"/>
<result property="timeArray" column="timeArray"/>
<!-- 主表-->
<result property="equipmentCode" column="equipment_code"/>
<result property="equipmentName" column="equipment_name"/>
<result property="projectName" column="project_name"/>
</resultMap>
<select id="selectSelfMutualInspectionList" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
@ -42,7 +43,6 @@
mts.product_date,
mts.product_code,
mts.product_name,
mts.bz,
mtsd.id,
mtsd.belong_to,
mtsd.check_time_s,
@ -51,14 +51,16 @@
mtsd.check_time_s + '-' + mtsd.check_time_e as timeArray,
mtsd.info_code,
mtsd.info_name,
mtsd.table_line
mtsd.table_line,
mtsd.bz,
mtsd.remark
from mes_table_self mts
left join mes_table_self_detial mtsd on mts.id = mtsd.belong_to
<where>
<if test="reportName == 'ConversionReportLeft'">
and CONVERT(date, mts.check_date) = dateadd(day, -1, CONVERT(date,#{checkDate}))
</if>
<if test = "reportName == 'ConversionReportRight' or reportName == 'ConversionReport'">
<if test = "reportName == 'ConversionReportRight' or reportName == 'ConversionReport' or reportName == 'CheckReport' ">
and CONVERT(date, mts.check_date) = CONVERT(date,#{checkDate})
</if>
and mts.line_code = #{lineCode}
@ -75,6 +77,16 @@
order by dict_sort asc
</select>
<select id="selectPointInspectionProjectList" resultMap="MesInspectionReportResult" parameterType="java.lang.String">
select
dict_label as info_name,
remark as project_name,
dict_sort as table_line
from base_dict_data
where dict_type = #{param}
order by dict_sort asc
</select>
<select id="selectTimeArray" resultType="java.lang.String" parameterType="MesInspectionReport">
select
mtsd.check_time_s + '-' + mtsd.check_time_e as timeArray
@ -96,6 +108,21 @@
order by mtsd.check_time_s
</select>
<select id="selectTeamArray" resultType="java.lang.String" parameterType="MesInspectionReport">
select
mtsd.remark
from mes_table_self mts
left join mes_table_self_detial mtsd on mts.id = mtsd.belong_to
where 1=1
and mts.del_flag = '0'
and mtsd.del_flag = '0'
and CONVERT(date, mts.check_date) = CONVERT(date,#{checkDate})
and mts.line_code = #{lineCode}
and mts.report_name = #{reportName}
group by mtsd.remark
order by mtsd.remark
</select>
<select id="selectSelfMutualInspectionData" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
select top 1
mts.line_code,
@ -127,4 +154,19 @@
and equipment_category = '1'
</select>
<select id="selectCheckBoxList" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
select
mtsd.remark, mtsd.bz
from mes_table_self mts
left join mes_table_self_detial mtsd on mts.id = mtsd.belong_to
where 1=1
and mts.del_flag = '0'
and mtsd.del_flag = '0'
and CONVERT(date, mts.check_date) = CONVERT(date,#{checkDate})
and mts.line_code = #{lineCode}
and mts.report_name = #{reportName}
group by mtsd.remark,mtsd.bz
order by mtsd.remark
</select>
</mapper>

Write Preview
Loading…
Cancel
Save