From e1e81b54e0975f95e678a903eb22bde44503ebe1 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 30 Apr 2025 15:10:45 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E9=9B=B6=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=AD=90=E5=8D=B7=E4=B8=8B=E7=BA=BF2=E4=B8=AA=E7=82=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 56 ++++++++++--------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 244f554bf..84f1b02bf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1895,34 +1895,40 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { //创建输送线四个点任务 return createTask(containerName, jo, kzjPointList.get(0).getPoint_code(), whereJson.getString("device_code")); } else { + result.put("status", HttpStatus.BAD_REQUEST.value()); + result.put("message", "空轴位缓存位无载具"); + return result; //创建输送线->满轴缓存位两个点任务 - return createTask2(containerName, jo); +// return createTask2(containerName, jo); } } else { - //如果满轴位没有可用的空点位，先创建一个桁架任务但是不下发，等这边空出来点位，判断是否有这种桁架任务然后补发； - List taskTypes = new ArrayList<>(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"), PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"), PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"))); - List existTaskList = taskService.getExistTasks(taskTypes); - //如果有就不创建，没有就创建 - if (ObjectUtils.isEmpty(existTaskList)) { - //只确定起点NBJ1002 - JSONObject jo2 = new JSONObject(); - jo2.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务")); - jo2.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位")); - jo2.put("point_code1", "NBJ1002"); - jo2.put("vehicle_code", containerName); - jo2.put("task_status", TaskStatusEnum.SURE_START.getCode()); - jo2.put("is_send", false); - mzhcwTask.createTask(jo2); - PdmProductSpecServiceImpl.doRecord(SpecEnum.XX,null,Boolean.TRUE,null,containerName); - //不确定起点的空载具缓存位->输送线任务 - createTask3(containerName); - result.put("status", HttpStatus.OK.value()); - result.put("message", "反馈成功!"); - } else { - log.info("已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList.get(0).getTask_code() + "，请检查!"); - result.put("status", HttpStatus.BAD_REQUEST.value()); - result.put("message", "已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList.get(0).getTask_code() + "，请检查!"); - } + result.put("status", HttpStatus.BAD_REQUEST.value()); + result.put("message", "满轴缓存位无可用位置"); + return result; +// //如果满轴位没有可用的空点位，先创建一个桁架任务但是不下发，等这边空出来点位，判断是否有这种桁架任务然后补发； +// List taskTypes = new ArrayList<>(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"), PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"), PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"))); +// List existTaskList = taskService.getExistTasks(taskTypes); +// //如果有就不创建，没有就创建 +// if (ObjectUtils.isEmpty(existTaskList)) { +// //只确定起点NBJ1002 +// JSONObject jo2 = new JSONObject(); +// jo2.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务")); +// jo2.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位")); +// jo2.put("point_code1", "NBJ1002"); +// jo2.put("vehicle_code", containerName); +// jo2.put("task_status", TaskStatusEnum.SURE_START.getCode()); +// jo2.put("is_send", false); +// mzhcwTask.createTask(jo2); +// PdmProductSpecServiceImpl.doRecord(SpecEnum.XX,null,Boolean.TRUE,null,containerName); +// //不确定起点的空载具缓存位->输送线任务 +// createTask3(containerName); +// result.put("status", HttpStatus.OK.value()); +// result.put("message", "反馈成功!"); +// } else { +// log.info("已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList.get(0).getTask_code() + "，请检查!"); +// result.put("status", HttpStatus.BAD_REQUEST.value()); +// result.put("message", "已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList.get(0).getTask_code() + "，请检查!"); +// } } } else { log.info("二楼到一楼成品子卷到达一楼输送线任务正在创建被锁住。");