From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #
---
license.lic | 0
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++++++-----
src/main/java/com/zy/common/utils/HttpHandler.java | 2 +-
src/main/resources/application-prod.yml | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/license.lic b/license.lic
index f91e86c..4dd7e45 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 1ff3457..196d4f0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -198,15 +198,16 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
+ log.info(response);
redisUtil.set(RedisKeyType.IN_TASK_LOCK.key + inSta.getStaNo(), "lock", 5);
if (jsonObject.getInteger("code") == 200) {
} else if (jsonObject.getInteger("code") == 500) {
News.watchInfo(String.valueOf(staProtocol.getSiteId()), "鏉＄爜锛�" + barcode + "鐢宠WMS澶辫触,绯荤粺鍥為��,response=" + JSON.toJSONString(jsonObject));
- staProtocol.setWorkNo(9997);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// staProtocol.setWorkNo(9997);
+// staProtocol.setStaNo(inSta.getBackSta().shortValue());
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
continue;
}else {
News.watchInfo(String.valueOf(staProtocol.getSiteId()), "鏉＄爜锛�" + barcode + "鐢宠WMS澶辫触,response=" + JSON.toJSONString(jsonObject));
@@ -248,7 +249,7 @@
taskWrk.setBarcode(barcode);//鏉＄爜
taskWrk.setCrnNo(locMast.getCrnNo());
taskWrk.setTargetPoint(resultLocNo);
- taskWrk.setStartPoint(String.valueOf(staProtocol.getStaNo()));
+ taskWrk.setStartPoint(String.valueOf(inSta.getStaNo()));
if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
}
@@ -456,7 +457,7 @@
flag = true;
}
if (!flag) {
- News.watchError(crnStn.getStaNo() + "绔欑偣", "鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐圭姸鎬佹娴嬪け璐ワ紝绔欑偣闇�瑕佹弧瓒筹細鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙枫�佺珯鐐瑰彲鍏�");
+// News.watchError(crnStn.getStaNo() + "绔欑偣", "鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐圭姸鎬佹娴嬪け璐ワ紝绔欑偣闇�瑕佹弧瓒筹細鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙枫�佺珯鐐瑰彲鍏�");
continue;
}
diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/common/utils/HttpHandler.java
index b305399..438ea88 100644
--- a/src/main/java/com/zy/common/utils/HttpHandler.java
+++ b/src/main/java/com/zy/common/utils/HttpHandler.java
@@ -15,7 +15,7 @@
*/
public class HttpHandler {
- private static final Integer DEFAULT_TIMEOUT_SECONDS = 5;
+ private static final Integer DEFAULT_TIMEOUT_SECONDS = 10;
private static final MediaType MEDIA_TYPE = MediaType.parse("application/json");
private String uri;
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 37df691..7bd3aad 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -191,7 +191,7 @@
rack: 0
ip: 192.168.10.110
outSta[3]: #鍑哄簱鍙�4
- staNo: 103
+ staNo: 104
emptyInSta[7]: #绌烘澘鍏ュ簱鍙�8
staNo: 212
emptyInSta[5]: #绌烘澘鍏ュ簱鍙�6
@@ -199,7 +199,7 @@
emptyInSta[3]: #绌烘澘鍏ュ簱鍙�4
staNo: 108
outSta[1]: #鍑哄簱鍙�2
- staNo: 101
+ staNo: 102
inSta[3]:
staNo: 107
backSta: 108
--
Gitblit v1.9.1