From 0ccb32d068c93b86ad303c51ee0da65084426b93 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 21 Dec 2023 10:11:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=B4=A8=E6=A3=80qc=5Fst?= =?UTF-8?q?atus=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 6 +++--- .../resources/mapper/quality/QcCheckUnqualifiedMapper.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 f56e54c4a..60bb70ec9 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 @@ -285,8 +285,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { n = qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce); - /**pro_order_workorder-->status->w5**/ - qcCheckTaskIncome.setStatus("w5"); + /**pro_order_workorder-->qc_status->2**/ + qcCheckTaskIncome.setStatus("2"); qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome); }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ QcCheckTaskWarehousing warehousing = new QcCheckTaskWarehousing(); @@ -414,7 +414,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome); }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ /**pro_order_workorder-->status->w5**/ - qcCheckTaskIncome.setStatus("w5"); + qcCheckTaskIncome.setStatus("2"); qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome); }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ 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 12c5f80f1..ffa96336b 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 @@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where order_no = #{orderNo} - update pro_order_workorder set status = #{status} where workorder_code_sap = #{orderNo} + update pro_order_workorder set qc_status = #{status} where workorder_code_sap = #{orderNo} From e9528b28dac32a8748f7c05bd223c60a73b51b67 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 21 Dec 2023 10:25:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=B4=A8=E6=A3=80qc=5Fst?= =?UTF-8?q?atus=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/mapper/QcCheckUnqualifiedMapper.java | 2 +- .../service/impl/QcCheckTaskIncomeServiceImpl.java | 8 ++++---- .../resources/mapper/quality/QcCheckUnqualifiedMapper.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) 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 f39cdaeb5..7d8aac35a 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 @@ -79,5 +79,5 @@ public interface QcCheckUnqualifiedMapper { List getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); - int updateWorkOrderStatus(QcCheckTaskIncome qcCheckTaskIncome); + int updateWorkOrderBatchStatus(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 60bb70ec9..216c7d435 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 @@ -285,9 +285,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { n = qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce); - /**pro_order_workorder-->qc_status->2**/ + /**pro_order_workorder_batch-->qc_status->2**/ qcCheckTaskIncome.setStatus("2"); - qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome); + qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome); }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ QcCheckTaskWarehousing warehousing = new QcCheckTaskWarehousing(); warehousing.setCheckStatus("2"); @@ -413,9 +413,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2"); qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome); }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ - /**pro_order_workorder-->status->w5**/ + /**pro_order_workorder_batch-->status->w5**/ qcCheckTaskIncome.setStatus("2"); - qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome); + qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome); }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ } 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 ffa96336b..3001405b3 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 @@ -186,8 +186,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update wms_raw_order_in set quality_status = #{checkResult} where order_no = #{orderNo} - - update pro_order_workorder set qc_status = #{status} where workorder_code_sap = #{orderNo} + + update pro_order_workorder_batch set qc_stauts = #{status} where batch_code = #{incomeBatchNo} From 245301f4f868ac77d99834d8e89cd9a7426d0800 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 21 Dec 2023 10:31:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=B4=A8=E6=A3=80qc=5Fst?= =?UTF-8?q?atus=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3001405b3..6696008bb 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 @@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where order_no = #{orderNo} - update pro_order_workorder_batch set qc_stauts = #{status} where batch_code = #{incomeBatchNo} + update pro_order_workorder_batch set qc_status = #{status} where batch_code = #{incomeBatchNo}