diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/HJXToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/HJXToAcsServiceImpl.java index badfabc..0053fd2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/HJXToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/HJXToAcsServiceImpl.java @@ -95,7 +95,7 @@ public class HJXToAcsServiceImpl implements HJXToAcsService { break; } } - if (StrUtil.isEmpty(endCode)) { + if (StrUtil.isNotEmpty(endCode)) { TaskDto taskDto = new TaskDto(); taskDto.setTask_code(CodeUtil.getNewCode("TASK_NO")); taskDto.setStart_device_code(portCode); @@ -154,8 +154,9 @@ public class HJXToAcsServiceImpl implements HJXToAcsService { } for (VehicleDto vehicleDto : VehicleDtoList) { vehicleDto.setOrder_code(orderCode); + vehicleService.update(vehicleDto); } - if (StrUtil.isEmpty(startCode)) { + if (StrUtil.isNotEmpty(startCode)) { DeviceDto startDeviceDto = deviceService.findByCode(startCode); TaskDto taskDto = new TaskDto(); taskDto.setTask_code(CodeUtil.getNewCode("TASK_NO")); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 5c5ffc3..1769567 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -1806,9 +1806,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } for (VehicleDto vehicleDto : VehicleDtoList) { vehicleDto.setOrder_code(entity.getCompound_task()); + vehicleService.update(vehicleDto); } - if (StrUtil.isEmpty(startCode)) { + if (StrUtil.isNotEmpty(startCode)) { DeviceDto startDeviceDto = deviceService.findByCode(startCode); TaskDto taskDto = new TaskDto(); taskDto.setTask_code(CodeUtil.getNewCode("TASK_NO"));