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

更新接口

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-02-15 15:23:13 +08:00
parent f4f88c818e
commit 3a1f0805c7
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -527,7 +527,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
this.setNow_steps_type3(9); this.setNow_steps_type3(9);
} }
} else { } else {
log.warn("后工位放货位有货,放货位:{},mode:{},move:{}", next_device_code, mode, move); // log.warn("后工位放货位有货,放货位:{},mode:{},move:{}", next_device_code, mode, move);
if (this.getNow_steps_type1() == 4 || this.getNow_steps_type3() == 8) { if (this.getNow_steps_type1() == 4 || this.getNow_steps_type3() == 8) {
feedMessage = "前工位未放货原因-->"; feedMessage = "前工位未放货原因-->";
if (mode != 2) { if (mode != 2) {

46
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -586,31 +586,35 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
if (StrUtil.isEmpty(route_plan_code)) { if (StrUtil.isEmpty(route_plan_code)) {
route_plan_code = "normal"; route_plan_code = "normal";
} }
Device device = deviceAppService.findDeviceByCode(next_device_code);
SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; if(StrUtil.equals(task_type,"5")){
if(device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { Device device = deviceAppService.findDeviceByCode(next_device_code);
siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); SiemensConveyorDeviceDriver siemensConveyorDeviceDriver;
if (ObjectUtil.equal("true", siemensConveyorDeviceDriver.getExtraValue().get("inspect_in_stock"))) { if(device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) {
if(siemensConveyorDeviceDriver.getMove() == 1) siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver();
{ if (ObjectUtil.equal("true", siemensConveyorDeviceDriver.getExtraValue().get("inspect_in_stock"))) {
JSONObject json = new JSONObject(); if(siemensConveyorDeviceDriver.getMove() == 1)
json.put("task_code", task_code); {
json.put("ext_task_id", ext_task_id); JSONObject json = new JSONObject();
json.put("message", "终点有货无法生成任务"); json.put("task_code", task_code);
errArr.add(json); json.put("ext_task_id", ext_task_id);
continue; json.put("message", "终点有货无法生成任务");
errArr.add(json);
continue;
}
} }
} }
if( taskService.querySameDeviceReadyTask(start_device_code,next_device_code,"0") > 1){
JSONObject json = new JSONObject();
json.put("task_code", task_code);
json.put("ext_task_id", ext_task_id);
json.put("message", "已存在相同的起点终点未执行的输送任务");
errArr.add(json);
continue;
}
} }
if( StrUtil.equals(task_type,"5") && taskService.querySameDeviceReadyTask(start_device_code,next_device_code,"0") > 1){
JSONObject json = new JSONObject();
json.put("task_code", task_code);
json.put("ext_task_id", ext_task_id);
json.put("message", "已存在相同的起点终点未执行的输送任务");
errArr.add(json);
continue;
}
TaskDto taskDto = taskService.findByCodeFromCache(task_code); TaskDto taskDto = taskService.findByCodeFromCache(task_code);
if (taskDto != null) { if (taskDto != null) {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();