Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量调整

Browse Source
master
zhaoxiaolin 1 year ago
parent 119ad65d1a
commit a8fa036f00
8 changed files with 163 additions and 43 deletions
Show Stats Download Patch File Download Diff File

10
op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
Unescape Escape View File

@ -1,16 +1,13 @@
package com.op.open.controller;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.open.service.OpenService;
import com.op.system.api.RemoteQualityService;
import com.op.system.api.domain.device.EquRepairOrderDTO;
import com.op.system.api.domain.dto.WCSDTO;
import com.op.system.api.domain.mes.MesReportWorkDTO;
import com.op.system.api.domain.quality.QcCheckTaskDTO;
import com.op.system.api.domain.quality.QcCheckTaskProduceDTO;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -91,23 +88,18 @@ public class OpenController extends BaseController {
if(StringUtils.isBlank(qcCheckTaskProduce.getOrderNo())){
return error("[orderNo]不能为空");
}
if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialName())){
return error("[materialName]不能为空");
}
if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialCode())){
return error("[materialCode]不能为空");
}
if(StringUtils.isBlank(qcCheckTaskProduce.getCheckType())){
return error("[checkType]不能为空");
}
if(StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())){
return error("[factoryCode]不能为空");
}
//添加检测任务
return toAjax(openService.insertQcCheckTaskProduce(qcCheckTaskProduce));
}

6
op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
Unescape Escape View File

@ -1,11 +1,8 @@
package com.op.open.service;
import com.op.common.core.domain.R;
import com.op.common.core.web.domain.AjaxResult;
import com.op.system.api.domain.device.EquRepairOrderDTO;
import com.op.system.api.domain.dto.WCSDTO;
import com.op.system.api.domain.mes.MesReportWorkDTO;
import com.op.system.api.domain.quality.QcCheckTaskDTO;
import com.op.system.api.domain.quality.QcCheckTaskProduceDTO;
import java.util.List;
@ -21,8 +18,6 @@ public interface OpenService {
WCSDTO requestDestinationStations(WCSDTO wcsdto);
// R reportWork(MesReportWorkDTO mesReportWork);
List<WCSDTO> getLGInfo(WCSDTO wcsDTO);
AjaxResult machineRepair(EquRepairOrderDTO equRepairOrderDTO);
@ -32,4 +27,5 @@ public interface OpenService {
AjaxResult OAInspection(Map<String, Object> paramMap);
AjaxResult GetOaNodeInfo(String requestId);
}

18
op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
Unescape Escape View File

@ -126,6 +126,24 @@ public class QcCheckReportIncome extends BaseEntity {
private String checkType;//小类
private String checkName;
private String createTimeStr;
private List<BaseFile> files;
private List<String> fileUrls;
public List<String> getFileUrls() {
return fileUrls;
}
public void setFileUrls(List<String> fileUrls) {
this.fileUrls = fileUrls;
}
public List<BaseFile> getFiles() {
return files;
}
public void setFiles(List<BaseFile> files) {
this.files = files;
}
public String getCreateTimeStr() {
return createTimeStr;

13
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java
Unescape Escape View File

@ -39,7 +39,8 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
@Autowired
private QcCheckTaskDetailMapper qcCheckTaskDetailMapper;
@Autowired
private QMSFileMapper qmsFileMapper;
/**
* 查询来料检验
*
@ -192,7 +193,15 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
@Override
@DS("#header.poolName")
public List<QcCheckTaskDetail> getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) {
return qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
List<QcCheckTaskDetail> dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
for(QcCheckTaskDetail dto:dtos){
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(dto.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
dto.setFiles(files);
}
}
return dtos;
}
@Override

3
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
Unescape Escape View File

@ -51,7 +51,8 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
@Override
@DS("#header.poolName")
public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) {
return qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId);
QcCheckReportIncome dto= qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId);
return dto;
}
/**

2
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
Unescape Escape View File

@ -591,6 +591,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
logger.info("更新qc_check_task_detail:"+n);
/**qc_check_task_defect**/
//qcCheckTaskIncomeMapper.deleteQcCheckTaskDefects()
////////////////////////////
n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects);
logger.info("qc_check_task_defect:"+n);

150
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
Unescape Escape View File

@ -8,7 +8,10 @@ import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.StringUtils;
import com.op.quality.domain.BaseFile;
import com.op.quality.domain.QcCheckTaskDetail;
import com.op.quality.domain.QcCheckType;
import com.op.quality.mapper.QMSFileMapper;
import com.op.system.api.domain.quality.ChartDTO;
import com.op.system.api.domain.quality.ChartSeriesDTO;
import com.op.system.api.domain.quality.FactoryDto;
@ -29,7 +32,8 @@ import org.springframework.util.CollectionUtils;
public class QcStaticTableServiceImpl implements IQcStaticTableService {
@Autowired
private QcStaticTableMapper qcStaticTableMapper;
@Autowired
private QMSFileMapper qmsFileMapper;
/**
* 查询质量系统报列表
*
@ -172,96 +176,192 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
private void getDataFromMap(Map<String,QcStaticTable> detailMap,QcStaticTable project){
String keystr = project.getProjectId()+"08";
QcStaticTable detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn080090(detail.getStatus());
if(detail!=null&&StringUtils.isNotBlank(detail.getRemark())){
project.setColumn080090(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn080090(project.getColumn080090()+":"+picurls);
}
}else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){
project.setColumn080090(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn080090("-");
}
keystr = project.getProjectId()+"09";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn090100(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn090100(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn090100(project.getColumn090100()+":"+picurls);
}
}else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){
project.setColumn090100(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn090100("-");
}
keystr = project.getProjectId()+"10";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn100110(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn100110(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn100110(project.getColumn100110()+":"+picurls);
}
}else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){
project.setColumn100110(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn100110("-");
}
keystr = project.getProjectId()+"11";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn110120(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn110120(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn110120(project.getColumn110120()+":"+picurls);
}
}else if(detail!=null&&detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn110120(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn110120("-");
}
keystr = project.getProjectId()+"12";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn123133(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn123133(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn123133(project.getColumn123133()+":"+picurls);
}
}else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn123133(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn123133("-");
}
keystr = project.getProjectId()+"13";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn133143(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn133143(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn133143(project.getColumn133143()+":"+picurls);
}
}else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn133143(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn133143("-");
}
keystr = project.getProjectId()+"14";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn143153(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn143153(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn143153(project.getColumn143153()+":"+picurls);
}
}else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn143153(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn143153("-");
}
keystr = project.getProjectId()+"15";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn153163(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn153163(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn153163(project.getColumn153163()+":"+picurls);
}
}else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn153163(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn153163("-");
}
keystr = project.getProjectId()+"16";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn163173(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn163173(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn163173(project.getColumn163173()+":"+picurls);
}
}else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn163173(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn163173("-");
}
keystr = project.getProjectId()+"18";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn180190(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn180190(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn180190(project.getColumn180190()+":"+picurls);
}
}else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn180190(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn180190("-");
}
keystr = project.getProjectId()+"19";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn190200(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn190200(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn190200(project.getColumn190200()+":"+picurls);
}
}else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn190200(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn190200("-");
}
keystr = project.getProjectId()+"20";
detail = detailMap.get(keystr);
if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn200210(detail.getStatus());
if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
project.setColumn200210(detail.getRemark());
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
String picurls = pics.stream().collect(Collectors.joining(","));
project.setColumn080090(project.getColumn080090()+":"+picurls);
}
}else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
project.setColumn200210(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn200210("-");
}

4
op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
Unescape Escape View File

@ -130,8 +130,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by qctp.sort
</select>
<select id="getProjectDetail" resultType="com.op.quality.domain.QcStaticTable">
select qctd.project_id projectId,
select qctd.record_id recordId,
qctd.project_id projectId,
qctd.status,
qctd.remark,
CONVERT(VARCHAR(5),qctd.create_time, 108),
concat(qctd.project_id,
case when '09:00'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '08:00' then '08'

Write Preview
Loading…
Cancel
Save