From f9780057f79ee416c38f376a93ebb6a4ddcc2008 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 17 Mar 2025 14:06:22 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=B8=8B=E5=8F=91agv=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../acs/agv/server/impl/XianGongAgvServiceImpl.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
index 1e3cc86..872aac1 100644
--- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
+++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
@@ -671,12 +671,12 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
if (start_point_code.equals("GPTDJDIN")) {
start_point_code += "1";
}
-
block.put("location", start_point_code);
block.put("binTask", "ForkLoad");
-// block.put("operationArgs", new JSONObject() {{
-// put("recognize", true);
-// }});
+ // 判断是否是A生产区，并且后缀是 _2 的货位
+ if (start_point_code.contains("A") && start_point_code.endsWith("_2")) {
+ block.put("binTask", "ForkLoad1");
+ }
blocks.add(block);
if ("true".equals(device1.getExtraValue().get("ignore_pickup_check"))) {
@@ -760,6 +760,10 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
if ("CPJSSX,BZXXL".contains(inst.getNext_device_code()) && task.getIs_vehicle().equals("0")) {
block.put("binTask", "ForkUnload1");
}
+ // 判断是否是A生产区，并且后缀是 _2 的货位
+ if (next_point_code.contains("A") && next_point_code.endsWith("_2")) {
+ block.put("binTask", "ForkUnload1");
+ }
blocks.add(block);
if ("true".equals(device2.getExtraValue().get("ignore_release_check"))) {