root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务下发acs终点位置修改

Browse Source
This commit is contained in:
liyongde
2022-12-23 16:05:09 +08:00
parent db04170b01
commit be527e4dbb
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
View File

@@ -406,7 +406,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
.task_code(json.getString("task_code")) .task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type")) .task_type(json.getString("acs_task_type"))
.start_device_code(point_code1) .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_code(json.getString("vehicle_code"))
.vehicle_type(json.getString("vehicle_type")) .vehicle_type(json.getString("vehicle_type"))
.priority(json.getString("priority")) .priority(json.getString("priority"))

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
View File

@@ -414,7 +414,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
.task_code(json.getString("task_code")) .task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type")) .task_type(json.getString("acs_task_type"))
.start_device_code(point_code1) .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_code(json.getString("vehicle_code"))
.vehicle_type(json.getString("vehicle_type")) .vehicle_type(json.getString("vehicle_type"))
.priority(json.getString("priority")) .priority(json.getString("priority"))

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java
View File

@@ -172,7 +172,7 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
.task_code(json.getString("task_code")) .task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type")) .task_type(json.getString("acs_task_type"))
.start_device_code(newPoint) .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_code(json.getString("vehicle_code"))
.vehicle_type(json.getString("vehicle_type")) .vehicle_type(json.getString("vehicle_type"))
.priority(json.getString("priority")) .priority(json.getString("priority"))

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java
View File

@@ -188,7 +188,7 @@ public class CpOutTask extends AbstractAcsTask {
.task_code(json.getString("task_code")) .task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type")) .task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1")) .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_code(json.getString("vehicle_code"))
.vehicle_type(json.getString("vehicle_type")) .vehicle_type(json.getString("vehicle_type"))
.priority(json.getString("priority")) .priority(json.getString("priority"))

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java
View File

@@ -423,7 +423,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i); JSONObject json = arr.getJSONObject(i);
String point_code3=json.getString("point_code3"); String point_code3=json.getString("point_code2");
//判断终点是否属于养生A区 //判断终点是否属于养生A区
if (point_code3.startsWith("2")) { if (point_code3.startsWith("2")) {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java
View File

@@ -375,7 +375,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
ArrayList<AcsTaskDto> resultList = new ArrayList<>(); ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i); JSONObject json = arr.getJSONObject(i);
String point_code3 = json.getString("point_code3"); String point_code3 = json.getString("point_code2");
//判断终点是否属于养生A区 //判断终点是否属于养生A区
if (point_code3.startsWith("2")) { if (point_code3.startsWith("2")) {
//养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java
View File

@@ -178,7 +178,7 @@ public class HkxSendMaterialTask extends AbstractAcsTask {
.task_code(json.getString("task_code")) .task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type")) .task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1")) .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_code(json.getString("vehicle_code"))
.vehicle_type(json.getString("vehicle_type")) .vehicle_type(json.getString("vehicle_type"))
.priority(json.getString("priority")) .priority(json.getString("priority"))

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
View File

@@ -261,7 +261,7 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
.task_code(json.getString("task_code")) .task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type")) .task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1")) .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_code(json.getString("vehicle_code"))
.vehicle_type(json.getString("vehicle_type")) .vehicle_type(json.getString("vehicle_type"))
.priority(json.getString("priority")) .priority(json.getString("priority"))