rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PQC上传校验和暂存参数修改

This commit is contained in:
yf001217 2026-06-03 10:35:02 +08:00
parent c354a94d9f
commit 608d2ccce8
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
View File

@ -117,21 +117,21 @@ public class QmsPqcTaskRecordControllerService {
.setTaskId(taskRecord.getId()) .setTaskId(taskRecord.getId())
.setInspectionPointItemId(item.getId()) .setInspectionPointItemId(item.getId())
.setType((short) 0) .setType((short) 0)
.setSelfCheck(false)); .setSelfCheck(null));
// 类型1：关键物料拍照 // 类型1：关键物料拍照
details.add(new QmsPqcTaskRecordDetails() details.add(new QmsPqcTaskRecordDetails()
.setTaskId(taskRecord.getId()) .setTaskId(taskRecord.getId())
.setInspectionPointItemId(item.getId()) .setInspectionPointItemId(item.getId())
.setType((short) 1) .setType((short) 1)
.setSelfCheck(false)); .setSelfCheck(null));
} else { } else {
// 其他类型，直接创建 // 其他类型，直接创建
details.add(new QmsPqcTaskRecordDetails() details.add(new QmsPqcTaskRecordDetails()
.setTaskId(taskRecord.getId()) .setTaskId(taskRecord.getId())
.setInspectionPointItemId(item.getId()) .setInspectionPointItemId(item.getId())
.setType(item.getInspectionType() != null ? item.getInspectionType().shortValue() : null) .setType(item.getInspectionType() != null ? item.getInspectionType().shortValue() : null)
.setSelfCheck(false)); .setSelfCheck(null));
} }
} }
@ -1094,7 +1094,7 @@ public class QmsPqcTaskRecordControllerService {
QmsPqcTaskRecordDraftQO.ProcessInspectionItem item = request.getProcessInspections().get(i); QmsPqcTaskRecordDraftQO.ProcessInspectionItem item = request.getProcessInspections().get(i);
QmsPqcTaskRecordDetails detail = type0Details.get(i); QmsPqcTaskRecordDetails detail = type0Details.get(i);
QmsPqcInspectionPointItems pointItem = itemMap.get(detail.getInspectionPointItemId()); QmsPqcInspectionPointItems pointItem = itemMap.get(detail.getInspectionPointItemId());
if (pointItem == null || !Boolean.TRUE.equals(detail.getSelfCheck())) { if (pointItem == null || !Boolean.TRUE.equals(item.getSelfCheck())) {
continue; continue;
} }
if (Objects.equals(pointItem.getInspectionMethods(), 2) && StrUtil.isBlank(item.getSelfTestData())) { if (Objects.equals(pointItem.getInspectionMethods(), 2) && StrUtil.isBlank(item.getSelfTestData())) {
@ -1127,6 +1127,10 @@ public class QmsPqcTaskRecordControllerService {
QmsPqcTaskRecordDraftQO.ProcessInspectionLevel3Item item = request.getProcessInspectionsLevel3().get(i); QmsPqcTaskRecordDraftQO.ProcessInspectionLevel3Item item = request.getProcessInspectionsLevel3().get(i);
if (item.getEnable() == null) { if (item.getEnable() == null) {
emptyFields.add("processInspectionsLevel3[" + i + "].enable"); emptyFields.add("processInspectionsLevel3[" + i + "].enable");
continue;
}
if (Objects.equals(item.getInspectionMethods(), 2) && StrUtil.isBlank(item.getQcTestData())) {
emptyFields.add("processInspectionsLevel3[" + i + "].qcTestData");
} }
} }
} }
@ -1169,7 +1173,7 @@ public class QmsPqcTaskRecordControllerService {
.setType((short) 1) .setType((short) 1)
.setInspectionPointItemId(i < type1ItemIds.size() ? type1ItemIds.get(i) : null) .setInspectionPointItemId(i < type1ItemIds.size() ? type1ItemIds.get(i) : null)
.setSelfTestData(item.getSerialNo()) .setSelfTestData(item.getSerialNo())
.setSelfCheck(item.getFiles() != null && !item.getFiles().isEmpty()) .setSelfCheck(item.getFiles() != null && !item.getFiles().isEmpty() ? true : null)
.setReviewData(item.getBatchNo()) .setReviewData(item.getBatchNo())
.setSelfTestAttachments(serializeFileList(item.getFiles())) .setSelfTestAttachments(serializeFileList(item.getFiles()))
.setSelfTestUploadTime(now); .setSelfTestUploadTime(now);
@ -1186,8 +1190,7 @@ public class QmsPqcTaskRecordControllerService {
.setType((short) 0) .setType((short) 0)
.setInspectionPointItemId(i < type0ItemIds.size() ? type0ItemIds.get(i) : null) .setInspectionPointItemId(i < type0ItemIds.size() ? type0ItemIds.get(i) : null)
.setSelfTestData(item.getSelfTestData()) .setSelfTestData(item.getSelfTestData())
.setSelfCheck(StrUtil.isNotBlank(item.getSelfTestData()) .setSelfCheck(item.getSelfCheck())
|| (item.getSelfTestFiles() != null && !item.getSelfTestFiles().isEmpty()))
.setReviewData(item.getReviewData()) .setReviewData(item.getReviewData())
.setReviewEnable(item.getEnable()) .setReviewEnable(item.getEnable())
.setSelfTestAttachments(serializeFileList(item.getSelfTestFiles())) .setSelfTestAttachments(serializeFileList(item.getSelfTestFiles()))
@ -1209,7 +1212,7 @@ public class QmsPqcTaskRecordControllerService {
.setTaskId(taskId) .setTaskId(taskId)
.setType((short) 0) .setType((short) 0)
.setInspectionPointItemId(idx < type0ItemIds.size() ? type0ItemIds.get(idx) : null) .setInspectionPointItemId(idx < type0ItemIds.size() ? type0ItemIds.get(idx) : null)
.setSelfCheck(false) .setSelfCheck(null)
.setReviewEnable(item.getEnable()); .setReviewEnable(item.getEnable());
if (hasReviewContent) { if (hasReviewContent) {
detail.setReviewData(item.getQcTestData()) detail.setReviewData(item.getQcTestData())
@ -1353,7 +1356,7 @@ public class QmsPqcTaskRecordControllerService {
.setTaskId(repairTask.getId()) .setTaskId(repairTask.getId())
.setInspectionPointItemId(old.getInspectionPointItemId()) .setInspectionPointItemId(old.getInspectionPointItemId())
.setType(old.getType()) .setType(old.getType())
.setSelfCheck(false); .setSelfCheck(null);
if (old.getType() != null && old.getType() == 1) { if (old.getType() != null && old.getType() == 1) {
// 关键物料采集：全部复制 // 关键物料采集：全部复制

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordDraftQO.java
View File

@ -116,6 +116,11 @@ public class QmsPqcTaskRecordDraftQO {
*/ */
private String selfTestData; private String selfTestData;
/**
* 是否自检
*/
private Boolean selfCheck;
/** /**
* 复核数据 * 复核数据
*/ */