From be527e4dbb97ac7c11fbad69d7c7890af79cb8f8 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 23 Dec 2022 16:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91acs?= =?UTF-8?q?=E7=BB=88=E7=82=B9=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java | 2 +- .../org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java | 2 +- .../org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java | 2 +- .../org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java | 2 +- .../org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java | 2 +- .../org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java | 2 +- .../org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java index 72950a2..cd17885 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java @@ -406,7 +406,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) .start_device_code(point_code1) - .next_device_code(json.getString("point_code3")) + .next_device_code(json.getString("point_code2")) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java index 97e5e37..6905261 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java @@ -414,7 +414,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) .start_device_code(point_code1) - .next_device_code(json.getString("point_code3")) + .next_device_code(json.getString("point_code2")) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java index 7c31707..12829d3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java @@ -172,7 +172,7 @@ public class YqxCallMaterialTask extends AbstractAcsTask { .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) .start_device_code(newPoint) - .next_device_code(json.getString("point_code3")) + .next_device_code(json.getString("point_code2")) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java index 1cd708d..92dbc1f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java @@ -188,7 +188,7 @@ public class CpOutTask extends AbstractAcsTask { .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code3")) + .next_device_code(json.getString("point_code2")) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java index 34162d3..fc79bed 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java @@ -423,7 +423,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask { for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); - String point_code3=json.getString("point_code3"); + String point_code3=json.getString("point_code2"); //判断终点是否属于养生A区 if (point_code3.startsWith("2")) { //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java index e7cc37c..2639a8d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java @@ -375,7 +375,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); - String point_code3 = json.getString("point_code3"); + String point_code3 = json.getString("point_code2"); //判断终点是否属于养生A区 if (point_code3.startsWith("2")) { //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java index 5419c5f..ffa5a57 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java @@ -178,7 +178,7 @@ public class HkxSendMaterialTask extends AbstractAcsTask { .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code3")) + .next_device_code(json.getString("point_code2")) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java index c28b8e4..fda2ebe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java @@ -261,7 +261,7 @@ public class YqxSendMaterialTask extends AbstractAcsTask { .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code3")) + .next_device_code(json.getString("point_code2")) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority"))