root
/
shanghaikaineng_lms
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

rev：测试修改

master
刘先源 9 hours ago
parent
05b0d53abe
commit
9d27e68608
1 changed files with 40 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java

48
acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@ -638,7 +638,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
JSONObject block = new JSONObject();
block.put("blockId", IdUtil.simpleUUID());
block.put("location", inst.getStart_point_code() + "INGET");
block.put("operation", "ForkHeight");
if ("CPJSSX,BZXXL".contains(inst.getStart_device_code())) {
block.put("operation", "script");
} else {
block.put("operation", "ForkHeight");
}
block.put("id", inst.getStart_point_code() + "INGET");
block.put("script_name", "userpy/interact.py");
JSONObject scriptArgs = new JSONObject();
@ -668,7 +672,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
block = new JSONObject();
block.put("blockId", IdUtil.simpleUUID());
block.put("location", inst.getStart_point_code() + "OUTGET");
block.put("operation", "ForkHeight");
if ("CPJSSX,BZXXL".contains(inst.getStart_device_code())) {
block.put("operation", "script");
} else {
block.put("operation", "ForkHeight");
}
block.put("id", inst.getStart_point_code() + "OUTGET");
block.put("script_name", "userpy/interact.py");
JSONObject scriptArgs = new JSONObject();
@ -699,7 +707,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
block = new JSONObject();
block.put("blockId", IdUtil.simpleUUID());
block.put("location", inst.getNext_point_code() + "INPUT");
block.put("operation", "ForkHeight");
if ("CPJSSX,BZXXL".contains(inst.getNext_device_code())) {
block.put("operation", "script");
} else {
block.put("operation", "ForkHeight");
}
block.put("id", inst.getNext_point_code() + "INPUT");
block.put("script_name", "userpy/interact.py");
JSONObject scriptArgs = new JSONObject();
@ -726,7 +738,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
block = new JSONObject();
block.put("blockId", IdUtil.simpleUUID());
block.put("location", inst.getNext_point_code() + "OUTPUT");
block.put("operation", "ForkHeight");
if ("CPJSSX,BZXXL".contains(inst.getNext_device_code())) {
block.put("operation", "script");
} else {
block.put("operation", "ForkHeight");
}
block.put("id", inst.getNext_point_code() + "OUTPUT");
block.put("script_name", "userpy/interact.py");
JSONObject scriptArgs = new JSONObject();
@ -758,7 +774,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
block = new JSONObject();
block.put("blockId", IdUtil.simpleUUID());
block.put("location", inst.getStart_point_code2() + "INGET");
block.put("operation", "ForkHeight");
if ("CPJSSX,BZXXL".contains(inst.getStart_device_code2())) {
block.put("operation", "script");
} else {
block.put("operation", "ForkHeight");
}
block.put("id", inst.getStart_point_code2() + "INGET");
block.put("script_name", "userpy/interact.py");
JSONObject scriptArgs = new JSONObject();
@ -788,7 +808,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
block = new JSONObject();
block.put("blockId", IdUtil.simpleUUID());
block.put("location", inst.getStart_point_code2() + "OUTGET");
block.put("operation", "ForkHeight");
if ("CPJSSX,BZXXL".contains(inst.getStart_device_code2())) {
block.put("operation", "script");
} else {
block.put("operation", "ForkHeight");
}
block.put("id", inst.getStart_point_code2() + "OUTGET");
block.put("script_name", "userpy/interact.py");
JSONObject scriptArgs = new JSONObject();
@ -821,7 +845,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
block = new JSONObject();
block.put("blockId", IdUtil.simpleUUID());
block.put("location", inst.getNext_point_code2() + "INPUT");
block.put("operation", "ForkHeight");
if ("CPJSSX,BZXXL".contains(inst.getNext_device_code2())) {
block.put("operation", "script");
} else {
block.put("operation", "ForkHeight");
}
block.put("id", inst.getNext_point_code2() + "INPUT");
block.put("script_name", "userpy/interact.py");
JSONObject scriptArgs = new JSONObject();
@ -848,7 +876,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
block = new JSONObject();
block.put("blockId", IdUtil.simpleUUID());
block.put("location", inst.getNext_point_code2() + "OUTPUT");
block.put("operation", "ForkHeight");
if ("CPJSSX,BZXXL".contains(inst.getNext_device_code2())) {
block.put("operation", "script");
} else {
block.put("operation", "ForkHeight");
}
block.put("id", inst.getNext_point_code2() + "OUTPUT");
block.put("script_name", "userpy/interact.py");
JSONObject scriptArgs = new JSONObject();

Write Preview
Loading…
Cancel
Save