diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java index 9606b87f..65ffb228 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java @@ -373,7 +373,6 @@ public class TaskExecutor { PmsOutFeedBack pmsOutFeedBack = new PmsOutFeedBack(); List recordList = new ArrayList<>(); for (AppTask task : appTasks) { - //调用接口,组装数据 AppPmsOrderOut appPmsOrderOut = new AppPmsOrderOut(); appPmsOrderOut.setOrderId(task.getOrderId()); @@ -383,6 +382,9 @@ public class TaskExecutor { continue; } AppPmsOrderOut appPmsOrderOut1 = appPmsOrderOuts.get(0); + if (appPmsOrderOut1.getOrderType() == 9) { + continue; + } PmsOutFeedBackRecord recordListItem = new PmsOutFeedBackRecord(); recordListItem.setAmount(task.getOpNum().intValue()); recordListItem.setBusinessOrder(appPmsOrderOut1.getListId()); @@ -393,15 +395,17 @@ public class TaskExecutor { //根据orderId查询出库单表,获取listid和物料id //组装数组 + // 调用 pms 接口 pmsOutFeedBack.setRecordList(recordList); - String url = sysConfigService.selectConfigByKey("pms.outComplete"); - if (StringUtils.isEmpty(url)) { - throw new RuntimeException("pms.outComplete配置为空"); + if (!pmsOutFeedBack.getRecordList().isEmpty()) { + String url = sysConfigService.selectConfigByKey("pms.outComplete"); + if (StringUtils.isEmpty(url)) { + throw new RuntimeException("pms.outComplete配置为空"); + } + PmsCommonRes pmsCommonRes = JSON.parseObject(HttpUtils.sendHttpPostWithoutToken(url, JSON.toJSONString(pmsOutFeedBack)), PmsCommonRes.class); + logger.info("pms出库反馈请求信息:{},结果:{}", JSON.toJSONString(pmsOutFeedBack), JSON.toJSONString(pmsCommonRes)); } - PmsCommonRes pmsCommonRes = JSON.parseObject(HttpUtils.sendHttpPostWithoutToken(url, JSON.toJSONString(pmsOutFeedBack)), PmsCommonRes.class); - logger.info("pms出库反馈请求信息:{},结果:{}", JSON.toJSONString(pmsOutFeedBack), JSON.toJSONString(pmsCommonRes)); - // 归档旧数据 for (AppTask task : appTasks) {