From d4f5d5e9e98e515f62b43af9cc3d7300d6022cb8 Mon Sep 17 00:00:00 2001
From: angus liu <“yixin1@foreverwin.com.cn”>
Date: Wed, 25 Dec 2024 17:26:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20IQC=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=89=B9=E5=85=B3=E8=81=94qms=5Fiqc=5Finspec?=
 =?UTF-8?q?=5Fdata=5Fsource=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iep/qms/service/impl/QmsInspecJobServiceImpl.java          | 3 ++-
 qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
index 0e927b5..ae8eb1c 100644
--- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
+++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
@@ -1209,8 +1209,9 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
             inspecJobExtend.setSupplierBatch(qmsIqcInspecDataSource.getSupplierBatch());
             // 设置原检验任务号
             inspecJobExtend.setOriginalJobNo(inspecJob.getJobNo());
-            // 检验批
+            // 创建检验任务
             QmsInspecJob qmsInspecJobNew = createInspecJob(inspecJobExtend, qmsIqcInspecDataSource.getInspectionBatch());
+            // 更新检验任务号
             qmsIqcInspecDataSource.setJobNo(qmsInspecJobNew.getJobNo());
             qmsIqcInspecDataSourceService.saveOrUpdate(qmsIqcInspecDataSource);
             qcFreq = "RETEST";//用于当检验任务需要重验时，新建相同属性检验任务后，将原检验任务QcFreq改为RETEST ,只有此处会修改值，其他的保留原样，即更新时还是原值
diff --git a/qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml b/qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml
index 2badddc..31db716 100644
--- a/qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml
+++ b/qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml
@@ -538,7 +538,7 @@
         ,am.ABN_NO, am.STATUS abn_status, am.CURRENT_RESPONSIBLE
         ,qiids.PURCHASE_NO ,qiids.SUPPLIER_NO ,qiids.SUPPLIER_BATCH,qiids.INSPECT_LEVEL
         from qms_inspec_job qij
-        join qms_iqc_inspec_data_source qiids on qij.SITE = qiids.SITE and qij.INSPEC_TYPE = qiids.INSPEC_TYPE and qij.JOB_NO = qiids.JOB_NO
+        join qms_iqc_inspec_data_source qiids on qij.SITE = qiids.SITE and qij.INSPEC_TYPE = qiids.INSPEC_TYPE and qij.INSPECTION_BATCH = qiids.INSPECTION_BATCH
         join qms_qc_plan qqp on qij.QC_PLAN_BO = qqp.handle
         join item i on qiids.ITEM_BO = i.HANDLE
         left join abn_master am on qij.handle = am.INSPEC_JOB_BO