From dc8896d3add3b812b96742c93c0e7ce3a2c21267 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Sat, 20 Aug 2022 14:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8B=E5=8F=91=E4=BB=99?=
 =?UTF-8?q?=E5=B7=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java  | 3 ++-
 .../java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
index be79924..f9999a9 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
@@ -1,5 +1,6 @@
 package org.nl.acs.agv.server.impl;
 
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
@@ -1625,7 +1626,7 @@ public class AgvServiceImpl implements AgvService {
     public JSONArray createBlocksData(Instruction inst) {
         JSONArray ja = new JSONArray();
         JSONObject jo = new JSONObject();
-        jo.put("blockId",String.valueOf(ja.size()+1));
+        jo.put("blockId", IdUtil.simpleUUID());
         jo.put("location",inst.getStart_point_code());
         jo.put("operation","JackLoad");
         ja.add(jo);
diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java
index e6cce42..3e26706 100644
--- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java
+++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java
@@ -56,7 +56,7 @@ public class QueryXZAgvTaskStatus {
                 String device_code = blocksjo.getString("location");
                 String state = blocksjo.getString("state");
                 //取货
-                if(StrUtil.equals(blockId,"1") && StrUtil.equals(state,"FINISHED") && StrUtil.equals(inst.getFinish_type(),"0")){
+                if(StrUtil.equals(String.valueOf(j+1),"1") && StrUtil.equals(state,"FINISHED") && StrUtil.equals(inst.getFinish_type(),"0")){
                     JSONObject feedjo = new JSONObject();
                     feedjo.put("status","1");
                     feedjo.put("device_code",device_code);
@@ -68,7 +68,7 @@ public class QueryXZAgvTaskStatus {
                     instructionService.update(inst);
                 }
                 //放货
-                if(StrUtil.equals(blockId,"2") && StrUtil.equals(state,"FINISHED") && StrUtil.equals(inst.getFinish_type(),"1")){
+                if(StrUtil.equals(String.valueOf(j+1),"2") && StrUtil.equals(state,"FINISHED") && StrUtil.equals(inst.getFinish_type(),"1")){
                     JSONObject feedjo = new JSONObject();
                     feedjo.put("status","2");
                     feedjo.put("device_code",device_code);