From 0484626152d1de925d960acfc6a0f206a1e3df05 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 5 Dec 2023 18:19:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QcCheckTaskIncomeController.java | 7 +++++ .../op/quality/controller/QuaController.java | 9 ++++++ .../op/quality/domain/QcCheckTaskIncome.java | 9 ++++++ .../mapper/QcCheckUnqualifiedMapper.java | 5 ++++ .../service/IQcCheckTaskIncomeService.java | 1 + .../impl/QcCheckTaskIncomeServiceImpl.java | 29 ++++++++++++++----- .../quality/QcCheckTypeProjectMapper.xml | 4 +-- .../quality/QcCheckUnqualifiedMapper.xml | 22 ++++++++++++++ 8 files changed, 76 insertions(+), 10 deletions(-) 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 361dcc58..1af2211e 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 @@ -222,4 +222,11 @@ public class QcCheckTaskIncomeController extends BaseController { return qcCheckTaskIncomeService.getDefectList(qcDefectType); } + /**获取来料工单列表**/ + @GetMapping("/getLLWorkOrder") + public TableDataInfo getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { + startPage(); + List list = qcCheckTaskIncomeService.getLLWorkOrder(qcCheckTaskIncome); + return getDataTable(list); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 44711b5a..9678b82b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -258,4 +258,13 @@ public class QuaController extends BaseController { List list = qcCheckUnqualifiedService.selectQcCheckUnqualifiedList(qcCheckUnqualified); return getDataTable(list); } + + /**获取来料工单列表**/ + @GetMapping("/getLLWorkOrder") + public TableDataInfo getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { + DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskIncome.getFactoryCode()); + startPage(); + List list = qcCheckTaskIncomeService.getLLWorkOrder(qcCheckTaskIncome); + return getDataTable(list); + } } 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 0f66846d..178d9624 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 @@ -122,6 +122,15 @@ public class QcCheckTaskIncome extends BaseEntity { private String checkTimeEnd; private String typeCode; private String checkType; + private String qualityStatus; + + public String getQualityStatus() { + return qualityStatus; + } + + public void setQualityStatus(String qualityStatus) { + this.qualityStatus = qualityStatus; + } public BigDecimal getNoOkQuality() { return noOkQuality; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java index 0b053a0c..41f8ca68 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java @@ -2,6 +2,7 @@ package com.op.quality.mapper; import java.util.List; +import com.op.quality.domain.QcCheckTaskIncome; import com.op.quality.domain.QcCheckUnqualified; import com.op.quality.domain.QcDefectType; import org.apache.ibatis.annotations.Mapper; @@ -71,4 +72,8 @@ public interface QcCheckUnqualifiedMapper { * @return 不合格处理集合 */ public List getUnqualifiedList(QcCheckUnqualified qcCheckUnqualified); + + public List getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); + + void updateQualityStatus(QcCheckTaskIncome qcCheckTaskIncome); } 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 a6a50886..961900e1 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 @@ -80,4 +80,5 @@ public interface IQcCheckTaskIncomeService { List getDefectList(QcDefectType qcDefectType); + List getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); } 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 b1544f82..047be0b7 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 @@ -112,15 +112,18 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qctp.setMaterialCode(qcCheckTaskIncome.getMaterialCode());//特性 /**qc_check_type_project**/ List items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp); - if(CollectionUtils.isEmpty(items)){ - /**qc_material_group_detail**/ - QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskIncome.getMaterialCode()); - if(group == null){ - return 0;//没有找到检测项目 - } - qctp.setGroupId(group.getGroupId());//共性 - items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); + + /**qc_material_group_detail**/ + //个性 + QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskIncome.getMaterialCode()); + if(group == null){ + return 0;//没有找到检测项目 } + //共性 + qctp.setGroupId(group.getGroupId()); + List itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); + + items.addAll(itemsGG); /**qc_check_task_detail**/ if(CollectionUtils.isEmpty(items)){ @@ -280,6 +283,10 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); } + /**wms_raw_order_in-->quality_status->**/ + qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"0"); + qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome); + return n ; } @@ -289,6 +296,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return qcCheckUnqualifiedMapper.getDefectList(qcDefectType); } + @Override + @DS("#header.poolName") + public List getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { + return qcCheckUnqualifiedMapper.getLLWorkOrder(qcCheckTaskIncome); + } + @Override public int commitCheckResults(List details) { DynamicDataSourceContextHolder.push("ds_"+details.get(0).getFactoryCode()); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index 75afc412..f7f78a07 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from qc_check_type_project qctp left join qc_check_project qcp on qcp.id = qctp.project_id - where qctp.del_flag = '0' and qctp.status = '0' + where qctp.del_flag = '0' and qctp.status = '1' and qctp.material_code = #{materialCode} and qctp.type_id = #{typeId} order by qctp.sort @@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from qc_check_type_project qctp left join qc_check_project qcp on qcp.id = qctp.project_id - where qctp.del_flag = '0' and qctp.status = '0' + where qctp.del_flag = '0' and qctp.status = '1' and qctp.group_id = #{groupId} and qctp.type_id = #{typeId} order by qctp.sort diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index 82588aa6..9f5add88 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -85,6 +85,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join qc_check_type qtn on qtn.id = qct.check_type where qcu.id = #{id} + insert into qc_check_unqualified @@ -149,6 +167,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + update wms_raw_order_in set quality_status = #{checkResult} + where order_no = #{orderNo} + delete from qc_check_unqualified where id = #{id}