Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java

@@ -9,6 +9,7 @@ import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.collect.IoCollectOrderService;
 import com.glxp.api.util.IntUtil;
+import org.jfree.util.Log;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -25,6 +26,7 @@ public class YPCF002Download implements IDownload {
 
     @Override
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
+
             int page = 1;
             int limit = 100;
             GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
@@ -38,13 +40,15 @@ public class YPCF002Download implements IDownload {
             getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
             getSickPrescribeRequest.setBusType(collectOrderRequest.getBusType());
             while (true) {
+                List<IoCollectOrder> list;
+                try {
                 getSickPrescribeRequest.setPage(page);
                 BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);
 
                 // TODO: 2024/9/11 添加一张中间表（io_collect_order_origin）原始表做为转换
 
                 if (baseResponse.getCode() == 20000) {
-                List<IoCollectOrder> list = baseResponse.getData().getList();
+                    list = baseResponse.getData().getList();
                     if (list == null) {
                         return ResultVOUtils.error(500, "未查到此业务单据");
                     }
@@ -57,7 +61,13 @@ public class YPCF002Download implements IDownload {
                 } else {
                     return ResultVOUtils.error(500, "下载第三方系统产品信息异常");
                 }
+                }catch (Exception e){
+                    System.out.println("下载三方错误==="+e.getMessage()+"==="+collectOrderRequest);
+                    e.printStackTrace();
+                }
             }
+
+
         return ResultVOUtils.success("下载成功");
     }
 }