|
|
@ -3624,12 +3624,6 @@ public class QcServiceImpl implements QcService { |
|
|
data.setReleaseFlag("Y"); |
|
|
data.setReleaseFlag("Y"); |
|
|
data.setReleaseBy(user != null && StringUtils.isNotBlank(user.getUsername()) ? user.getUsername() : ""); |
|
|
data.setReleaseBy(user != null && StringUtils.isNotBlank(user.getUsername()) ? user.getUsername() : ""); |
|
|
} else { // 最终检验完成 |
|
|
} else { // 最终检验完成 |
|
|
QcFAIRecordData current = qcMapper.selectFQCReleaseState(data); |
|
|
|
|
|
if (current != null && "Y".equalsIgnoreCase(StringUtils.trimToEmpty(current.getReleaseFlag()))) { |
|
|
|
|
|
data.setState("待审核"); |
|
|
|
|
|
qcMapper.updateFQCStateOnly(data); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
data.setState("待审核"); |
|
|
data.setState("待审核"); |
|
|
} |
|
|
} |
|
|
qcMapper.updateFQCMasterRecord(data); |
|
|
qcMapper.updateFQCMasterRecord(data); |
|
|
@ -3678,7 +3672,12 @@ public class QcServiceImpl implements QcService { |
|
|
refInfo2 = stored.getRefInfo2(); |
|
|
refInfo2 = stored.getRefInfo2(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if(StringUtils.isNotBlank(refInfo1) && StringUtils.isNotBlank(refInfo2)){ |
|
|
|
|
|
|
|
|
boolean alreadyReleased = false; |
|
|
|
|
|
if (!tempRelease && !"1".equals(data.getType())) { |
|
|
|
|
|
QcFAIRecordData current = qcMapper.selectFQCReleaseState(data); |
|
|
|
|
|
alreadyReleased = current != null && "Y".equalsIgnoreCase(StringUtils.trimToEmpty(current.getReleaseFlag())); |
|
|
|
|
|
} |
|
|
|
|
|
if (!alreadyReleased && StringUtils.isNotBlank(refInfo1) && StringUtils.isNotBlank(refInfo2)) { |
|
|
inspectService.inspectForQMS(data.getSite(),refInfo1,Integer.parseInt(refInfo2),"submit",data.getInspectionResult(),data.getInspectionRemark(),user.getUsername()); |
|
|
inspectService.inspectForQMS(data.getSite(),refInfo1,Integer.parseInt(refInfo2),"submit",data.getInspectionResult(),data.getInspectionRemark(),user.getUsername()); |
|
|
} |
|
|
} |
|
|
if (!tempRelease) { |
|
|
if (!tempRelease) { |
|
|
@ -3704,7 +3703,9 @@ public class QcServiceImpl implements QcService { |
|
|
qcMapper.updateFQCDetailSubmitFlag(qcData); |
|
|
qcMapper.updateFQCDetailSubmitFlag(qcData); |
|
|
// 修改子明细记录标识为已提交 |
|
|
// 修改子明细记录标识为已提交 |
|
|
qcMapper.updateFQCSubDetailSubmitFlag(qcData); |
|
|
qcMapper.updateFQCSubDetailSubmitFlag(qcData); |
|
|
if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){ |
|
|
|
|
|
|
|
|
QcFAIRecordData releaseState = qcMapper.selectFQCReleaseState(qcData); |
|
|
|
|
|
boolean alreadyReleased = releaseState != null && "Y".equalsIgnoreCase(StringUtils.trimToEmpty(releaseState.getReleaseFlag())); |
|
|
|
|
|
if (!alreadyReleased && StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){ |
|
|
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "submit", getQmsInspectResult(qcData), qcData.getInspectionRemark(), currentUser.getUsername()); |
|
|
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "submit", getQmsInspectResult(qcData), qcData.getInspectionRemark(), currentUser.getUsername()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|