原始单据下载问题

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -513,7 +513,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
                 collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode());
                 collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType());
-                BeanUtils.copyProperties(collectOrder,ioCollectOrderOrigin);
+                BeanUtils.copyProperties(collectOrder, ioCollectOrderOrigin);
 
                 if (!collectOrder.getTagStatus().equals(4) && collectOrder.getWorkPlaceCode() != null) {
                     collectOrder.setTagStatus(1);
@@ -645,8 +645,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
     private void removeOrderByBillNo(IoCollectOrder collectOrder) {
         String billNo = collectOrder.getBillNo();
-        this.remove(new LambdaUpdateWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo,billNo));
-        collectOrderBizService.remove(new LambdaUpdateWrapper<IoCollectOrderBiz>().eq(IoCollectOrderBiz::getOrderIdFk,billNo));
+        this.remove(new LambdaUpdateWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, billNo));
+        collectOrderBizService.remove(new LambdaUpdateWrapper<IoCollectOrderBiz>().eq(IoCollectOrderBiz::getOrderIdFk, billNo));
     }
 
 

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

@@ -82,7 +82,7 @@ public class ThrOrderDownload implements IDownload {
      * @param thrOrderEntities
      * @param collectOrderRequest
      */
-    private BaseResponse importThrOrder(List<IoCollectOrder> thrOrderEntities, CollectOrderRequest collectOrderRequest) {
+    public BaseResponse importThrOrder(List<IoCollectOrder> thrOrderEntities, CollectOrderRequest collectOrderRequest) {
         List<IoCollectOrder> ioCollectOrderList = new ArrayList<>();
         if (CollUtil.isNotEmpty(thrOrderEntities)) {
             for (IoCollectOrder thrOrder : thrOrderEntities) {
@@ -116,15 +116,12 @@ public class ThrOrderDownload implements IDownload {
                     bizList.add(collectOrderBiz);
                 }
                 if (StrUtil.isNotBlank(errorMsg)) {
-                    ioCollectOrder.setErrorMsg(errorMsg.toString());
                     ioCollectOrder.setTagStatus(4);
                 }
+                ioCollectOrder.setErrorMsg(errorMsg.toString());
                 ioCollectOrder.setBizList(bizList);
                 ioCollectOrderList.add(ioCollectOrder);
             }
-
-
-
             collectOrderService.importPrescribe(ioCollectOrderList, collectOrderRequest.getBusType());
             return ResultVOUtils.success("下载成功");
         }

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

@@ -20,6 +20,8 @@ public class YPCF002Download implements IDownload {
     private ErpBasicClient erpBasicClient;
     @Resource
     private IoCollectOrderService collectOrderService;
+    @Resource
+    ThrOrderDownload thrOrderDownload;
 
     @Override
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
@@ -37,12 +39,11 @@ public class YPCF002Download implements IDownload {
             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();
-                collectOrderService.importPrescribe(list, collectOrderRequest.getBusType());
+                thrOrderDownload.importThrOrder(list, collectOrderRequest);
                 if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) {
                     page++;
                 } else {