rev:修改回库锁范围

mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandCleanOutIvtServiceImpl.java

@@ -433,7 +433,7 @@ public class HandCleanOutIvtServiceImpl implements HandCleanOutIvtService {
                     throw new PdaRequestException("任务下发失败:" + result.getString("message"));
                 }
             }
-        },"backstore"+point_code,2);
+        },"backstore",3);
 
         JSONObject returnjo = new JSONObject();
         returnjo.put("code", "1");

mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java

@@ -881,13 +881,6 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
             }else{
                 throw new PdaRequestException("分配货位并发锁获取失败，请稍后再试！");
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new PdaRequestException("逻辑分配错误:"+e.getMessage());
-        } finally {
-            lock.unlock();
-        }
-
             //调用下发按钮
             AbstractAcsTask intask = new InTask();
             //调用ACS接受任务接口
@@ -909,6 +902,12 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
                     throw new PdaRequestException("任务下发失败:" + result.getString("message"));
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new PdaRequestException("逻辑分配错误:"+e.getMessage());
+        } finally {
+            lock.unlock();
+        }
 
         JSONObject returnjo = new JSONObject();
         returnjo.put("code", "1");

mes/hd/nladmin-system/src/main/java/org/nl/wms/common/util/RedissonUtils.java

@@ -35,7 +35,7 @@ public class RedissonUtils {
             if (isLock){
                 process.accept(null);
             } else {
-                throw new BadRequestException("The current business is being processed key:"+key);
+                throw new BadRequestException("当前业务正在执行:"+key+",稍后再试");
             }
         }finally {
             if (isLock){

mes/hd/nladmin-system/src/main/resources/config/application-dev.yml

@@ -22,7 +22,7 @@ spring:
       client:
         reactive:
           #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
-          endpoints: 127.0.0.1:200 #外网
+          endpoints: 127.0.0.1:9200 #外网
 #          endpoints: http://10.1.3.90:9200 #外网
   elasticsearch:
     rest: