From 0d71cfde998aa02ef982f4d5711c4bbf82fb7fe7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 28 May 2024 16:13:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8C2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QcCheckReportProductController.java | 18 ++++++------ .../quality/mapper/QcCheckTaskUserMapper.java | 5 +++- .../service/IQcCheckTaskUserService.java | 1 + .../impl/QcCheckReportProductServiceImpl.java | 1 + .../impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../impl/QcCheckTaskUserServiceImpl.java | 1 + .../QcCheckTaskWarehousingServiceImpl.java | 28 ++++++++++--------- .../quality/QcCheckTaskProduceMapper.xml | 2 +- .../mapper/quality/QcCheckTaskUserMapper.xml | 14 +++++++--- .../quality/QcCheckTaskWarehousingMapper.xml | 6 ++-- .../quality/QcCheckTypeProjectMapper.xml | 2 +- 11 files changed, 47 insertions(+), 33 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java index b9d7741f..d93a13a3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java @@ -43,15 +43,15 @@ public class QcCheckReportProductController extends BaseController { @GetMapping("/list") public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())) { - qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate() + " 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; - qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if (StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())) { +// qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate() + " 00:00:00");//start +// LocalDate date = LocalDate.now(); +// LocalDate dateEnd = date.plusDays(1); +// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; +// qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ // qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskUserMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskUserMapper.java index c6198381..12175c6b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskUserMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskUserMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.op.quality.domain.QcCheckTaskUser; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 来料检验任务--检查人Mapper接口 @@ -70,5 +71,7 @@ public interface QcCheckTaskUserMapper { public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo); - public int deleteQcCheckTaskUserByBelongTos(String[] belongToArray); + public int deleteQcCheckTaskUserByBelongTos(@Param("array") String[] belongToArray); + + public int deleteTaskDetailByBelongTos(@Param("array")String[] belongToArray); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskUserService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskUserService.java index 4daa64e3..f7aa7d9a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskUserService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskUserService.java @@ -72,4 +72,5 @@ public interface IQcCheckTaskUserService { public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo); public int insertQcCheckTaskUserPDA(List qcCheckTaskUserList); + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java index c37d1526..24149579 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java @@ -70,6 +70,7 @@ public class QcCheckReportProductServiceImpl implements IQcCheckReportProductSer public List selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome) { qcCheckReportIncome.setDelFlag("0"); qcCheckReportIncome.setTypeCode("product"); + qcCheckReportIncome.setCheckType("checkTypeCP"); return qcCheckReportIncomeMapper.selectQcCheckReportIncomeList(qcCheckReportIncome); } 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 f5b66fd4..bf423908 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 @@ -284,7 +284,7 @@ public class QcCheckTaskIncomeServiceImpl implements //发企业微信--------------------开始(跟班组无关) SysNoticeGroup noticeQo = new SysNoticeGroup(); noticeQo.setNoticeId(6L); - List notices = qcCheckTaskIncomeMapper.getNotices(noticeQo); + List notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo); if(!CollectionUtils.isEmpty(notices)) { List wecharts = new ArrayList<>(); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java index 569d6463..b3caf4b0 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java @@ -114,6 +114,7 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService { @Override @DS("#header.poolName") public int deleteQcCheckTaskUserByBelongTos(String[] belongToArray) { + qcCheckTaskUserMapper.deleteTaskDetailByBelongTos(belongToArray); return qcCheckTaskUserMapper.deleteQcCheckTaskUserByBelongTos(belongToArray); } 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 bbd458c1..25359878 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 @@ -163,18 +163,18 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin qctp.setTypeId(qcCheckTaskWarehousing.getCheckType());//生产过程检验 qctp.setMaterialCode(qcCheckTaskWarehousing.getMaterialCode());//特性 /**qc_check_type_project**/ - List items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp); - if(CollectionUtils.isEmpty(items)){ - /**qc_material_group_detail**/ - QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskWarehousing.getMaterialCode()); - if(group == null){ - group = new QcMaterialGroupDetail(); - group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组 - } - qctp.setGroupId(group.getGroupId());//共性 - List itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); - items.addAll(itemsGG); + List items = new ArrayList<>(); + List items0 = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);//个性 + items.addAll(items0); + /**qc_material_group_detail**/ + QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskWarehousing.getMaterialCode()); + if(group == null){ + group = new QcMaterialGroupDetail(); + group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组 } + qctp.setGroupId(group.getGroupId());//共性 + List itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); + items.addAll(itemsGG); /**qc_check_task_detail**/ if(CollectionUtils.isEmpty(items)){ @@ -270,6 +270,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin SysNoticeGroup noticeQo = new SysNoticeGroup(); if(qcCheckTaskWarehousing.getCheckType().equals("checkTypeCP")){ noticeQo.setNoticeId(7L);//成品检验 + }else if(qcCheckTaskWarehousing.getCheckType().equals("checkTypeCPPC")){ + noticeQo.setNoticeId(12L);//批次成品检验 } List notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo); @@ -286,11 +288,11 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin wechart0.setText(contentInfo); wecharts.add(wechart0); } - logger.info("来料检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); + logger.info("成品检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); if (!CollectionUtils.isEmpty(wecharts)) { new Thread(() -> { AjaxResult wxresult = remoteOpenService.sendWeChartMessage(wecharts); - logger.info("来料检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult)); + logger.info("成品检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult)); }).start(); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 4532ba4a..d565954d 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -440,7 +440,7 @@ or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120)) - - delete from qc_check_task_user where belong_to in - + + update qc_check_task_user set del_flag = '1' where belong_to in + #{belongTo} - + + + update qc_check_task_detail set del_flag = '1' where belong_to in + + #{belongTo} + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml index d6c957ca..b908780a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml @@ -223,10 +223,10 @@ delete from qc_check_task where record_id = #{recordId} - - delete from qc_check_task where record_id in + + update qc_check_task set del_flag = '1' where record_id in #{recordId} - + 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 1403d928..36c89b45 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 @@ -122,7 +122,7 @@ 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 = '1' + where qctp.del_flag = '0' and qctp.status = '1' and qcp.del_flag='0' and qctp.group_id = #{groupId} and qctp.type_id = #{typeId} order by qctp.sort