From cd5447b3dde9aa41203d180adbef78e0a21e65bf Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 27 五月 2025 15:09:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 b4b6c90..974579c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -152,7 +152,7 @@
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
&& staProtocol.isPakMk()
- && staProtocol.getWorkNo() == 9999
+ && (staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9998)
) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
@@ -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,7 +198,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- redisUtil.set(RedisKeyType.IN_TASK_LOCK.key, "lock", 5);
+ redisUtil.set(RedisKeyType.IN_TASK_LOCK.key + inSta.getStaNo(), "lock", 5);
if (jsonObject.getInteger("code") == 200) {
} else if (jsonObject.getInteger("code") == 500) {
--
Gitblit v1.9.1