rev：下发agv终止任务

acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java

@@ -1096,7 +1096,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
 
     @Override
     public <T> UnifiedResponse<T>  stopTask(JSONObject requestParam) {
-        String path = "/stop-task";
+        String path = "/terminate";
         return xgHttpUtil.sendPostRequest(path, requestParam);
     }
 

acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java

@@ -329,8 +329,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
             if (instDto.getSend_status().equals("1")) {
                 // 调用XG接口通知删除
                 JSONObject json = new JSONObject();
-                json.put("releaseSite",1);
-                json.put("taskRecordId",instDto.getInstruction_code());
+                json.put("disableVehicle",false);
+                json.put("id",instDto.getInstruction_code());
                 xianGongAgvService.stopTask(json);
             }
         } catch (Exception e) {
@@ -418,7 +418,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 UnifiedResponse<JSONObject> resp = agvService.queryXZAgvInstStatusByCode(dto.getInstruction_code(), JSONObject.class);
                 // 状态
                 String state = resp.getData().getString("state");
-                if ("RUNNING".equals(state) || "TOBEDISPATCHED".equals(state) || "WAITING".equals(state)) {
+                if ("RUNNING".equals(state) || "WAITING".equals(state)) {
                     TaskStatus = "执行中";
                 }
                 // 车号