mes/nalinv-qms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: IQC检验任务，修改检验任务查询逻辑，通过检验批关联qms_iqc_inspec_data_source表

Browse Source
This commit is contained in:
angus liu 2024-12-25 17:26:07 +08:00
parent 9422fa4979
commit d4f5d5e9e9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
View File

@ -1209,8 +1209,9 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
inspecJobExtend.setSupplierBatch(qmsIqcInspecDataSource.getSupplierBatch()); inspecJobExtend.setSupplierBatch(qmsIqcInspecDataSource.getSupplierBatch());
// 设置原检验任务号 // 设置原检验任务号
inspecJobExtend.setOriginalJobNo(inspecJob.getJobNo()); inspecJobExtend.setOriginalJobNo(inspecJob.getJobNo());
// 检验批 // 创建检验任务
QmsInspecJob qmsInspecJobNew = createInspecJob(inspecJobExtend, qmsIqcInspecDataSource.getInspectionBatch()); QmsInspecJob qmsInspecJobNew = createInspecJob(inspecJobExtend, qmsIqcInspecDataSource.getInspectionBatch());
// 更新检验任务号
qmsIqcInspecDataSource.setJobNo(qmsInspecJobNew.getJobNo()); qmsIqcInspecDataSource.setJobNo(qmsInspecJobNew.getJobNo());
qmsIqcInspecDataSourceService.saveOrUpdate(qmsIqcInspecDataSource); qmsIqcInspecDataSourceService.saveOrUpdate(qmsIqcInspecDataSource);
qcFreq = "RETEST";//用于当检验任务需要重验时，新建相同属性检验任务后，将原检验任务QcFreq改为RETEST ,只有此处会修改值，其他的保留原样，即更新时还是原值 qcFreq = "RETEST";//用于当检验任务需要重验时，新建相同属性检验任务后，将原检验任务QcFreq改为RETEST ,只有此处会修改值，其他的保留原样，即更新时还是原值

2
qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml
View File

@ -538,7 +538,7 @@
,am.ABN_NO, am.STATUS abn_status, am.CURRENT_RESPONSIBLE ,am.ABN_NO, am.STATUS abn_status, am.CURRENT_RESPONSIBLE
,qiids.PURCHASE_NO ,qiids.SUPPLIER_NO ,qiids.SUPPLIER_BATCH,qiids.INSPECT_LEVEL ,qiids.PURCHASE_NO ,qiids.SUPPLIER_NO ,qiids.SUPPLIER_BATCH,qiids.INSPECT_LEVEL
from qms_inspec_job qij 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 qms_qc_plan qqp on qij.QC_PLAN_BO = qqp.handle
join item i on qiids.ITEM_BO = i.HANDLE join item i on qiids.ITEM_BO = i.HANDLE
left join abn_master am on qij.handle = am.INSPEC_JOB_BO left join abn_master am on qij.handle = am.INSPEC_JOB_BO