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

pqc检测任务修改

This commit is contained in:
yf001217 2026-06-10 11:43:22 +08:00
parent 369a886137
commit dbc31f4cc1
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -546,6 +546,7 @@ public class QmsPqcTaskRecordControllerService {
if (isDetailType(detail, 1)) {
// 关键物料拍照
QmsPqcTaskRecordRepairSelfVO.MaterialCollectionVO materialVO = new QmsPqcTaskRecordRepairSelfVO.MaterialCollectionVO();
materialVO.setInspectionPointItemId(detail.getInspectionPointItemId());
materialVO.setSerialNo(detail.getSelfTestData());
materialVO.setBatchNo(detail.getReviewData());
materialVO.setFiles(convertToFileVO(parseFileList(detail.getSelfTestAttachments()),
@ -556,6 +557,7 @@ public class QmsPqcTaskRecordControllerService {
} else if (isDetailType(detail, 0)) {
// 工序检查
QmsPqcTaskRecordRepairSelfVO.ProcessInspectionVO processVO = new QmsPqcTaskRecordRepairSelfVO.ProcessInspectionVO();
processVO.setInspectionPointItemId(detail.getInspectionPointItemId());
processVO.setInspectionContent(item.getInspectionContent());
processVO.setInspectionMethods(item.getInspectionMethods());
processVO.setInspectionLevel(item.getInspectionLevel());
@ -574,6 +576,7 @@ public class QmsPqcTaskRecordControllerService {
vo.setTaskNo(taskRecord.getTaskNo());
vo.setStepName(point.getStepName());
vo.setInspectionPointName(point.getInspectionPointName());
vo.setInspectionPointId(taskRecord.getInspectionPointId());
vo.setAufnr(taskRecord.getAufnr());
vo.setRuleVersion(rule != null ? rule.getRuleVersion() : null);
vo.setNo(taskRecord.getNo());
@ -638,6 +641,7 @@ public class QmsPqcTaskRecordControllerService {
if (isDetailType(detail, 1)) {
// 关键物料拍照
QmsPqcTaskRecordReviewVO.MaterialCollectionVO materialVO = new QmsPqcTaskRecordReviewVO.MaterialCollectionVO();
materialVO.setInspectionPointItemId(detail.getInspectionPointItemId());
materialVO.setSerialNo(detail.getSelfTestData());
materialVO.setBatchNo(detail.getReviewData());
materialVO.setFiles(convertToFileVO(parseFileList(detail.getSelfTestAttachments()),
@ -654,6 +658,7 @@ public class QmsPqcTaskRecordControllerService {
if (isSelfInspectionLevel(item)) {
// 星级1和2：复核用
QmsPqcTaskRecordReviewVO.ProcessInspectionVO processVO = new QmsPqcTaskRecordReviewVO.ProcessInspectionVO();
processVO.setInspectionPointItemId(detail.getInspectionPointItemId());
processVO.setInspectionContent(item.getInspectionContent());
processVO.setInspectionMethods(item.getInspectionMethods());
processVO.setInspectionLevel(item.getInspectionLevel());
@ -671,6 +676,7 @@ public class QmsPqcTaskRecordControllerService {
} else if (isQcInspectionLevel(item)) {
// 星级3：检测用
QmsPqcTaskRecordReviewVO.ProcessInspectionLevel3VO processVO = new QmsPqcTaskRecordReviewVO.ProcessInspectionLevel3VO();
processVO.setInspectionPointItemId(detail.getInspectionPointItemId());
processVO.setInspectionContent(item.getInspectionContent());
processVO.setInspectionMethods(item.getInspectionMethods());
processVO.setInspectionLevel(item.getInspectionLevel());
@ -692,6 +698,7 @@ public class QmsPqcTaskRecordControllerService {
vo.setTaskNo(taskRecord.getTaskNo());
vo.setStepName(point.getStepName());
vo.setInspectionPointName(point.getInspectionPointName());
vo.setInspectionPointId(taskRecord.getInspectionPointId());
vo.setAufnr(taskRecord.getAufnr());
vo.setRuleVersion(rule != null ? rule.getRuleVersion() : null);
vo.setNo(taskRecord.getNo());

15
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTaskRecordRepairSelfVO.java
View File

@ -26,6 +26,11 @@ public class QmsPqcTaskRecordRepairSelfVO {
*/
private String inspectionPointName;
/**
* 检查点ID
*/
private Long inspectionPointId;
/**
* 生产订单号
*/
@ -74,6 +79,11 @@ public class QmsPqcTaskRecordRepairSelfVO {
/**
* 序列号
*/
/**
* 检测项ID
*/
private Long inspectionPointItemId;
private String serialNo;
/**
@ -105,6 +115,11 @@ public class QmsPqcTaskRecordRepairSelfVO {
/**
* 检查内容
*/
/**
* 检测项ID
*/
private Long inspectionPointItemId;
private String inspectionContent;
/**

20
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTaskRecordReviewVO.java
View File

@ -26,6 +26,11 @@ public class QmsPqcTaskRecordReviewVO {
*/
private String inspectionPointName;
/**
* 检查点ID
*/
private Long inspectionPointId;
/**
* 生产订单号
*/
@ -84,6 +89,11 @@ public class QmsPqcTaskRecordReviewVO {
/**
* 序列号
*/
/**
* 检测项ID
*/
private Long inspectionPointItemId;
private String serialNo;
/**
@ -115,6 +125,11 @@ public class QmsPqcTaskRecordReviewVO {
/**
* 检查内容
*/
/**
* 检测项ID
*/
private Long inspectionPointItemId;
private String inspectionContent;
/**
@ -176,6 +191,11 @@ public class QmsPqcTaskRecordReviewVO {
/**
* 检查内容
*/
/**
* 检测项ID
*/
private Long inspectionPointItemId;
private String inspectionContent;
/**