充电机代码bug修改

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/ChargerButtService.java

@@ -7,6 +7,7 @@ import com.ruoyi.ams.task.domain.WcsTask;
 import com.ruoyi.ams.task.service.IWcsTaskService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.hard.modbus.tcp.ChargingMachineClient;
 import lombok.Data;
@@ -14,6 +15,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -241,7 +244,8 @@ public class ChargerButtService {
         boolean isCompacting = this.confirmChargerStatus(IS_COMPACTING, new Date(), true, xx);
         if (!isCompacting) {
             // 反馈TS充电机故障 不能让AGV退出重进因为会有危险
-            this.feedbackTSLog(taskNo, index, RE_ENTRY, agvNo + ",充电机压紧失败！", xx);
+            this.feedbackTSLog(taskNo, index, FAULT, agvNo + ",充电机压紧失败！", xx);
+            return;
         }
         // 反馈TS正常充电
         this.feedbackTSLog(taskNo, index, NORMAL, agvNo + "AGV开始充电!", xx);
@@ -308,6 +312,7 @@ public class ChargerButtService {
         if (!isEnd) {
             // 反馈TS充电机故障
             this.feedbackTSLog(taskNo, index, FAULT, agvNo + ",确认信号：无压紧、无充电、归位，失败！", xx);
+            return;
         }
         // 判断先前是否收到过4003消息的标识
 //        if (wcsTask != null) {
@@ -588,7 +593,7 @@ public class ChargerButtService {
                 return con;
             }
             // 递归
-            confirmChargerStatus(status, startTime, isRecursion, xx);
+           return confirmChargerStatus(status, startTime, isRecursion, xx);
         }
         return con;
     }
@@ -743,5 +748,4 @@ public class ChargerButtService {
 
         return result;
     }
-
 }