From 916630570750eaf406af58e1ebe9764ae9bcc5ff Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Fri, 21 Jun 2024 14:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=9B=BA=E5=8C=96=E5=AE=A4?=
 =?UTF-8?q?=E4=B9=8B=E9=97=B4=E4=BA=92=E7=9B=B8=E5=BC=82=E5=B8=B8=E4=B8=8D?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/tasks/auto/GHCMLTask.java            | 32 +++++++++++--------
 .../task/tasks/auto/GHCQLTask.java            | 16 ++++++----
 2 files changed, 28 insertions(+), 20 deletions(-)

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 88eeb27..e2b6f55 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
@@ -77,19 +77,23 @@ public class GHCMLTask extends AbstractTask {
         List<SchBasePoint> ghsExitList = autoMapper.getGHSExitMaterialList();
         AbstractTask task = taskFactory.getTask(TASK_CONFIG_CODE);
         ghsExitList.forEach(point -> {
-            JSONObject param = new JSONObject();
-            param.put("config_code", TASK_CONFIG_CODE);
-            param.put("requestNo", "LMS" + IdUtil.simpleUUID());
-            param.put("device_code", point.getPoint_code());
-            param.put("vehicle_code", point.getVehicle_code());
-            param.put("vehicle_type", point.getVehicle_type());
-            param.put("create_mode", GeneralDefinition.AUTO_CREATION);
-            SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getVehicleGroupInfo(
-                    point.getVehicle_code(),
-                    point.getVehicle_type(),
-                    GroupBindMaterialStatusEnum.BOUND.getValue());
-            param.put("material_id", groupInfo.getMaterial_id());
-            task.apply(param);
+            try {
+                JSONObject param = new JSONObject();
+                param.put("config_code", TASK_CONFIG_CODE);
+                param.put("requestNo", "LMS" + IdUtil.simpleUUID());
+                param.put("device_code", point.getPoint_code());
+                param.put("vehicle_code", point.getVehicle_code());
+                param.put("vehicle_type", point.getVehicle_type());
+                param.put("create_mode", GeneralDefinition.AUTO_CREATION);
+                SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getVehicleGroupInfo(
+                        point.getVehicle_code(),
+                        point.getVehicle_type(),
+                        GroupBindMaterialStatusEnum.BOUND.getValue());
+                param.put("material_id", groupInfo.getMaterial_id());
+                task.apply(param);
+            } catch (Exception e) {
+                log.error("{}创建任务失败{}{}", this.TASK_CONFIG_CODE, e, e.getMessage());
+            }
         });
     }
 
@@ -307,7 +311,7 @@ public class GHCMLTask extends AbstractTask {
 //            throw new BadRequestException("找不到任务：[" + task_id + "]等待点!");
 //        }
         if (!"DDD".equals(task.getPoint_code2())) {
-            log.info("任务号{}已请求过二次分配，直接返回已分配地址{}",task_id,task.getPoint_code2());
+            log.info("任务号{}已请求过二次分配，直接返回已分配地址{}", task_id, task.getPoint_code2());
             return task.getPoint_code2();
         }
 //        SchBasePoint waitPointObj = pointService.getById(waitPoint);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCQLTask.java
index 3bb5718..6a31040 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCQLTask.java
@@ -76,12 +76,16 @@ public class GHCQLTask extends AbstractTask {
         List<SchBasePoint> ghsExitList = autoMapper.getGHSExitAvailableList();
         AbstractTask task = taskFactory.getTask(TASK_CONFIG_CODE);
         ghsExitList.forEach(point -> {
-            JSONObject param = new JSONObject();
-            param.put("config_code", TASK_CONFIG_CODE);
-            param.put("requestNo", "LMS" + IdUtil.simpleUUID());
-            param.put("device_code", point.getPoint_code());
-            param.put("create_mode", GeneralDefinition.AUTO_CREATION);
-            task.apply(param);
+            try {
+                JSONObject param = new JSONObject();
+                param.put("config_code", TASK_CONFIG_CODE);
+                param.put("requestNo", "LMS" + IdUtil.simpleUUID());
+                param.put("device_code", point.getPoint_code());
+                param.put("create_mode", GeneralDefinition.AUTO_CREATION);
+                task.apply(param);
+            }catch (Exception e){
+                log.error("{}创建任务失败{}{}",this.TASK_CONFIG_CODE,e,e.getMessage());
+            }
         });
     }