From a0f54b43039eeb09117419906b530c2e08051b04 Mon Sep 17 00:00:00 2001 From: ynhfasrs <ynhfasrs@qq.com> Date: 星期五, 30 五月 2025 12:19:22 +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 06b5c39..1ff3457 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,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