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

feat(IQC检验任务判定作业):MES-FW-FDS-QMS03-03-IQC检验任务判定作业-V1.0.docx

Browse Source 
1.重验时，带入供应商&供应商批号要因

refs: #16314
This commit is contained in:
Paul 2023-09-20 17:34:07 +08:00
parent 91fd307e54
commit f688c656bc
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qms-api/src/main/java/com/foreverwin/iep/qms/constant/Factor.java
View File

@ -10,4 +10,6 @@ public class Factor {
public static final String EQUIPMENT = "Equipment";
public static final String INSTRUMENT = "Instrument";
public static final String MATERIAL = "Material";
public static final String SUPPLIER = "Supplier";
public static final String SUPPLIER_BATCH = "SupplierBatch";
}

3
qms-api/src/main/java/com/foreverwin/iep/qms/domain/InspecJob.java
View File

@ -75,4 +75,7 @@ public class InspecJob {
*/
private String originalJobNo;
private String supplier;
private String supplierBatch;
}

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

@ -313,6 +313,8 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
String targetBo = inspecJob.getTargetBo();
String item = inspecJob.getItem();
String originalJobNo = inspecJob.getOriginalJobNo();
String supplier = inspecJob.getSupplier();
String supplierBatch = inspecJob.getSupplierBatch();
BigDecimal populationQty = inspecJob.getPopulationQty();
QmsQcPlan qmsQcPlan = qmsQcPlanService.getCurrentFullById(qcPlan);
@ -395,6 +397,12 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
case Factor.EQUIPMENT:
qmsInspecFactor.setValue(resrce);
break;
case Factor.SUPPLIER:
qmsInspecFactor.setValue(supplier);
break;
case Factor.SUPPLIER_BATCH:
qmsInspecFactor.setValue(supplierBatch);
break;
}
qmsInspecFactors.add(qmsInspecFactor);
});
@ -847,6 +855,8 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
job.setTargetBo(qmsInspecJob.getTargetBo());
job.setItem(wmsReceiptDetailDTO.getData().getItem());
job.setInspecType("1");
job.setSupplier(HandleBoProcessor.trimHandle(wmsReceiptDetailDTO.getData().getSupplierBasisBo()));
job.setSupplierBatch(wmsReceiptDetailDTO.getData().getSupplierBatch());
//旧的检验任务的母体数 – 退回数量 – 破坏数量 – 留样数量
job.setPopulationQty(qmsInspecJob.getPopulationQty()
.subtract(returnQty)