From b1d66c1c541b21cb18a33202da4d5780ce9a9ad5 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 1 Apr 2025 11:32:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=9C=AA=E5=AF=B9=E7=85=A7=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/inout/IoCodeTempController.java     |  3 ++-
 .../com/glxp/api/service/collect/DownloadFactory.java  | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

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<PageSimpleResponse<IoCollectOrder>> 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<IoCollectOrder> thrOrderEntities, CollectOrderRequest collectOrderRequest) {
         try {
 
-
+            StringBuilder errorMsgAll = new StringBuilder();
         List<IoCollectOrder> 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());