From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
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 06b5c39..196d4f0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -150,7 +150,7 @@
if (staProtocol.isAutoing()
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
- && !staProtocol.isEmptyMk()
+// && !staProtocol.isEmptyMk()
&& staProtocol.isPakMk()
&& (staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9998)
) {
@@ -183,10 +183,10 @@
requestParam.put("wcsStatus", 0);//鎴愬姛
}
- String response = "";
+ String response = "None";
Boolean success = false;
try {
- Object object = redisUtil.get(RedisKeyType.IN_TASK_LOCK.key);
+ Object object = redisUtil.get(RedisKeyType.IN_TASK_LOCK.key + inSta.getStaNo());
if(object != null) {
continue;
}
@@ -198,15 +198,16 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- redisUtil.set(RedisKeyType.IN_TASK_LOCK.key, "lock", 5);
+ 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;
}
--
Gitblit v1.9.1