diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 4ef4212fa..501a8489b 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -285,6 +285,11 @@ public class IoCollectOrderService extends ServiceImpl list = orderService.filterList(filterOrderRequest); + + if (list == null){ + return ResultVOUtils.error(500, "未查到此业务单据"); + } + for (IoOrderResponse ioOrderEntity : list) { if (collectOrderMapper.exists(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, ioOrderEntity.getBillNo()))) { continue; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java index 459f6dd82..316c07589 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -80,6 +80,11 @@ public class IoCollectOriginService { if (StrUtil.isBlank(busType)) { //下载工位下的类型 List list = sysWorkplaceDocumentService.list(); + + if (list == null){ + return ResultVOUtils.error(500, "未查到此业务单据"); + } + if (CollUtil.isNotEmpty(list)) { for (SysWorkplaceDocumentEntity item : list) { collectOrderRequest.setBusType(item.getDocumentTypeCode()); diff --git a/src/main/java/com/glxp/api/service/collect/down/QXCF001Download.java b/src/main/java/com/glxp/api/service/collect/down/QXCF001Download.java index b395e9d0f..7addc5065 100644 --- a/src/main/java/com/glxp/api/service/collect/down/QXCF001Download.java +++ b/src/main/java/com/glxp/api/service/collect/down/QXCF001Download.java @@ -42,6 +42,9 @@ public class QXCF001Download implements IDownload { if (baseResponse.getCode() == 20000) { List list = baseResponse.getData().getList(); + if (list == null){ + return ResultVOUtils.error(500, "未查到此业务单据"); + } thrOrderDownload.importThrOrder(list, collectOrderRequest); if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) { page++; diff --git a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java index 5c282a816..8812d2e1f 100644 --- a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java +++ b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java @@ -57,6 +57,9 @@ public class ThrOrderDownload implements IDownload { BaseResponse> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest); if (baseResponse.getCode() == 20000) { List list = baseResponse.getData().getList(); + if (list == null){ + return ResultVOUtils.error(500, "未查到此业务单据"); + } // TODO: 2024/9/11 2024/9/11 添加一张中间表(io_collect_order_origin)原始表做为转换 importThrOrder(list, collectOrderRequest); if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) {