diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJQKTask.java index e39d679..c95ca81 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJQKTask.java @@ -52,6 +52,7 @@ public class KJQKTask extends AbstractTask { @Override protected void createCompletion(SchBaseTask task) { + // 配置信息 SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); @@ -63,7 +64,9 @@ public class KJQKTask extends AbstractTask { JSONObject extGroupData = JSONObject.parseObject(requestParam); // 根据对接位查找对应的载具类型 SchBasePoint endPoint = pointService.getById(task.getPoint_code2()); + log.error("tofix__KJQKTask_目标点位:" + endPoint.getPoint_code() + ",点位状态为:"+endPoint.getPoint_status()); if (!endPoint.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode())) { + log.error("tofix__KJQKTask_目标点位:" + endPoint.getPoint_code() + ",点位状态不为无货,不满足补空架任务生成条件"); throw new BadRequestException("目标点位:" + endPoint.getPoint_code() + ",点位状态不为无货,不满足补空架任务生成条件"); } extGroupData.put("vehicle_type", endPoint.getCan_vehicle_type()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java index 2ba11d0a..ae5779e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * @Author: lyd + * @Author: lyd * @Description: 涂板线满料请求 * @Date: 2023/11/17 */ @@ -134,7 +134,7 @@ public class TBXMLTask extends AbstractTask { String requestParam = task.getRequest_param(); JSONObject jsonObject = JSONObject.parseObject(requestParam); SchBasePoint point = findNextPoint(nextRegionStr, jsonObject); -// String pointCode = againApplyLocal(task,point.getPoint_code(),task.getTask_id()); + // String pointCode = againApplyLocal(task,point.getPoint_code(),task.getTask_id()); if (ObjectUtil.isEmpty(point)) { log.error("TBXMLTask-涂板线满料请求[" + task.getPoint_code1() + "]未找到所需固化室的点位!"); throw new BadRequestException("涂板线[" + task.getPoint_code1() + "]未找到所需固化室的点位!");