From 5b9f7984909f627c80600e9c552056617bb9b06a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?=
 <9463626+zhou-junjiezjj@user.noreply.gitee.com>
Date: Tue, 2 Jul 2024 16:30:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8E=8B=E5=88=B6=E6=BB=A1=E6=96=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 9 +--------
 .../nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java   | 3 +++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 258afd9..6792cd4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -310,7 +310,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 if (ObjectUtil.isEmpty(basePoint)) {
                     throw new BadRequestException("点位错误！");
                 }
-
                 // 组织参数
                 param.put("config_code", configCode);
                 taskService.apply(param);
@@ -340,7 +339,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         String configCode = basePoint.getRegion_code() + "MLTask";
         RLock lock = redissonClient.getLock(configCode);
         // 无业务：0
-        int handling = 0;
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLock) {
@@ -349,20 +347,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 }
                 // 组织参数
                 param.put("config_code", configCode);
-                handling = specialHandling(basePoint.getRegion_code(), param);
-                param.put("special_param", handling);
                 taskService.apply(param);
             }
-        }catch(Exception e){
-        log.info("入库业务出现错误{}",e.getMessage());
-        return ApplyTaskResponse.responseError(requestNo,e.getMessage());
         }
         finally {
             if (tryLock) {
                 lock.unlock();
             }
         }
-        return ApplyTaskResponse.responseOk(requestNo, "任务创建成功", handling);
+        return ApplyTaskResponse.responseOk(requestNo);
     }
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java
index 9a72c7c..b519b22 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java
@@ -158,6 +158,9 @@ public class YZMLTask extends AbstractTask {
                 ? workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>()
                 .eq(PdmBdWorkorder::getWorkorder_code, workorderCode))
                 : null;
+        if (one == null) {
+            throw new BadRequestException("压制机的工单不能为空!");
+        }
         // 判断是否加急，加急则去加急线，不加急就是去缓存输送线
         assert one != null;
         if (one.getIs_urgent()) {