From adbf632d7475b32ee505c133a5d0e73b9b4202c8 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 8 Mar 2024 23:37:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E4=BC=9A?= =?UTF-8?q?=E5=A4=9A=E4=B8=80=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/open/service/impl/OpenServiceImpl.java | 4 ---- .../resources/mapper/quality/QcCheckTaskProduceMapper.xml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) 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 85ad36a0..146764e9 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 @@ -391,10 +391,6 @@ public class OpenServiceImpl implements OpenService { } /**qc_check_task**/ - if("checkTypeSCXJ".equals(qcCheckTaskProduce.getCheckType())){ - //巡检要求8-20点准点产生巡检任务。要求8点之前开始生产，那么第一条上位机触发的就当成模板 - qcCheckTaskProduce.setDelFlag("1"); - } qcCheckTaskProduce.setRecordId(beLongId); qcCheckTaskProduce.setFactoryCode(factoryCode); qcCheckTaskProduce.setCreateTime(nowDate); 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 ff5c6770..28de20ad 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 @@ -179,7 +179,7 @@ qct.confirm_man_name confirmManName from qc_check_task qct left join pro_order_workorder pow on qct.order_no = pow.workorder_code - where qct.check_type = 'checkTypeSCXJ' + where qct.check_type = 'checkTypeSCXJ' and qct.del_flag = '0' and pow.del_flag = '0' and CONVERT(varchar(10),income_time, 120) = CONVERT(varchar(10),GETDATE(), 120) and pow.status = 'w2' and pow.parent_order = '0'