From ca36b1d8598a0287c0eef35a37e078fa68a5b191 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Mon, 15 May 2023 14:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/udi/admin/controller/inout/OrderController.java | 2 +- .../com/glxp/udi/admin/service/info/PlatformService.java | 8 ++++---- .../com/glxp/udi/admin/thread/SubmitOrderToSpmsTask.java | 3 +-- .../com/glxp/udi/admin/thread/SupplementOrderTask.java | 3 +-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java index 6e8f94e..56ad96f 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java @@ -375,7 +375,7 @@ public class OrderController { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { }); - if (baseResponse.getCode() == ResultEnum.SUCCESS.getCode()) { + if (baseResponse.getCode() == 20000) { orderEntity.setUploadStatus("1"); orderService.updateOrder(orderEntity); return baseResponse; diff --git a/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java b/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java index 84e3a00..ab0c95a 100644 --- a/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java +++ b/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java @@ -138,7 +138,7 @@ public class PlatformService { Map paramMap = new HashMap<>(); paramMap.put("invSubCode", invSubCode); String resp = HttpClient.mipsGet(host + "/udiwms/bussinessType/udimsFilter", paramMap); - if (StrUtil.isNotBlank(resp) && resp.contains(ResultEnum.SUCCESS.getCode().toString())) { + if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { return JSON.parseObject(resp, BaseResponse.class); } else { log.error("获取自助平台单据类型异常"); @@ -158,7 +158,7 @@ public class PlatformService { log.info("拉取自助平台仓库数据:" + url); String resp = HttpUtil.get(url); log.info("拉取结果:" + resp); - if (StrUtil.isNotBlank(resp) && resp.contains(ResultEnum.SUCCESS.getCode().toString())) { + if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { try { return JSON.parseObject(resp, BaseResponse.class); } catch (Exception e) { @@ -182,7 +182,7 @@ public class PlatformService { Map paramMap = new HashMap<>(); paramMap.put("invCode", invCode); String resp = HttpClient.mipsGet(host + "/spms/sub/inv/warehouse/getSubInvForUdims", paramMap); - if (StrUtil.isNotBlank(resp) && resp.contains(ResultEnum.SUCCESS.getCode().toString())) { + if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { return JSON.parseObject(resp, BaseResponse.class); } else { log.error("获取自助平台分库失败"); @@ -202,7 +202,7 @@ public class PlatformService { if (StrUtil.isNotBlank(response)) { try { BaseResponse result = JSONUtil.toBean(response, BaseResponse.class); - if (result.getCode() == ResultEnum.SUCCESS.getCode()) { + if (result.getCode() == 20000) { return ResultVOUtils.success(); } return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/udi/admin/thread/SubmitOrderToSpmsTask.java b/src/main/java/com/glxp/udi/admin/thread/SubmitOrderToSpmsTask.java index 828de44..cf7c791 100644 --- a/src/main/java/com/glxp/udi/admin/thread/SubmitOrderToSpmsTask.java +++ b/src/main/java/com/glxp/udi/admin/thread/SubmitOrderToSpmsTask.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.udi.admin.common.enums.ResultEnum; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.constant.SystemParamConstant; import com.glxp.udi.admin.dao.info.ScheduledDao; @@ -144,7 +143,7 @@ public class SubmitOrderToSpmsTask implements SchedulingConfigurer { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { }); - if (baseResponse.getCode() == ResultEnum.SUCCESS.getCode()) { + if (baseResponse.getCode() == 20000) { log.info("自动上传单据成功," + unitMaintainEntity.getName() + "上传单据数量为 " + orderEntities.size()); for (OrderEntity orderEntity : orderEntities) { log.info("修改单号为:{} 的上传状态", orderEntity.getOrderId()); diff --git a/src/main/java/com/glxp/udi/admin/thread/SupplementOrderTask.java b/src/main/java/com/glxp/udi/admin/thread/SupplementOrderTask.java index a1249f3..5c47924 100644 --- a/src/main/java/com/glxp/udi/admin/thread/SupplementOrderTask.java +++ b/src/main/java/com/glxp/udi/admin/thread/SupplementOrderTask.java @@ -1,7 +1,6 @@ package com.glxp.udi.admin.thread; import cn.hutool.core.collection.CollUtil; -import com.glxp.udi.admin.common.enums.ResultEnum; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.constant.SystemParamConstant; import com.glxp.udi.admin.dao.info.ScheduledDao; @@ -59,7 +58,7 @@ public class SupplementOrderTask implements SchedulingConfigurer { if (CollUtil.isNotEmpty(orderEntities)) { orderEntities.forEach(orderEntity -> { BaseResponse baseResponse = orderService.supplementOrder(orderEntity); - if (baseResponse.getCode() == ResultEnum.SUCCESS.getCode()) { + if (baseResponse.getCode() == 20000) { counter.addAndGet(1); } });