From abd8de964cf86a5af6dbc594cb89f9b2e21e7d23 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 18 Jul 2023 11:24:16 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E8=B4=A7=E4=BD=8D=E5=88=86?= =?UTF-8?q?=E9=85=8D=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java | 2 +- .../main/java/org/nl/wms/st/core/manage/AbstractInManage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java index 8c92c84d..f9c375d4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java @@ -841,7 +841,7 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { RLock lock = redisLock.getLock("QST_IVT_RAWASSISTISTOR02"); try { // 尝试加锁，最多等待1000ms，上锁以后5s自动解锁 - boolean isLock = lock.tryLock(1000, 5000, TimeUnit.MILLISECONDS); + boolean isLock = lock.tryLock(5, 10, TimeUnit.SECONDS); if (isLock) { //获取锁成功，执行对应的业务逻辑 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java index a8507f76..0296258e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java @@ -726,7 +726,7 @@ public abstract class AbstractInManage { try { // 尝试加锁，最多等待1000ms，上锁以后5s自动解锁 - boolean isLock = lock.tryLock(1000, 5000, TimeUnit.MILLISECONDS); + boolean isLock = lock.tryLock(5, 10, TimeUnit.SECONDS); if (isLock) {//获取锁成功，执行对应的业务逻辑 //调用分配货位sql JSONObject struct_jo = WQL.getWO("QST_IVT_RAWASSISTISTOR02").addParamMap(struct_map).process().uniqueResult(0);