diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index ca5de41f7..e8e1ec20f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -282,7 +282,8 @@ public class IoCodeTempController extends BaseController { } } } - BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据"); + BaseResponse response = ResultVOUtils.error(501, com.glxp.api.util.StringUtils.isNotEmpty(baseResponse.getMessage())? + "单据存在未对照产品: " + baseResponse.getMessage() : "未找到匹配单据"); response.setData(code); return response; }else { diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java index 346ce7050..7a01c9b7d 100644 --- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java +++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java @@ -134,6 +134,7 @@ public class DownloadFactory { filterThrOrderRequest.setFromType(collectOrderRequest.getFromType()); filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime()); filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime()); + BaseResponse resp; while (true) { filterThrOrderRequest.setPage(page); BaseResponse> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest); @@ -142,7 +143,7 @@ public class DownloadFactory { if (list == null) { return ResultVOUtils.error(500, "未查到此业务单据"); } - importThrOrder(list, collectOrderRequest); + resp = importThrOrder(list, collectOrderRequest); if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) { page++; } else { @@ -152,7 +153,7 @@ public class DownloadFactory { return baseResponse; } } - return ResultVOUtils.success("下载成功"); + return ResultVOUtils.success(resp.getMessage(),"下载成功"); } @@ -173,7 +174,7 @@ public class DownloadFactory { public BaseResponse importThrOrder(List thrOrderEntities, CollectOrderRequest collectOrderRequest) { try { - + StringBuilder errorMsgAll = new StringBuilder(); List ioCollectOrderList = new ArrayList<>(); if (CollUtil.isNotEmpty(thrOrderEntities)) { for (IoCollectOrder thrOrder : thrOrderEntities) { @@ -242,6 +243,7 @@ public class DownloadFactory { if (StrUtil.isNotBlank(errorMsg)) { ioCollectOrder.setTagStatus(4); + errorMsgAll.append(errorMsg); } else ioCollectOrder.setTagStatus(2); ioCollectOrder.setErrorMsg(errorMsg.toString()); @@ -249,7 +251,7 @@ public class DownloadFactory { ioCollectOrderList.add(ioCollectOrder); } collectOrderService.importPrescribe(ioCollectOrderList, collectOrderRequest); - return ResultVOUtils.success("下载成功"); + return ResultVOUtils.success(errorMsgAll.toString(),"下载成功"); } }catch (Exception e){ log.error("12312"+e.getMessage());