From 7e524978f1770bacd4424f81c790d536b6f453bc Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 23 Apr 2024 17:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=89=8B=E6=8C=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/open/service/impl/OpenServiceImpl.java | 1 + .../op/quality/domain/QcCheckTypeProject.java | 9 +++ .../QcCheckTaskWarehousingServiceImpl.java | 3 +- .../quality/QcCheckTaskProduceMapper.xml | 4 +- .../quality/QcCheckTypeProjectMapper.xml | 59 ++++++------------- 5 files changed, 31 insertions(+), 45 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 effe61eaa..645599f96 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 @@ -306,6 +306,7 @@ public class OpenServiceImpl implements OpenService { // 1分钟不允许存在两条 Date lastData = openMapper.getLastTask(qcCheckTaskProduce); if(this.oneMinHas(lastData)){ + logger.info("【重复创建首检任务】orderNo:"+qcCheckTaskProduce.getOrderNo()+";"+"incomeBatchNo:"+qcCheckTaskProduce.getIncomeBatchNo()); return 0; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java index 02865dab2..508ff2982 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java @@ -110,6 +110,15 @@ public class QcCheckTypeProject extends BaseEntity { private String checkTool; private String checkMode; private String unit; + private String weight; + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } public String getUnit() { return unit; 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 0d5d4cbbd..395d72488 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 @@ -106,7 +106,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin * @return 结果 */ @Override - @Transactional(rollbackFor = Exception.class) + //@Transactional(rollbackFor = Exception.class)不能加 + @DS("#header.poolName") public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing) { if(StringUtils.isNotBlank(qcCheckTaskWarehousing.getFactoryCode())){ 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 4d815eac0..bd864332f 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 @@ -434,8 +434,8 @@ left join base_equipment be on be.equipment_code = pow.workorder_name and be.equipment_type_code = 'equ_type_bzx' where pow.del_flag = '0' and pow.status = 'w2' and pow.parent_order = '0' - and (pow.product_date = CONVERT(varchar(10),GETDATE(), 120) - or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120)) + SELECT - ctp.id, - ctp.project_no, - ctp.project_id, - cp.rule_name, - cp.property_code, - cp.unit_code unit, - ctp.type_id, - ctp.standard_value, - ctp.upper_diff, - ctp.down_diff, - ctp.sample, - ctp.status, - ctp.create_by, - ctp.create_time, - ctp.update_by, - ctp.update_time, - ctp.factory_code, - ctp.del_flag, - ctp.group_id, - ctp.material_code, - ctp.sample_num, - ctp.sort + ctp.id,ctp.project_no,ctp.project_id, + cp.rule_name,cp.property_code,cp.unit_code unit,ctp.type_id, + ctp.standard_value,ctp.upper_diff,ctp.down_diff,ctp.sample,ctp.status, + ctp.create_by, ctp.create_time,ctp.update_by,ctp.update_time, + ctp.factory_code, ctp.del_flag,ctp.group_id,ctp.material_code,ctp.sample_num,ctp.sort FROM qc_check_type_project ctp LEFT JOIN qc_check_project cp ON ctp.project_id = cp.id @@ -85,26 +69,16 @@