From 736a85729a54bcce593914eedf52120465433f23 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 11 九月 2024 10:26:08 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 6ac9ad2..371d75b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -255,7 +255,7 @@
                 throw new CoolException("generate [task] action fail, cause can not acquire lock ...");
             }
             Date now = new Date();
-            final String sameGroupXy = configService.getVal( "sameGroupXy");
+            final String sameGroupXy = configService.getVal( "sameGroupXy", String.class);
 
             Agv agv = agvService.getById(agvId);
             if (!agvService.judgeEnable(agv.getId(), agvDetail -> agvDetail.getVol() > agv.getChargeLine())) {
@@ -590,7 +590,7 @@
         try {
             if (Cools.isEmpty(agvId, segmentList)) { return; }
             Date now = new Date();
-            JSONObject storeDirection = JSON.parseObject(configService.getVal("storeDirection"));
+            JSONObject storeDirection = configService.getVal("storeDirection", JSONObject.class);
             Agv agv = agvService.getById(agvId);
             if (!agvService.judgeEnable(agv.getId())) {
                 throw new CoolException("AGV[" + agv.getUuid() + "]褰撳墠涓嶅彲鐢�...");

--
Gitblit v1.9.1