From 4cd78bf1a35ff9e358cfeb4dc360001fba036891 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Fri, 28 Mar 2025 13:45:04 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slitter/auto/AutoCallAirShaftTask.java     | 14 +-------------
 .../auto/AutoSendShaftCacheAgvTask.java        | 18 ------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendShaftCacheAgvTask.java

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
index 0b6357ac3..3b75dcb7b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
@@ -232,7 +232,7 @@ public class AutoCallAirShaftTask {
         // update: 不需要(同标箔或者锂电分开)
         // todo: 需要校验区域0/1
         List<BstIvtCutpointivt> qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification);
-        if (qzzPoint.size() == 0) {
+        if (qzzPoint.size() == 0) {//若套轴暂存位没有相同规格的气胀轴，直接去气胀轴库找即可
             // 调用ACS滚条气涨轴下来
             if (!toAcsOutShaft(qzzSize,location, empty)) {
                 log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code());
@@ -245,18 +245,6 @@ public class AutoCallAirShaftTask {
         }
         // 查找一条没任务的点位
         BstIvtCutpointivt startPoint = qzzPoint.get(0);
-        if (ObjectUtil.isEmpty(startPoint)) {
-            // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
-            saveCutPlanMessage(empty, needPlans, qzzSize);
-            // 如果不存在，则发起信号滚气涨轴
-            // 调用ACS滚条气涨轴下来
-            if (!toAcsOutShaft(qzzSize, location, empty)) {
-                log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code());
-                return;
-            }
-            toCallAgvMovePaperTube(needPlans, location, empty);
-            return;
-        }
         // 创建任务
         JSONObject param = new JSONObject();
         param.put("point_code1", ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendShaftCacheAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendShaftCacheAgvTask.java
deleted file mode 100644
index a3f04e207..000000000
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendShaftCacheAgvTask.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.nl.b_lms.sch.tasks.slitter.auto;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.b_lms.sch.tasks.slitter.SlitterDownAgvTask;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author: lyd
- * @Description:
- * @Date: 2024/2/1
- */
-@Deprecated
-@Slf4j
-@Component
-public class AutoSendShaftCacheAgvTask {
-
-}