From 89ecd6ef4e62ca5fc30e3cfee79a72dcfdf7f3bb Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Sat, 1 Mar 2025 20:39:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20B1=E7=94=9F=E7=AE=94=E4=B8=8B=E6=96=99?=
 =?UTF-8?q?=E4=B8=8E=E5=88=86=E5=88=87=E6=9A=82=E5=AD=98=E6=9E=B6=E6=B7=B7?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mps/service/impl/RawFoilServiceImpl.java  |  2 +-
 .../org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java
index 19c41e750..27bb52e8b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java
@@ -175,7 +175,7 @@ public class RawFoilServiceImpl implements RawFoilService {
         if (jsonSb.getString("product_area").equals("B1")) {
             // 2.根据就近原则查对应空卷轴
             JSONObject map = new JSONObject();
-            map.put("flag", "6");
+            map.put("flag", "601");
             map.put("product_area", jsonSb.getString("product_area"));
             map.put("point_location", jsonSb.getString("point_location"));
             // 查找冷却区空轴位状态是空轴的点位
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
index 97223b505..7ea390f26 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
@@ -333,3 +333,39 @@ IF 输入.flag = "6"
 		ENDQUERY
 	ENDIF
 
+	IF 输入.flag = "601"
+    		QUERY
+    			SELECT
+                	ivt.*
+                FROM
+                	ST_IVT_CoolPointIvt ivt
+                WHERE
+                    ivt.empty_point_status = '02'
+                AND ivt.point_type = '1'
+                AND
+                    ivt.is_used = '1'
+                AND NOT EXISTS (
+                       SELECT
+                          *
+                       FROM
+                          sch_base_task
+                       WHERE
+                          ( point_code1 = ivt.empty_point_code OR point_code4 = ivt.empty_point_code )
+                          AND task_status < '07'
+                       AND is_delete = '0'
+                    )
+
+                    OPTION 输入.product_area <> ""
+                        ivt.product_area = 输入.product_area
+                    ENDOPTION
+
+                    OPTION 输入.point_location <> ""
+                        ivt.point_location = 输入.point_location
+                    ENDOPTION
+
+                    order by ivt.point_code ASC
+
+    			ENDSELECT
+    		ENDQUERY
+    	ENDIF
+