From bbdb26cb4364aadadd8eb22613e76607ee40b649 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Sat, 26 Apr 2025 09:08:47 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
index fcbc55d89..26e118d65 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
@@ -297,10 +297,10 @@ public class FeedingServiceImpl implements FeedingService {
         if (cool_jo.getString("product_area").equals("B1") && cool_jo.getString("point_type").equals("1")) {
             JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("full_point_code = '" + next_point_code + "' and product_area='"+cool_jo.getString("product_area")+"'").uniqueResult(0);
             if (ObjectUtil.isEmpty(cut_jo)) {
-                cut_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + next_point_code + "' and product_area='"+cool_jo.getString("product_area")+"'").uniqueResult(0);
+                cut_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + next_point_code + "' and product_area='"+cool_jo.getString("product_area")+"' and point_type in ('1','6')").uniqueResult(0);
             }
             if (ObjectUtil.isEmpty(cut_jo)) {
-                throw new BadRequestException("请扫描B1车间分切机满轴点位或分切缓存位满轴点位做为终点！");
+                throw new BadRequestException("请扫描B1车间分切机满轴点位、分切缓存位满轴点位、生箔冷却缓存位满轴点位做为终点！");
             }
             //创建AGV任务
             JSONObject jo = new JSONObject();