diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java index 01b0b7a..4c52dde 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java @@ -101,7 +101,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { task.apply(param); } catch (Exception e) { String message = e.getMessage(); - log.error("ACS请求LMS出现错误: {}", message); + log.error("ACS请求LMS出现错误: {}",e.getMessage(),e); result.setCode(HttpStatus.HTTP_BAD_REQUEST); result.setMessage(message); result.setRequestNo(requestNo); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java index aa2f285..5751135 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java @@ -157,6 +157,9 @@ public class BPSLTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } String startPoint = taskObj.getPoint_code1(); // 获取起点 + if(startPoint.startsWith("ZJBDJW")){ + startPoint=startPoint.substring(0,startPoint.length()-2); + } String endPoint = taskObj.getPoint_code2(); // 获取终点 SchBasePoint startPointObj = pointService.getById(startPoint); SchBasePoint endPointObj = pointService.getById(endPoint); @@ -205,7 +208,7 @@ public class BPSLTask extends AbstractTask { pointMapper.updatePointType(endPointObj.getPoint_code().substring(0,endPointObj.getPoint_code().length()-2),"1"); // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setGroup_id(one.getGroup_id()); +// taskObj.setGroup_id(one.getGroup_id()); taskObj.setRemark("任务完成"); } if (status.equals(TaskStatus.CANCELED)) { // 取消