diff --git a/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java b/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java index 397f409..01c1f92 100644 --- a/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java +++ b/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java @@ -189,18 +189,14 @@ public class TaskReturnServiceImpl implements TaskReturnService { String methodName = ""; String receiptType = "BZXXRK"; if (receiptHeader != null) { - if (StringUtils.isNull(receiptHeader.getReferId())) { - throw new ServiceException("找不到该任务对应单据所关联的 referId"); - } - if (StringUtils.isEmpty(receiptHeader.getReferCode())) { - throw new ServiceException("找不到该任务对应单据所关联的编号 referCode"); - } receiptType = receiptHeader.getReceiptType(); } if ("CGRKD".equals(receiptType)) {//采购入库单 methodName = "STK_InStock"; } else if ("SCTLD".equals(receiptType)) {//生产退料单 methodName = "PRD_ReturnMtrl"; + } else if ("CDTL".equals(receiptType)) {//采购退料单 + methodName = "PUR_MRB"; } else if ("SCRKD".equals(receiptType)) {//生产入库单 methodName = "PRD_INSTOCK"; } else if ("SCTKD".equals(receiptType)) {//生产退库单 @@ -253,6 +249,12 @@ public class TaskReturnServiceImpl implements TaskReturnService { return AjaxResult.error("找不到对应ERP的方法标识"); } // fid单据号 fbillno单据编码 + if (StringUtils.isNull(receiptHeader.getReferId())) { + throw new ServiceException("找不到该任务对应单据所关联的 referId"); + } + if (StringUtils.isEmpty(receiptHeader.getReferCode())) { + throw new ServiceException("找不到该任务对应单据所关联的编号 referCode"); + } AjaxResult ajaxResult = taskReturnService.sendTaskReturn(receiptHeader.getReferId().toString(), receiptHeader.getReferCode(), methodName, operate); if (ajaxResult.getCode() != 200) { //回传失败,修改回传次数