From 97dc37323f9da7b70768c12302cb4927eb9fef92 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 6 Jan 2025 12:57:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=93=E6=89=98=E6=96=B9=E5=BC=8F=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WarehouseTrayTypeServiceImpl.java    | 11 +++++++----
 .../src/main/resources/luascript/resubmit.lua         |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index fad0378fa..95a996a8f 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -1780,16 +1780,19 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		redisScript.setResultType(Long.class);
 
 		List<String> keys = Collections.singletonList(key);
-		List<String> args = Arrays.asList(value, String.valueOf(expireTime));
+		List<Object> args = Arrays.asList(value, expireTime);
 
-		Long result = redis.getStringRedisTemplate().execute(redisScript, keys, args);
+		log.info("Keys: {}", keys);
+		log.info("Args: {}", args);
+
+		Long result = redis.getRedisTemplate().execute(redisScript, keys, args.toArray());
 
 		if (result == 1) {
 			log.warn("#########orderScanOrderPackageCode: 托盘正在保存打托方式 trayCode={} warehouseId={}", trayCode, warehouseId);
 			throw new CustomerException(405, "托盘信息正在更新，请重试");
 		}
 
-		redis.setEx(key,"1",5L);
+//		redis.setEx(key,"1",5L);
 
 		WarehouseTrayTypeEntity trayTypeEntity = new WarehouseTrayTypeEntity();
 		BladeUser user = AuthUtil.getUser();
@@ -1879,7 +1882,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		//修改托盘的状态
 		basicdataTrayClient.updateTrayStatus(trayId, 2);
 
-		redis.del(key);
+//		redis.del(key);
 
 		return trayTypeEntity;
 	}
diff --git a/blade-service/logpm-warehouse/src/main/resources/luascript/resubmit.lua b/blade-service/logpm-warehouse/src/main/resources/luascript/resubmit.lua
index 990a385f7..51b559add 100644
--- a/blade-service/logpm-warehouse/src/main/resources/luascript/resubmit.lua
+++ b/blade-service/logpm-warehouse/src/main/resources/luascript/resubmit.lua
@@ -1,6 +1,6 @@
 local key = KEYS[1]
 local value = ARGV[1]
-local expireTime = tonumber(ARGV[2])
+local expireTime = ARGV[2]
 
 local exists = redis.call("EXISTS", key)