From f19b938a330abc753bbb6659bbb5347a6baa6555 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Fri, 8 Mar 2024 17:41:03 +0800
Subject: [PATCH] =?UTF-8?q?dev:=E8=A1=A8=E5=A4=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/ext/mes/service/impl/MesToLmsServiceImpl.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 4a432e540..e0561748c 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
@@ -1509,8 +1509,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 JSONObject form = new JSONObject();
                 if (StrUtil.isEmpty(up_scroll)) {
                     //取满放满
-                    form.put("point_code1", jsonCoolIvt.getString("point_code"));
-                    form.put("point_code2", device_jo.getString("point_code"));
+                    form.put("point_code1", jsonCoolIvt.getString("full_point_code"));
+                    form.put("point_code2", device_jo.getString("up_point_code"));
                     form.put("task_type", "010702");
                     form.put("material_code", jsonCoolIvt.getString("container_name"));
                     form.put("vehicle_code", jsonCoolIvt.getString("full_vehicle_code"));
@@ -1518,8 +1518,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 } else {
                     //取满取空放满放空
                     form.put("point_code1", jsonCoolIvt.getString("full_point_code"));
-                    form.put("point_code2", device_jo.getString("point_code"));
-                    form.put("point_code3", device_jo.getString("point_code"));
+                    form.put("point_code2", device_jo.getString("up_point_code"));
+                    form.put("point_code3", device_jo.getString("up_point_code"));
                     //判断对应空轴点位是否为空，为空用当前点位，不为空查询其他点位
                     if (jsonCoolIvt.getString("empty_point_status").equals("01")) {
                         form.put("point_code4", jsonCoolIvt.getString("empty_point_code"));
@@ -1545,7 +1545,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 map.put("flag", "1");
                 map.put("product_area", device_jo.getString("product_area"));
                 JSONObject jsonIvt = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0);
-                form.put("point_code1", device_jo.getString("point_code"));
+                form.put("point_code1", device_jo.getString("up_point_code"));
                 //寻找可用的冷却区满轴点位
                 form.put("point_code2", jsonIvt.getString("full_point_code"));
                 form.put("task_type", "010704");