|
|
@ -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"))) { |
|
|
|