diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java index bd841bc..9a1373f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java @@ -51,7 +51,7 @@ public class AcsUtil { String msg = e.getMessage(); //ConnectException: Connection refused: connect //网络不通 - System.out.println(msg); + log.error("连接失败:{}", msg); result.put("status", HttpStatus.BAD_REQUEST); result.put("message", "网络不通,操作失败!"); result.put("data", new JSONObject()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java index b796b81..b03473b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java @@ -116,10 +116,10 @@ public class GHCMLTask extends AbstractTask { jsonObject.put("material_id", ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getMaterial_id() : null); jsonObject.put("pcsn",ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getPcsn() : null); SchBasePoint point = findNextPoint(nextRegionStr, jsonObject); - log.info("当前任务{}找到预计终点{}",task.getTask_id(),point.getPoint_code()); if (ObjectUtil.isEmpty(point)) { throw new BadRequestException("涂板线[" + task.getPoint_code1() + "]未找到所需点位!"); } + log.info("当前任务{}找到预计终点{}",task.getTask_id(),point.getPoint_code()); // 设置组盘 - 需要的话由子类自行实现 task.setGroup_id(setGroupPlate(jsonObject)); // 设置等待点并修改创建成功状态 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml index bc0ca1b..ce0b4bb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml @@ -38,7 +38,7 @@ and vg.material_id=#{materialId} and RIGHT(vg.pcsn,8)=RIGHT(#{pcsn},8) ) - ORDER BY p.row_num, p.col_num + ORDER BY p.row_num, p.col_num desc