From 85ad76ab6ac535a532cee445993b37b50e7cadf0 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Fri, 12 Apr 2024 17:26:29 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=86=B7=E5=8D=B4=E5=8C=BA=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java | 5 ++---
 1 file changed, 2 insertions(+), 3 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 f5ec88577..1238cd392 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
@@ -344,7 +344,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     log.info("母卷：" + ContainerName + "被决策入烘箱，请求烘烤标识改为1");
 
                     String point_code = "";
-                    JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '04'").uniqueResult(0);
+                    JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '04' AND point_type = '1'").uniqueResult(0);
                     if (ObjectUtil.isEmpty(jsonCoolIvt)) {
                         JSONObject jsonPoint = pointTab.query("material_code ='" + containerName + "'").uniqueResult(0);
                         if (ObjectUtil.isNotEmpty(jsonPoint)) {
@@ -398,8 +398,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     } else {
                         log.info("当前AGV启用参数为否");
                         //判断当前位置是否在冷却区如果不在则提醒人工报错
-                        JSONObject container_jo = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '04'").uniqueResult(0);
-                        if (ObjectUtil.isEmpty(container_jo)) {
+                        JSONObject container_jo = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '04' AND point_type = '1'").uniqueResult(0);                        if (ObjectUtil.isEmpty(container_jo)) {
                             throw new BadRequestException("该母卷已经被烘烤或现在还未绑定在冷却区上，且AGV未启用！请使用人工烘烤功能【出箱】将母卷绑定到冷却区！");
                         }
                         container_jo.put("cool_ivt_status", "04");