From d376da1957910d37670d60aba380b3f5d4f350c0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 11 Dec 2024 10:38:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MesReportWorkController.java | 2 +- .../service/impl/IWCInterfaceServiceImpl.java | 2 -- .../QcCheckTaskDefectController.java | 7 ++--- .../op/quality/domain/QcCheckTaskDefect.java | 19 ++++++++++++++ .../mapper/QcCheckTaskDefectMapper.java | 6 +++-- .../service/IQcCheckTaskDefectService.java | 2 +- .../impl/QcCheckTaskDefectServiceImpl.java | 21 ++++++++++++--- .../impl/QcCheckTaskIncomeServiceImpl.java | 5 ++++ .../quality/QcCheckTaskDefectMapper.xml | 26 +++++++++++++++---- .../quality/QcCheckTaskIncomeMapper.xml | 15 +++++++++-- 10 files changed, 86 insertions(+), 19 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index da240a0c0..515153ac9 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -109,7 +109,7 @@ public class MesReportWorkController extends BaseController { // String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; // mesReportWork.setCreateTimeEnd(dateEndStr);//end // } - List list = mesReportWorkService.selectMesReportWorkList_S(mesReportWork); + List list = mesReportWorkService.getReportWorkHzList(mesReportWork); for(MesReportWork dto:list){ if("1".equals(dto.getUploadStatus())){ dto.setUploadStatus("sap报工成功"); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 4ed0d5479..93f40dda6 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -730,7 +730,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { // 定义一个日期格式化器 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 打印最近七天的日期 - System.out.println("最近七天的日期:"); for (int i = 0; i < 7; i++) { LocalDate date = today.minusDays(i); days.add(date.format(formatter)); @@ -1232,7 +1231,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { // 定义一个日期格式化器 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 打印最近七天的日期 - System.out.println("最近七天的日期:"); for (int i = 0; i < 7; i++) { LocalDate date = today.minusDays(i); days.add(date.format(formatter)); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskDefectController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskDefectController.java index 85d03fb83..99a6f3390 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskDefectController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskDefectController.java @@ -100,9 +100,10 @@ public class QcCheckTaskDefectController extends BaseController { /** * PC不良数据获取 */ - @GetMapping("/getDefectValue/{belongToDetail}") - public TableDataInfo getDefectValue(@PathVariable String belongToDetail) { - List list = qcCheckTaskDefectService.getDefectListByBelongToDetail(belongToDetail); + @GetMapping("/getDefectValue/{belongToDetail}/{checkType}") + public TableDataInfo getDefectValue(@PathVariable("belongToDetail") String belongToDetail, + @PathVariable("checkType") String checkType) { + List list = qcCheckTaskDefectService.getDefectListByBelongToDetail(belongToDetail,checkType); return getDataTable(list); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java index bc848b91c..09d718b54 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java @@ -1,6 +1,7 @@ package com.op.quality.domain; import java.math.BigDecimal; +import java.util.List; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -94,6 +95,24 @@ public class QcCheckTaskDefect extends BaseEntity { private String defectNames; private String defectQualitys; private String classId; + private String className; + private List classList; + + public List getClassList() { + return classList; + } + + public void setClassList(List classList) { + this.classList = classList; + } + + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } public String getClassId() { return classId; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java index 2ba307c9a..ae1115077 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java @@ -7,6 +7,7 @@ import com.op.quality.domain.QcCheckTaskDefect; import com.op.quality.domain.QcCheckTaskDetail; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 来料检验任务--不良数量Mapper接口 @@ -55,7 +56,7 @@ public interface QcCheckTaskDefectMapper { * @return 结果 */ public int deleteQcCheckTaskDefectByRecordId(String recordId); - + public int deleteQcCheckTaskDefectByDetailId(String belongToDetail); /** * 批量删除来料检验任务--不良数量 * @@ -70,6 +71,7 @@ public interface QcCheckTaskDefectMapper { @MapKey("belongToDetail") public Map getDefectMap(QcCheckTaskDetail qcCheckTaskDetail); - public List getDefectListByBelongToDetail(String belongToDetail); + public List getDefectListByBelongToDetail(@Param("belongToDetail") String belongToDetail, + @Param("checkType") String checkType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java index 2b612f0ea..55538718f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java @@ -67,5 +67,5 @@ public interface IQcCheckTaskDefectService { public int updateDefectValue(List qcCheckTaskDefects); - public List getDefectListByBelongToDetail(String belongToDetail); + public List getDefectListByBelongToDetail(String belongToDetail,String checkType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java index d9fe4fd16..6b523b5e4 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java @@ -7,6 +7,8 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.QcDefectTypeClass; +import com.op.quality.mapper.QcDefectTypeClassMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.quality.mapper.QcCheckTaskDefectMapper; @@ -27,7 +29,8 @@ import javax.servlet.http.HttpServletRequest; public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService { @Autowired private QcCheckTaskDefectMapper qcCheckTaskDefectMapper; - + @Autowired + private QcDefectTypeClassMapper qcDefectTypeClassMapper; /** * 查询来料检验任务--不良数量 * @@ -134,11 +137,16 @@ public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService { String key = "#header.poolName"; String factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); int count = 0; + //先逻辑删除所有的 + qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByDetailId(qcCheckTaskDefects.get(0).getBelongToDetail()); for (QcCheckTaskDefect defect : qcCheckTaskDefects) { defect.setRecordId(IdUtils.fastSimpleUUID()); defect.setCreateBy(userName); defect.setCreateTime(now); defect.setFactoryCode(factoryCode); + //belongTo; + //belongToDetail; + //classId,noOkQuality已经有了 count += qcCheckTaskDefectMapper.insertQcCheckTaskDefect(defect); } return count; @@ -165,8 +173,15 @@ public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService { @Override @DS("#header.poolName") - public List getDefectListByBelongToDetail(String belongToDetail) { - List defectList = qcCheckTaskDefectMapper.getDefectListByBelongToDetail(belongToDetail); + public List getDefectListByBelongToDetail(String belongToDetail,String checkType) { + List defectList = qcCheckTaskDefectMapper.getDefectListByBelongToDetail(belongToDetail,checkType); + QcDefectTypeClass qcDefectTypeClass = null; + for(QcCheckTaskDefect dto:defectList){ + qcDefectTypeClass=new QcDefectTypeClass(); + qcDefectTypeClass.setDefectCode(dto.getDefectCode()); + List classInfoList = qcDefectTypeClassMapper.getClassInfoList(qcDefectTypeClass); + dto.setClassList(classInfoList); + } return defectList; } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index c73d6c48c..81626ce0c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -111,6 +111,7 @@ public class QcCheckTaskIncomeServiceImpl implements @DS("#header.poolName") public QcCheckTaskIncome selectQcCheckTaskIncomeByRecordId(String recordId) { QcCheckTaskIncome qcCheckTaskIncome = qcCheckTaskIncomeMapper.selectQcCheckTaskIncomeByRecordId(recordId); + qcCheckTaskIncome.setAttr3(qcCheckTaskIncome.getBz()); //获取拼接好的检验人员信息 QcCheckTaskUser qcCheckTaskUser = qcCheckTaskUserService.selectQcCheckTaskUserByBelongTo(recordId); if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManNames())) { @@ -726,6 +727,10 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setSccj(qcCheckTaskIncome.getSccj());// 所属车间 qcCheckTask.setSqr(qcCheckTaskIncome.getSqr());// 申请人Id + qcCheckTask.setCxzz(qcCheckTaskIncome.getCxzz());// + qcCheckTask.setJgy(qcCheckTaskIncome.getJgy());// + qcCheckTask.setPgy(qcCheckTaskIncome.getPgy());// + BigDecimal sampleQuality = new BigDecimal("0"); for(QcCheckTaskDetail detail:details){ detail.setUpdateTime(nowTime); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml index d3051a871..8a6b5d586 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml @@ -3,7 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - @@ -22,6 +21,8 @@ + + @@ -70,6 +71,7 @@ ok_quality, noOk_quality, belong_to_detail, + class_id, #{recordId}, @@ -89,6 +91,7 @@ #{okQuality}, #{noOkQuality}, #{belongToDetail}, + #{classId}, @@ -110,6 +113,8 @@ belong_to = #{belongTo}, ok_quality = #{okQuality}, noOk_quality = #{noOkQuality}, + belong_to_detail = #{belongToDetail}, + class_id = #{classId}, where record_id = #{recordId} @@ -118,6 +123,10 @@ update qc_check_task_defect set del_flag = '1' where record_id = #{recordId} + + update qc_check_task_defect set del_flag = '1' where belong_to_detail = #{belongToDetail} + + update qc_check_task_defect set del_flag = '1' where record_id in @@ -172,10 +181,17 @@ diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index 3886ad4d9..bfadc8d8e 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -40,6 +40,8 @@ + + @@ -47,7 +49,7 @@ supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality, - order_type,order_type_desc,remark + order_type,order_type_desc,remark,attr3,remark_code,bz from qc_check_task @@ -389,6 +391,9 @@ aNoOkquality, bNoOkquality, cNoOkquality, + cxzz, + jgy, + pgy, #{recordId}, @@ -448,6 +453,9 @@ #{aNoOkquality}, #{bNoOkquality}, #{cNoOkquality}, + #{cxzz}, + #{jgy}, + #{pgy}, @@ -487,6 +495,9 @@ pgzr = #{pgzr}, sfgyswt = #{sfgyswt}, sccj = #{sccj}, + cxzz = #{cxzz}, + jgy = #{jgy}, + pgy = #{pgy}, check_result = #{checkResult}, update_by = #{updateBy}, update_time = #{updateTime} @@ -497,7 +508,7 @@ supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality, - order_type,order_type_desc + order_type,order_type_desc,cxzz,jgy,pgy from qc_check_task_cg where record_id = #{recordId}