From dd16e06623c62c3ea426e770bd95aea6f7e67d1a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 22 Mar 2024 09:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5+=E6=89=B9=E6=AC=A1=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=87=8D=E5=A4=8D+=E5=85=B6=E5=AE=83=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E5=8A=9F=E8=83=BD=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/open/mapper/OpenMapper.java | 2 +- .../op/open/service/impl/OpenServiceImpl.java | 2 +- .../main/resources/mapper/open/OpenMapper.xml | 3 +- .../QcCheckTaskIncomeController.java | 68 +++++++++++-------- .../op/quality/domain/QcCheckTaskDefect.java | 28 ++++++++ .../op/quality/domain/QcCheckTaskIncome.java | 10 ++- .../mapper/QcCheckTaskDefectMapper.java | 7 +- .../mapper/QcCheckTaskIncomeMapper.java | 6 +- .../service/IQcCheckTaskIncomeService.java | 2 + .../impl/QcCheckTaskIncomeServiceImpl.java | 44 +++++++++--- .../impl/QcCheckTaskProduceServiceImpl.java | 2 +- .../QcCheckTaskWarehousingServiceImpl.java | 2 +- .../service/impl/QcProCheckServiceImpl.java | 13 ++++ .../quality/QcCheckTaskDefectMapper.xml | 28 ++++++++ .../quality/QcCheckTaskIncomeMapper.xml | 27 ++++---- .../mapper/quality/QcProCheckMapper.xml | 4 +- 16 files changed, 182 insertions(+), 66 deletions(-) diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java index 4333e2ab3..85ccc6cff 100644 --- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java +++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java @@ -77,7 +77,7 @@ public interface OpenMapper { public int addBatch(@Param("list") List items); - List getCheckUsers(String materialCode); + List getCheckUsers(String checkType); public int addCheckUsers(@Param("list") List users); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index f448a89d2..da094dcbf 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -346,7 +346,7 @@ public class OpenServiceImpl implements OpenService { qctp.setMaterialCode(qcCheckTaskProduce.getMaterialCode());//特性 /**qc_user_material取默认检查人**/ - List users = openMapper.getCheckUsers(qcCheckTaskProduce.getOrderNo()); + List users = openMapper.getCheckUsers(qcCheckTaskProduce.getCheckType()); if (CollectionUtils.isEmpty(users)) { QcUserMaterialDTO dto0 = new QcUserMaterialDTO(); dto0.setId(IdUtils.fastSimpleUUID()); diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml index a70391f58..6e780f62f 100644 --- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml +++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml @@ -199,8 +199,7 @@ select qum.user_code userCode, qum.user_name userName from qc_user_material qum - left join pro_order_workorder pow on pow.workorder_code = qum.material_code - where pow.workorder_code = #{workorderCode} and pow.del_flag = '0' and qum.del_flag = '0' + where qum.material_code = #{checkType} and pow.del_flag = '0' and qum.del_flag = '0' diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index e5c44a09f..75d7d2b91 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -21,10 +21,13 @@ import com.op.common.core.utils.bean.BeanUtils; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.*; import com.op.system.api.RemoteOpenService; +import com.op.system.api.RemoteSapService; import com.op.system.api.RemoteUserService; import com.op.system.api.domain.SysRole; import com.op.system.api.domain.SysUser; +import com.op.system.api.domain.quality.HRInfo; import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO; +import com.op.system.api.domain.sap.SapSupplier; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; @@ -62,6 +65,9 @@ public class QcCheckTaskIncomeController extends BaseController { @Autowired private RemoteUserService remoteUserService; + @Autowired + private RemoteSapService remoteSapService; + /** * 查询来料检验列表 */ @@ -156,10 +162,15 @@ public class QcCheckTaskIncomeController extends BaseController { 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue()); try { + dateSources.forEach(dateSource -> { - Runnable run = () -> createIncomeBatchTaskFunc(dateSource.get("poolName")); - executorService.execute(run); + if(!"ds_999".equals(dateSource.get("poolName"))){ + Runnable run = () -> createIncomeBatchTaskFunc(dateSource.get("poolName")); + executorService.execute(run); + } + }); + } catch (Exception e) { logger.error("controller == createIncomeBatchTask == exception", e); return error("controller == createIncomeBatchTask == exception"); @@ -174,32 +185,39 @@ public class QcCheckTaskIncomeController extends BaseController { DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key Date taskTime = DateUtils.getNowDate(); logger.info("++++++++++++" + poolName + "工厂来料检验批量创建任务开始+++时间:"+ taskTime +"++++++++++"); - List incomeBatchLists = qcCheckTaskIncomeService.getIncomeBatchList(poolName); - List batchRecordIds = new ArrayList<>(); + Map mapBom = new HashMap(); + mapBom.put("P_WERKS",poolName.replace("ds_",""));//物料工厂 例如：1000 + logger.info("来料信息查询请求：" + JSONObject.toJSONString(mapBom)); + R incomeR = remoteSapService.inComingCheck(mapBom); + if(incomeR.getCode()==500){ + logger.info("来料信息查询请求：" + JSONObject.toJSONString(incomeR)); + return AjaxResult.error(JSONObject.toJSONString(incomeR)); + } + logger.info("来料信息查询结果：" + JSONObject.toJSONString(incomeR)); + List incomeAll = (List)incomeR.getData(); + //已经生成过检验任务的采购订单 + List todayIncomeLists = qcCheckTaskIncomeService.getTodayIncomeLists(); + List newIncomes = incomeAll.stream() + .filter(item -> !todayIncomeLists.contains(item.getOrderNo())) + .collect(Collectors.toList()); + int successNum = 0;//成功任务数 int failNum = 0;//失败任务数 - if(incomeBatchLists != null){ - for( int i = 0 ; i < incomeBatchLists.size();){ - QcCheckTaskIncomeDTO qcCheckTaskIncomedto = new QcCheckTaskIncomeDTO(); - QcCheckTaskIncome income = incomeBatchLists.get(i); - BeanUtils.copyProperties(income,qcCheckTaskIncomedto); - //内层一个一个创建任务 - AjaxResult ajaxResult = createIncomeTask(qcCheckTaskIncomedto); + if(!CollectionUtils.isEmpty(newIncomes)){ + logger.info("工厂来料检验任务生成参数：" + JSONObject.toJSONString(newIncomes)); + for(QcCheckTaskIncomeDTO income:newIncomes){ + AjaxResult ajaxResult = createIncomeTask(income); if(ajaxResult.isSuccess()){ - batchRecordIds.add(qcCheckTaskIncomedto.getRecordId()); successNum = successNum + 1; logger.info(poolName + "工厂的" + income.getCheckNo()+"来料检验创建任务成功++++++++++"); }else if(ajaxResult.isError()){ failNum = failNum +1; logger.info(poolName + "工厂的" + income.getCheckNo()+"来料检验创建任务失败++++++++++"); } - i++; } }else{ logger.info("++++++++++++" + poolName + "工厂来料检验没有可创建的任务++++++++++"); } - //批量修改原表中的check_status和check_time - int upate = qcCheckTaskIncomeService.updateIncomeBatchList(batchRecordIds,taskTime); logger.info("++++++++++++" + poolName + "工厂来料检验批量创建任务结束:成功"+ successNum +"失败"+ failNum +"+++++"); return success(); } catch (Exception e) { @@ -209,9 +227,7 @@ public class QcCheckTaskIncomeController extends BaseController { } @PostMapping("/createIncomeTask") - public AjaxResult createIncomeTask(@RequestBody QcCheckTaskIncomeDTO qcCheckTaskIncome0) { - QcCheckTaskIncome qcCheckTaskIncome = new QcCheckTaskIncome(); - BeanUtils.copyProperties(qcCheckTaskIncome0, qcCheckTaskIncome); + public AjaxResult createIncomeTask(@RequestBody QcCheckTaskIncomeDTO qcCheckTaskIncome) { if (StringUtils.isBlank(qcCheckTaskIncome.getOrderNo())) { return error("[orderNo]不能为空"); @@ -222,12 +238,7 @@ public class QcCheckTaskIncomeController extends BaseController { if (StringUtils.isBlank(qcCheckTaskIncome.getMaterialCode())) { return error("[materialCode]不能为空"); } - if (StringUtils.isBlank(qcCheckTaskIncome.getCheckType())) { - return error("[checkType]不能为空"); - } - if (StringUtils.isBlank(qcCheckTaskIncome.getFactoryCode())) { - return error("[factoryCode]不能为空"); - } + if (StringUtils.isBlank(qcCheckTaskIncome.getSupplierCode())) { return error("[supplierCode]不能为空"); } @@ -237,14 +248,13 @@ public class QcCheckTaskIncomeController extends BaseController { if (qcCheckTaskIncome.getIncomeTime() == null) { return error("[incomeTime]不能为空"); } - logger.info(qcCheckTaskIncome0.getFactoryCode() + "工厂来料检验任务生成开始================================"); - logger.info(qcCheckTaskIncome0.getFactoryCode() + "工厂来料检验任务生成参数：" + JSONObject.toJSONString(qcCheckTaskIncome)); - - int r = qcCheckTaskIncomeService.insertQcCheckTaskIncome(qcCheckTaskIncome); + QcCheckTaskIncome income = new QcCheckTaskIncome(); + BeanUtils.copyProperties(qcCheckTaskIncome,income); + int r = qcCheckTaskIncomeService.insertQcCheckTaskIncome(income); if (r > 0) { return toAjax(r); } - return error(qcCheckTaskIncome0.getFactoryCode() + "工厂添加失败：请检查物料的关联检测项" ); + return error("添加失败：请检查物料的关联检测项" ); } 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 6be4541ab..2899c7f1d 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 @@ -88,6 +88,34 @@ public class QcCheckTaskDefect extends BaseEntity { @Excel(name = "不合格数量") private BigDecimal noOkQuality; + private String defectCodes; + private String defectNames; + private String defectQualitys; + + public String getDefectCodes() { + return defectCodes; + } + + public void setDefectCodes(String defectCodes) { + this.defectCodes = defectCodes; + } + + public String getDefectNames() { + return defectNames; + } + + public void setDefectNames(String defectNames) { + this.defectNames = defectNames; + } + + public String getDefectQualitys() { + return defectQualitys; + } + + public void setDefectQualitys(String defectQualitys) { + this.defectQualitys = defectQualitys; + } + public String getBelongToDetail() { return belongToDetail; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 85df1935b..e0df6f82e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -95,7 +95,7 @@ public class QcCheckTaskIncome extends BaseEntity { */ @Excel(name = "检测地点") private String checkLoc; - + private String checkLocName; /** * 检测状态 */ @@ -193,6 +193,14 @@ public class QcCheckTaskIncome extends BaseEntity { private String noOkQualityNames; private String noOkQualityVals; + public String getCheckLocName() { + return checkLocName; + } + + public void setCheckLocName(String checkLocName) { + this.checkLocName = checkLocName; + } + public String getNoOkQualityNames() { return noOkQualityNames; } 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 a2f3a5cbc..53f4929ec 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 @@ -1,8 +1,11 @@ package com.op.quality.mapper; import java.util.List; +import java.util.Map; import com.op.quality.domain.QcCheckTaskDefect; +import com.op.quality.domain.QcCheckTaskDetail; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; /** @@ -64,6 +67,6 @@ public interface QcCheckTaskDefectMapper { public int deleteQcCheckTaskDefectByBelongTo(String belongTo); public List selectDefectByBelongTo(String belongTo); - - + @MapKey("belongToDetail") + public Map getDefectMap(QcCheckTaskDetail qcCheckTaskDetail); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index f27926727..36465d1c1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -88,9 +88,7 @@ public interface QcCheckTaskIncomeMapper { List selectQcCheckTaskCheckNoByRecordIds(String[] recordIds); - List getUserByMaterial(String materialCode); - - List getCheckUsers(String orderNo); + List getUserByCheckType(String checkType); int addCheckUsers(@Param("list") List users); @@ -112,4 +110,6 @@ public interface QcCheckTaskIncomeMapper { int updateIncomeBatchList(@Param("list") List batchRecordIds, @Param("time") Date taskTime); List getCheckLocList(QcDefectType qcDefectType); + + List getTodayIncomeLists(); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index 77c2e48d2..1ef4918f6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -98,4 +98,6 @@ public interface IQcCheckTaskIncomeService { int updateIncomeBatchList(List batchRecordIds , Date taskTime); List getCheckLocList(QcDefectType qcDefectType); + + List getTodayIncomeLists(); } 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 71992ffa3..9ac1a3f5e 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 @@ -210,11 +210,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { } //检验人插入 qcCheckTaskUserService.insertQcCheckTaskUserPDA(qcCheckTaskUserList); - }else{//上位机触发 + }else{ qcCheckTaskIncome.setCheckManName(""); qcCheckTaskIncome.setCheckManCode(""); /**qc_user_material取默认检查人**/ - List users = qcCheckTaskIncomeMapper.getCheckUsers(qcCheckTaskIncome.getOrderNo()); + List users = qcCheckTaskIncomeMapper.getUserByCheckType(qcCheckTaskIncome.getCheckType()); if(CollectionUtils.isEmpty(users)){ QcUserMaterialDTO dto0 = new QcUserMaterialDTO(); dto0.setId(IdUtils.fastSimpleUUID()); @@ -599,7 +599,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { break; } } - //TODO;today + int n = 0; QcCheckTaskIncome qcCheckTask = new QcCheckTaskIncome(); qcCheckTask.setUpdateBy(updateBy); @@ -610,14 +610,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格 qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo()); BigDecimal noOkQquality = new BigDecimal("0"); - List defects = qcCheckTaskIncome.getDefects(); - for(QcCheckTaskDefect defect:defects){ - defect.setRecordId(IdUtils.fastSimpleUUID()); - defect.setCreateTime(nowTime); - defect.setCreateBy(updateBy); - defect.setFactoryCode(factoryCode); - defect.setBelongTo(belongId); - noOkQquality = noOkQquality.add(defect.getNoOkQuality()); + List defects0 = qcCheckTaskIncome.getDefects(); + for(QcCheckTaskDefect defect0:defects0){ + noOkQquality = noOkQquality.add(defect0.getNoOkQuality()); } qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数 qcCheckTask.setCheckManCode(qcCheckTaskIncome.getUpdateBy()); @@ -655,6 +650,28 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { /**qc_check_task_defect**/ n=qcCheckTaskIncomeMapper.deleteQcCheckTaskDefects(belongId); logger.info("清理qc_check_task_defect:"+n); + List defects = new ArrayList<>(); + QcCheckTaskDefect defect = null; + for(QcCheckTaskDetail detail:details){ + if(StringUtils.isNotBlank(detail.getDefectCodes())){ + String[] defectCodes = detail.getDefectCodes().split(","); + String[] defectNames = detail.getDefectNames().split(","); + String[] defectQualitys = detail.getDefectQualitys().split(","); + for(int d=0;d getTodayIncomeLists() { + return qcCheckTaskIncomeMapper.getTodayIncomeLists(); + } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index 207d4d59c..0d6572cd8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -204,7 +204,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService qcCheckTaskProduce.setCheckManName(""); qcCheckTaskProduce.setCheckManCode(""); /**qc_user_material取默认检查人**/ - List users = qcCheckTaskIncomeMapper.getCheckUsers(qcCheckTaskProduce.getOrderNo()); + List users = qcCheckTaskIncomeMapper.getUserByCheckType(qcCheckTaskProduce.getCheckType()); if(!CollectionUtils.isEmpty(users)){ for(QcUserMaterialDTO user:users){ user.setId(IdUtils.fastSimpleUUID()); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java index 39756c025..cd6b65785 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -179,7 +179,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin qcCheckTaskWarehousing.setCheckManName(""); qcCheckTaskWarehousing.setCheckManCode(""); /**qc_user_material取默认检查人**/ - List users = qcCheckTaskIncomeMapper.getUserByMaterial(qcCheckTaskWarehousing.getMaterialCode()); + List users = qcCheckTaskIncomeMapper.getUserByCheckType(qcCheckTaskWarehousing.getCheckType()); if(CollectionUtils.isEmpty(users)){ QcUserMaterialDTO dto0 = new QcUserMaterialDTO(); dto0.setUserCode("mobile"); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index edea6b29d..05898b168 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -11,6 +11,7 @@ import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.*; import com.op.quality.mapper.QMSFileMapper; +import com.op.quality.mapper.QcCheckTaskDefectMapper; import com.op.quality.mapper.QcCheckTaskIncomeMapper; import com.op.quality.mapper.QcProCheckMapper; import com.op.quality.service.QcProCheckService; @@ -37,6 +38,9 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Autowired private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + @Autowired + private QcCheckTaskDefectMapper qcCheckTaskDefectMapper; + @Autowired private QMSFileMapper qmsFileMapper; @@ -136,12 +140,21 @@ public class QcProCheckServiceImpl implements QcProCheckService { DynamicDataSourceContextHolder.push(qcCheckTaskDetail.getFactoryCode()); QcCheckTaskIncome dto = new QcCheckTaskIncome(); List qcCheckTaskDetails = qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); + /**qc_check_task_defect**/ + Map defectMap = qcCheckTaskDefectMapper.getDefectMap(qcCheckTaskDetail); for (QcCheckTaskDetail qcd : qcCheckTaskDetails) { List files = qmsFileMapper.getBaseFileBatch(qcd.getRecordId()); if (CollectionUtils.isNotEmpty(files)) { qcd.setFiles(files); } + + QcCheckTaskDefect defectInfo = defectMap.get(qcd.getRecordId()); + if(defectInfo != null){ + qcd.setDefectCodes(defectInfo.getDefectCodes()); + qcd.setDefectNames(defectInfo.getDefectNames()); + qcd.setDefectQualitys(defectInfo.getDefectQualitys()); + } } dto.setQcCheckTaskDetails(qcCheckTaskDetails); 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 6d34ac8d3..e1b129080 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 @@ -130,5 +130,33 @@ where belong_to = #{belongTo} order by defect_code + 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 c6c1bbfdc..8be1b55db 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 @@ -337,26 +337,21 @@ #{recordId} - select user_code userCode, user_name userName - from qc_user_material where material_code = #{materialCode} + from qc_user_material + where material_code = #{checkType} and del_flag = '0' - + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml index f4ef293d0..65dd8aa26 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml @@ -49,6 +49,7 @@ + @@ -252,7 +253,7 @@