diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 6632e4f3..e4d93998 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -4287,6 +4287,7 @@ public class QcServiceImpl implements QcService {
public void cancelApproval2(QcFAIRecordData data) {
if ("fai".equals(data.getType())) {
for (QcFAIRecordData qcData : data.getSubmitList()) {
+ qcData.setUpdateBy(data.getUpdateBy());
// 状态改为待检验,并将提交标识改为N
qcMapper.updateFAIMasterSubmitFlag2(qcData);
qcMapper.updateFAIDetailSubmitFlag2(qcData);
@@ -4294,18 +4295,21 @@ public class QcServiceImpl implements QcService {
}
} else if ("ipqc".equals(data.getType())) {
for (QcFAIRecordData qcData : data.getSubmitList()) {
+ qcData.setUpdateBy(data.getUpdateBy());
qcMapper.updateIPQCMasterSubmitFlag2(qcData);
qcMapper.updateIPQCDetailSubmitFlag2(qcData);
qcMapper.updateIPQCSubDetailSubmitFlag2(qcData);
}
} else if ("fqc".equals(data.getType())) {
for (QcFAIRecordData qcData : data.getSubmitList()) {
+ qcData.setUpdateBy(data.getUpdateBy());
qcMapper.updateFQCMasterSubmitFlag2(qcData);
qcMapper.updateFQCDetailSubmitFlag2(qcData);
qcMapper.updateFQCSubDetailSubmitFlag2(qcData);
}
} else if ("pqc".equals(data.getType())) {
for (QcFAIRecordData qcData : data.getSubmitList()) {
+ qcData.setUpdateBy(data.getUpdateBy());
qcMapper.updatePQCMasterSubmitFlag2(qcData);
qcMapper.updatePQCDetailSubmitFlag2(qcData);
qcMapper.updatePQCSubDetailSubmitFlag2(qcData);
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index ee223359..dbf66cd6 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -4030,7 +4030,9 @@
UPDATE qc_iqc_record
SET submit_flag = 'N',
- state = '待检验'
+ state = '待检验',
+ cancel_check_by = #{updateBy},
+ cancel_check_date = getDate()
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
@@ -4049,7 +4051,9 @@
UPDATE qc_fai_record
SET submit_flag = 'N',
- state = '待检验'
+ state = '待检验',
+ cancel_check_by = #{updateBy},
+ cancel_check_date = getDate()
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
@@ -4068,7 +4072,9 @@
UPDATE qc_ipqc_record
SET submit_flag = 'N',
- state = '待检验'
+ state = '待检验',
+ cancel_check_by = #{updateBy},
+ cancel_check_date = getDate()
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
@@ -4087,7 +4093,9 @@
UPDATE qc_fqc_record
SET submit_flag = 'N',
- state = '待检验'
+ state = '待检验',
+ cancel_check_by = #{updateBy},
+ cancel_check_date = getDate()
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
@@ -4106,7 +4114,9 @@
UPDATE qc_pqc_record
SET submit_flag = 'N',
- state = '待检验'
+ state = '待检验',
+ cancel_check_by = #{updateBy},
+ cancel_check_date = getDate()
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}