From 9cf5c4bc454c37c2c6939619be40e7da6b055d5d Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 5 Feb 2026 10:25:49 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E9=83=A8=E5=88=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/WmsToAcsServiceImpl.java | 20 +++++++++++++++++-- .../sch_manage/service/util/AbstractTask.java | 1 + .../service/util/tasks/zw/InBillTask.java | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 926c8ab..3759e6c 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -89,6 +89,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { // return response; // } // 将LMS任务转成ACS任务并保存, 因为到这里的都是一整组，失败一条就全失败 + boolean failures = false; for (int i = 0; i < datas.size(); i++) { String data = datas.get(i).toString(); CreateTaskRequest request = JsonUtl.format(data, CreateTaskRequest.class); @@ -136,12 +137,21 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String next_point_code = ""; String next_point_code2 = ""; String put_point_code = ""; + if (failures) { + JSONObject json = new JSONObject(); + json.put("task_code", task_code); + json.put("ext_task_id", ext_task_id); + json.put("message", "前置任务出错！"); + errArr.add(json); + continue; + } if (StrUtil.isEmpty(task_code)) { JSONObject json = new JSONObject(); json.put("task_code", task_code); json.put("ext_task_id", ext_task_id); json.put("message", "任务号不能为空"); errArr.add(json); + failures = true; continue; } if (StrUtil.isEmpty(start_device_code)) { @@ -149,6 +159,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { json.put("task_code", task_code); json.put("ext_task_id", ext_task_id); json.put("message", "起点不能为空"); + failures = true; errArr.add(json); continue; } @@ -157,6 +168,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { json.put("task_code", task_code); json.put("ext_task_id", ext_task_id); json.put("message", "终点不能为空"); + failures = true; errArr.add(json); continue; } @@ -243,6 +255,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { json.put("ext_task_id", ext_task_id); json.put("message", "存在相同的任务号:" + task_code); errArr.add(json); + failures = true; continue; } if (!StrUtil.isEmpty(vehicle_code)) { @@ -253,6 +266,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { json.put("ext_task_id", ext_task_id); json.put("message", "已存在任务编号为" + vehicle_dto.getTask_code() + "托盘号:" + vehicle_code); errArr.add(json); + failures = true; continue; } } @@ -263,6 +277,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { json.put("ext_task_id", ext_task_id); json.put("message", request.getStart_device_code() + " 该设备号未找到对应点位"); errArr.add(json); + failures = true; continue; } if (StrUtil.isEmpty(next_point_code)) { @@ -271,6 +286,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { json.put("ext_task_id", ext_task_id); json.put("message", request.getNext_device_code() + " 该设备号未找到对应点位"); errArr.add(json); + failures = true; continue; } @@ -322,7 +338,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { task_dto.setInteractionJson(request.getInteraction_json()); } taskserver.create(task_dto); - } catch (Exception e) { // e.printStackTrace(); JSONObject json = new JSONObject(); @@ -330,9 +345,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { json.put("ext_task_id", ext_task_id); json.put("message", ObjectUtil.isEmpty(e.getMessage()) ? "空指针" : e.getMessage()); errArr.add(json); - continue; + failures = true; } } + if (ObjectUtil.isEmpty(errArr)) { response.setStatus(200); response.setMessage("success"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java index 293df36..0273daf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java @@ -75,6 +75,7 @@ public abstract class AbstractTask { List taskList = taskService.list(new LambdaQueryWrapper() .eq(SchBaseTask::getIs_delete, IOSConstant.IS_DELETE_NO) .eq(SchBaseTask::getTask_status, TaskStatus.CREATED.getCode()) + .orderByAsc(SchBaseTask::getFailures) .orderByAsc(SchBaseTask::getTask_group_id) .orderByAsc(SchBaseTask::getTask_group_seq)); if (ObjectUtil.isEmpty(taskList)) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java index 1056639..3f2961a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java @@ -121,7 +121,7 @@ public class InBillTask extends AbstractTask { acsTaskDto.setStart_device_code2(taskDao.getPoint_code3()); acsTaskDto.setNext_device_code2(taskDao.getPoint_code4()); acsTaskDto.setPriority(taskDao.getPriority()); - acsTaskDto.setTask_type("1"); + acsTaskDto.setTask_type("4"); return acsTaskDto; }