From 4a1724d674177968dfb5e03c2f3a87ff12788894 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 14 一月 2026 12:50:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/WmsOperateUtils.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/WmsOperateUtils.java b/src/main/java/com/zy/core/utils/WmsOperateUtils.java
index 39f0363..79e7e1e 100644
--- a/src/main/java/com/zy/core/utils/WmsOperateUtils.java
+++ b/src/main/java/com/zy/core/utils/WmsOperateUtils.java
@@ -19,7 +19,9 @@
import com.zy.common.entity.FindCrnNoResult;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
+import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -49,27 +51,26 @@
private BasDualCrnpService basDualCrnpService;
@Autowired
private BasStationService basStationService;
+ @Autowired
+ private RedisUtil redisUtil;
//鐢宠鍏ュ簱浠诲姟
public synchronized String applyInTask(String barcode, Integer sourceStaNo, Integer locType1) {
- String wmsUrl = null;
- Config wmsSystemUriConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemUri"));
- if (wmsSystemUriConfig != null) {
- wmsUrl = wmsSystemUriConfig.getValue();
+ Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
+ if (systemConfigMapObj == null) {
+ News.error("绯荤粺Config缂撳瓨澶辨晥");
+ return null;
}
+ HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
+ String wmsUrl = systemConfigMap.get("wmsSystemUri");
if (wmsUrl == null) {
News.error("鏈厤缃甒MS绯荤粺URI锛岄厤缃枃浠禖ode缂栫爜锛歸msSystemUri");
return null;
}
- String wmsSystemInUrl = null;
- Config wmsSystemInUrlConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemInUrl"));
- if (wmsSystemInUrlConfig != null) {
- wmsSystemInUrl = wmsSystemInUrlConfig.getValue();
- }
-
- if(wmsSystemInUrlConfig == null){
+ String wmsSystemInUrl = systemConfigMap.get("wmsSystemInUrl");
+ if(wmsSystemInUrl == null){
News.error("鏈厤缃甒MS鍏ュ簱鎺ュ彛鍦板潃锛岄厤缃枃浠禖ode缂栫爜锛歸msSystemInUrl");
return null;
}
@@ -98,7 +99,7 @@
.setUri(wmsUrl)
.setPath(wmsSystemInUrl)
.setJson(JSON.toJSONString(requestParam))
- .setTimeout(360, TimeUnit.SECONDS)
+ .setTimeout(30, TimeUnit.SECONDS)
.build()
.doPost();
if (response != null) {
@@ -176,7 +177,7 @@
.setUri(wmsUrl)
.setPath(wmsSystemReassignInTaskUrl)
.setJson(JSON.toJSONString(requestParam))
- .setTimeout(360, TimeUnit.SECONDS)
+ .setTimeout(30, TimeUnit.SECONDS)
.build()
.doPost();
if (response != null) {
@@ -268,7 +269,7 @@
.setUri(wmsUrl)
.setPath(wmsSystemChangeLocNoUrl)
.setJson(JSON.toJSONString(requestParam))
- .setTimeout(360, TimeUnit.SECONDS)
+ .setTimeout(30, TimeUnit.SECONDS)
.build()
.doPost();
--
Gitblit v1.9.1