From 23ec77a3818504173966ca6fbaca6511b846fee7 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 19 Feb 2025 17:06:29 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E9=80=81=E8=BD=B4=E6=98=AF=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=EF=BC=8C=E6=97=A0=E9=9C=80=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java index ba7e68b03..9bc015e9b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java @@ -116,12 +116,7 @@ public class AutoSendAirShaftAgvTask { // 如果两个气涨轴编码则表示一组满了 // 查找分切对接没任务的空位 // hint: B1、B2、B3、B4分切区分两个桁架位置 (B1,B3: 1-6为上。B2，B4是1-5为上区域) -// List emptyPoint = slitterMapper.getEmptyCutPointNotTask(area, -// deviceCut.getSort_seq(), -// SlitterTaskUtil.getPointLocationInCutDevice( -// SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name()), -// area)); - List emptyPoint = slitterMapper.nbjGetEmptyCutPointNotTask(area, + List emptyPoint = slitterMapper.getEmptyCutPointNotTask(area, deviceCut.getSort_seq(), SlitterTaskUtil.getPointLocationInCutDevice( SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name()),