|
|
|
@ -5231,8 +5231,39 @@ public class QcServiceImpl implements QcService { |
|
|
|
params.add(username); |
|
|
|
params.add(username); |
|
|
|
List<Map<String, Object>> resultList = procedureDao.getProcedureData("new_ERPPOInspect", params); |
|
|
|
assertErpProcedureSuccess(resultList, "ERP采购检验同步失败,未返回结果"); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* IQC取消审核最后调用ERP采购检验冲销存储过程 Reverse_ERPPOInspect |
|
|
|
*/ |
|
|
|
private void callReverseERPPOInspect(QcFAIRecordData recordData, SysUserEntity currentUser) { |
|
|
|
if (StringUtils.isBlank(recordData.getReceiptNo()) || StringUtils.isBlank(recordData.getReceiptItemNo())) { |
|
|
|
return; |
|
|
|
} |
|
|
|
int receiptItemNo; |
|
|
|
try { |
|
|
|
receiptItemNo = Integer.parseInt(recordData.getReceiptItemNo().trim()); |
|
|
|
} catch (NumberFormatException e) { |
|
|
|
throw new XJException("ERP接收单序号无效:" + recordData.getReceiptItemNo()); |
|
|
|
} |
|
|
|
String username = currentUser != null && StringUtils.isNotBlank(currentUser.getUsername()) |
|
|
|
? currentUser.getUsername() |
|
|
|
: (recordData.getUpdateBy() == null ? "" : recordData.getUpdateBy()); |
|
|
|
List<Object> params = new ArrayList<>(); |
|
|
|
params.add(recordData.getSite() == null ? "" : recordData.getSite()); |
|
|
|
params.add(recordData.getInspectionNo() == null ? "" : recordData.getInspectionNo()); |
|
|
|
params.add(recordData.getBuNo() == null ? "" : recordData.getBuNo()); |
|
|
|
params.add(recordData.getReceiptNo()); |
|
|
|
params.add(receiptItemNo); |
|
|
|
params.add(username); |
|
|
|
List<Map<String, Object>> resultList = procedureDao.getProcedureData("Reverse_ERPPOInspect", params); |
|
|
|
assertErpProcedureSuccess(resultList, "ERP采购检验撤销失败,未返回结果"); |
|
|
|
} |
|
|
|
|
|
|
|
private void assertErpProcedureSuccess(List<Map<String, Object>> resultList, String emptyMessage) { |
|
|
|
if (resultList == null || resultList.isEmpty()) { |
|
|
|
throw new XJException("ERP采购检验同步失败,未返回结果"); |
|
|
|
throw new XJException(emptyMessage); |
|
|
|
} |
|
|
|
String code = String.valueOf(resultList.get(0).get("resultCode")); |
|
|
|
if (!"200".equalsIgnoreCase(code)) { |
|
|
|
@ -5400,6 +5431,7 @@ public class QcServiceImpl implements QcService { |
|
|
|
if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){ |
|
|
|
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername()); |
|
|
|
} |
|
|
|
callReverseERPPOInspect(qcData, currentUser); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|