From de0580808b6458af5d85afaacdd14abbd5b643db Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Fri, 11 Nov 2022 11:24:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../agv/server/impl/ZheDaAgvServiceImpl.java | 110 +++++++++---------
.../src/main/resources/logback-spring.xml | 6 +-
2 files changed, 60 insertions(+), 56 deletions(-)
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java
index e712b1d..1097416 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java
@@ -161,45 +161,53 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
//共挤线三工位
if (addressdevice.getDeviceDriver() instanceof HailiangSmartplcTestDeviceDriver) {
hailiangSmartplcTestDeviceDriver = (HailiangSmartplcTestDeviceDriver) addressdevice.getDeviceDriver();
- if ((hailiangSmartplcTestDeviceDriver.getAction() == 1 || hailiangSmartplcTestDeviceDriver.getAction() == 3) && hailiangSmartplcTestDeviceDriver.getMove() == 1) {
- inst.setExecute_status("1");
- is_feedback = true;
- }
+// if ((hailiangSmartplcTestDeviceDriver.getAction() == 1 || hailiangSmartplcTestDeviceDriver.getAction() == 3) && hailiangSmartplcTestDeviceDriver.getMove() == 1) {
+// inst.setExecute_status("1");
+// is_feedback = true;
+// }
+ is_feedback = true;
+
}
//叠盘位
if (addressdevice.getDeviceDriver() instanceof EmptyVehicleStackingPositionDeviceDriver) {
emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver();
- int number = emptyVehicleStackingPositionDeviceDriver.getNumber();
- if (number < Integer.valueOf(str)) {
- log.info("叠盘位：" + jobno + "当前层高为：" + number + ",不存在第" + str + "的托盘！");
- return null;
- }
- inst.setExecute_status("1");
+// int number = emptyVehicleStackingPositionDeviceDriver.getNumber();
+// if (number < Integer.valueOf(str)) {
+// log.info("叠盘位：" + jobno + "当前层高为：" + number + ",不存在第" + str + "的托盘！");
+// return null;
+// }
+// inst.setExecute_status("1");
is_feedback = true;
}
//货梯对接线
if (addressdevice.getDeviceDriver() instanceof CargoLiftConveyorDeviceDriver) {
cargoLiftConveyorDeviceDriver = (CargoLiftConveyorDeviceDriver) addressdevice.getDeviceDriver();
- if ((cargoLiftConveyorDeviceDriver.getAction() == 1 || cargoLiftConveyorDeviceDriver.getAction() == 3) && cargoLiftConveyorDeviceDriver.getMove() == 1) {
- inst.setExecute_status("1");
- is_feedback = true;
- }
+// if ((cargoLiftConveyorDeviceDriver.getAction() == 1 || cargoLiftConveyorDeviceDriver.getAction() == 3) && cargoLiftConveyorDeviceDriver.getMove() == 1) {
+// inst.setExecute_status("1");
+// is_feedback = true;
+// }
+ is_feedback = true;
+
}
//豪凯自动线对接位
if (addressdevice.getDeviceDriver() instanceof HaoKaiAutoConveyorDeviceDriver) {
haoKaiAutoConveyorDeviceDriver = (HaoKaiAutoConveyorDeviceDriver) addressdevice.getDeviceDriver();
- if ((haoKaiAutoConveyorDeviceDriver.getAction() == 1 || haoKaiAutoConveyorDeviceDriver.getAction() == 3) && haoKaiAutoConveyorDeviceDriver.getMove() == 1) {
- inst.setExecute_status("1");
- is_feedback = true;
- }
+// if ((haoKaiAutoConveyorDeviceDriver.getAction() == 1 || haoKaiAutoConveyorDeviceDriver.getAction() == 3) && haoKaiAutoConveyorDeviceDriver.getMove() == 1) {
+// inst.setExecute_status("1");
+// is_feedback = true;
+// }
+ is_feedback = true;
+
}
//油漆线
if (addressdevice.getDeviceDriver() instanceof PaintConveyorDeviceDriver) {
paintConveyorDeviceDriver = (PaintConveyorDeviceDriver) addressdevice.getDeviceDriver();
- if ((paintConveyorDeviceDriver.getAction() == 1 || paintConveyorDeviceDriver.getAction() == 3) && paintConveyorDeviceDriver.getMove() == 1) {
- inst.setExecute_status("1");
- is_feedback = true;
- }
+// if ((paintConveyorDeviceDriver.getAction() == 1 || paintConveyorDeviceDriver.getAction() == 3) && paintConveyorDeviceDriver.getMove() == 1) {
+// inst.setExecute_status("1");
+// is_feedback = true;
+// }
+ is_feedback = true;
+
}
}
if ("PauseOnStation".equals(type)) {
@@ -247,22 +255,6 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
jo.put("task_code", inst.getInstruction_code());
JSONArray destinations = new JSONArray();
String inst_type = inst.getInstruction_type();
- //如果任务类型为1，在点位进行等待，则查询当前叠盘位的数量，取当前数量的层数进行追加任务
-// if ("1".equals(inst_type)) {
-// emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver();
-// int current_num = emptyVehicleStackingPositionDeviceDriver.getNumber();
-// if (current_num > 12) {
-// log.info("当前叠盘架:" + jobno + "已放满！");
-// return null;
-// }
-// String start_point_code = inst.getStart_point_code();
-// String next_point_code = inst.getNext_point_code();
-// start_point_code = start_point_code + "." + (current_num + 1);
-// destinations.add(destination(start_point_code, "Load", "1", "1"));
-// destinations.add(destination(next_point_code, "Unload", "1", "1"));
-//
-// }
-
String resp = acsToWmsService.requestTaskAgain(address,task.getExt_task_id(),inst.getVehicle_code());
JSONObject respjson = JSONObject.parseObject(resp);
@@ -312,10 +304,12 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
if ("EntryRequired".equals(type)) {
if (addressdevice.getDeviceDriver() instanceof HailiangSmartplcTestDeviceDriver) {
hailiangSmartplcTestDeviceDriver = (HailiangSmartplcTestDeviceDriver) addressdevice.getDeviceDriver();
- if ((hailiangSmartplcTestDeviceDriver.getAction() == 2 || hailiangSmartplcTestDeviceDriver.getAction() == 3) && hailiangSmartplcTestDeviceDriver.getMove() == 0) {
- inst.setExecute_status("3");
- is_feedback = true;
- }
+// if ((hailiangSmartplcTestDeviceDriver.getAction() == 2 || hailiangSmartplcTestDeviceDriver.getAction() == 3) && hailiangSmartplcTestDeviceDriver.getMove() == 0) {
+// inst.setExecute_status("3");
+// is_feedback = true;
+// }
+ is_feedback = true;
+
}
if (addressdevice.getDeviceDriver() instanceof EmptyVehicleStackingPositionDeviceDriver) {
@@ -331,26 +325,32 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
if (addressdevice.getDeviceDriver() instanceof CargoLiftConveyorDeviceDriver) {
cargoLiftConveyorDeviceDriver = (CargoLiftConveyorDeviceDriver) addressdevice.getDeviceDriver();
- if ((cargoLiftConveyorDeviceDriver.getAction() == 2 || cargoLiftConveyorDeviceDriver.getAction() == 3) && cargoLiftConveyorDeviceDriver.getMove() == 0) {
- inst.setExecute_status("3");
- is_feedback = true;
- }
+// if ((cargoLiftConveyorDeviceDriver.getAction() == 2 || cargoLiftConveyorDeviceDriver.getAction() == 3) && cargoLiftConveyorDeviceDriver.getMove() == 0) {
+// inst.setExecute_status("3");
+// is_feedback = true;
+// }
+ is_feedback = true;
+
}
if (addressdevice.getDeviceDriver() instanceof HaoKaiAutoConveyorDeviceDriver) {
haoKaiAutoConveyorDeviceDriver = (HaoKaiAutoConveyorDeviceDriver) addressdevice.getDeviceDriver();
- if ((haoKaiAutoConveyorDeviceDriver.getAction() == 2 || haoKaiAutoConveyorDeviceDriver.getAction() == 3) && haoKaiAutoConveyorDeviceDriver.getMove() == 0) {
- inst.setExecute_status("3");
- is_feedback = true;
- }
+// if ((haoKaiAutoConveyorDeviceDriver.getAction() == 2 || haoKaiAutoConveyorDeviceDriver.getAction() == 3) && haoKaiAutoConveyorDeviceDriver.getMove() == 0) {
+// inst.setExecute_status("3");
+// is_feedback = true;
+// }
+ is_feedback = true;
+
}
if (addressdevice.getDeviceDriver() instanceof PaintConveyorDeviceDriver) {
paintConveyorDeviceDriver = (PaintConveyorDeviceDriver) addressdevice.getDeviceDriver();
- if ((paintConveyorDeviceDriver.getAction() == 2 || paintConveyorDeviceDriver.getAction() == 3) && paintConveyorDeviceDriver.getMove() == 0) {
- inst.setExecute_status("3");
- is_feedback = true;
- }
+// if ((paintConveyorDeviceDriver.getAction() == 2 || paintConveyorDeviceDriver.getAction() == 3) && paintConveyorDeviceDriver.getMove() == 0) {
+// inst.setExecute_status("3");
+// is_feedback = true;
+// }
+ is_feedback = true;
+
}
}
if ("PauseOnStation".equals(type)) {
@@ -470,7 +470,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
JSONArray properties = new JSONArray();
JSONObject pro1 = new JSONObject();
pro1.put("key", "EntryRequired");
- pro1.put("value", "True");
+ pro1.put("value", "true");
properties.add(pro1);
JSONObject pro2 = new JSONObject();
pro2.put("key", "PauseOnStation");
diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml
index 141fb0f..25a0faf 100644
--- a/acs/nladmin-system/src/main/resources/logback-spring.xml
+++ b/acs/nladmin-system/src/main/resources/logback-spring.xml
@@ -140,7 +140,11 @@ https://juejin.cn/post/6844903775631572999
-
+
+
+
+
+