充电机通讯业务逻辑修改

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

@@ -172,7 +172,7 @@ public class ChargerButtService {
      */
     public void theChargingPositionHasBeenReached(Integer index, Integer chargingSite, Integer agvNo) {
         if (chargingMachineClient == null) {
-            log.error("充电机通讯开关关闭！");
+            log.info("充电机通讯开关关闭！");
             return;
         }
         String taskNo = "";
@@ -189,7 +189,7 @@ public class ChargerButtService {
                 && agvInfoMap.get(KEY_AGV_STS).toString().equals(AGV_CHARGING_STS.START.toString())) {
             // 反馈TS正常充电
             this.feedbackTSLog(taskNo, index, NORMAL, agvNo + "AGV开始充电!", xx);
-            log.error("充电机已经开始充电，不可重复请求！车号：{},充电机号：{}", agvNo, chargingSite);
+            log.info("充电机已经开始充电，不可重复请求！车号：{},充电机号：{}", agvNo, chargingSite);
             return;
         }
         // 如果是TS创建的充电任务 是没有对应的WcsTask任务 需要创建 并且设置到Redis
@@ -197,7 +197,7 @@ public class ChargerButtService {
         if (agvInfoMap.get(KEY_TASK_NO) == null || StringUtils.isEmpty(agvInfoMap.get(KEY_TASK_NO).toString())) {
             AjaxResult ajaxResult = wcsTaskService.addChargingTask(agvNo, chargingSite, index);
             if (!ajaxResult.isSuccess()) {
-                log.error(ajaxResult.getMsg());
+                log.info(ajaxResult.getMsg());
                 return;
             }
             taskNo = (String) ajaxResult.get("data");
@@ -276,12 +276,12 @@ public class ChargerButtService {
      */
     public void theChargingTaskCanceledArtificially(Integer index, Integer chargingSite, Integer agvNo) {
         if (chargingMachineClient == null) {
-            log.error("充电机通讯开关关闭！");
+            log.info("充电机通讯开关关闭！");
             return;
         }
         // 没有充电桩号没办法取消对应的充电机
         if (chargingSite == null) {
-            log.error("没有充电桩号没办法取消对应的充电机！");
+            log.info("没有充电桩号没办法取消对应的充电机！");
             return;
         }
         String taskNo = "";
@@ -352,6 +352,9 @@ public class ChargerButtService {
             taskNo = agvInfoMap.get(KEY_TASK_NO).toString();
             // WcsTask
             wcsTask = wcsTaskService.selectWcsTaskByTaskNo(taskNo);
+            if (wcsTask == null) {
+                return;
+            }
             wcsTask.setExt4("1");
             wcsTaskService.updateWcsTask(wcsTask);
         }
@@ -405,7 +408,7 @@ public class ChargerButtService {
         if (StringUtils.isNotEmpty(remarks)) {
             Map<String, Boolean> statusNameMapping = chargingMachineClient.getStatusNameMapping(xx);
             if (statusNameMapping != null) {
-                log.error(remarks + JSONUtil.toJsonStr(statusNameMapping));
+                log.info(remarks + JSONUtil.toJsonStr(statusNameMapping));
             }
         }
         // 反馈TS