From 8d703dc363e0e1e624c19b3e82fa66d561d017e9 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Sun, 15 Dec 2024 17:20:27 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E8=A1=A5=E7=A9=BA?=
 =?UTF-8?q?=E6=9E=B6=E7=94=9F=E6=88=90=E7=82=B9=E4=BD=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/sch/task/service/impl/SchBaseTaskServiceImpl.java   | 6 ------
 .../org/nl/wms/sch/task_manage/task/tasks/kj/KJQKTask.java  | 5 ++++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
index eb2f386..1a9816f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
@@ -178,25 +178,19 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         String type = ObjectUtil.isNotEmpty(param.getString("task_type")) ? param.getString("task_type") : null;
         String vehicle_code = ObjectUtil.isNotEmpty(param.getString("vehicle_code")) ? param.getString("vehicle_code") : null;
         String config_code = param.getString("config_code");
-
        if("4".equals(type)){
            //4-叫料
-
        }else if("5".equals(type)){
            //5-满料出库
            if(device_code.startsWith("TBX")){
                config_code="MJXLTask";
                param.put("config_code",config_code);
            }
-
        }else if("6".equals(type)){
            //6-申请空盘
-
        }else if("7".equals(type)){
            //7-空托盘出库
-
        }
-
        if(ObjectUtil.isEmpty(config_code)){
            throw new BadRequestException("任务类型不正确!device_code："+device_code+",type："+type);
        }
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 a4138fb..e39d679 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
@@ -63,6 +63,9 @@ public class KJQKTask extends AbstractTask {
         JSONObject extGroupData = JSONObject.parseObject(requestParam);
         // 根据对接位查找对应的载具类型
         SchBasePoint endPoint = pointService.getById(task.getPoint_code2());
+        if (!endPoint.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode())) {
+            throw new BadRequestException("目标点位:" + endPoint.getPoint_code() + ",点位状态不为无货,不满足补空架任务生成条件");
+        }
         extGroupData.put("vehicle_type", endPoint.getCan_vehicle_type());
         SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
         if (ObjectUtil.isEmpty(point)) {
@@ -74,7 +77,7 @@ public class KJQKTask extends AbstractTask {
         task.setRemark("");
         task.setTask_status(TaskStatus.CREATED.getCode());
         taskService.save(task);
-
+        log.error("tofix_KJQKTask+" + task.getPoint_code1() + ":" + task.getPoint_code2() + "创建任务成功!");
         point.setIng_task_code(task.getTask_code());
         PointUtils.setUpdateByAcs(point);
         pointService.updateById(point);