From 18fd70782065b67b27cb2413a9cb05c20c8c8696 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Tue, 1 Apr 2025 22:06:23 +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

---
 .../nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java    | 6 +++++-
 .../src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index 6cd2f400c..c53411798 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -1707,7 +1707,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             if (ObjectUtil.isEmpty(Type)) {
                 throw new BadRequestException("传入的类型不能为空！");
             }
-
+            //表处设备表
             JSONObject device_jo = WQLObject.getWQLObject("st_ivt_stpointivt").query("ext_code = '" + ResourceName + "'").uniqueResult(0);
             if (ObjectUtil.isEmpty(device_jo)) {
                 throw new BadRequestException("未查询到[" + ResourceName + "]应的表处机设备！");
@@ -1735,10 +1735,14 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     form.put("acs_task_type", "3");
                 } else {
                     //取满取空放满放空
+                    //满轴
                     form.put("point_code1", jsonCoolIvt.getString("full_point_code"));
+                    //放满
                     form.put("point_code2", device_jo.getString("up_point_code") + "_M");
+                    //取空
                     form.put("point_code3", device_jo.getString("up_point_code") + "_K");
                     //判断对应空轴点位是否为空，为空用当前点位，不为空查询其他点位
+                    //01没有空轴
                     if (jsonCoolIvt.getString("empty_point_status").equals("01")) {
                         form.put("point_code4", jsonCoolIvt.getString("empty_point_code"));
                     } else {
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 7ea390f26..91762a1a4 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
@@ -340,7 +340,7 @@ IF 输入.flag = "6"
                 FROM
                 	ST_IVT_CoolPointIvt ivt
                 WHERE
-                    ivt.empty_point_status = '02'
+                    ivt.empty_point_status = '01'
                 AND ivt.point_type = '1'
                 AND
                     ivt.is_used = '1'