From b1ea92b9f408d1a88efe9e305c518b3ce2c89606 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Thu, 18 Apr 2024 15:13:42 +0800
Subject: [PATCH] fix

---
 .../basedriver/ssx_site/SsxSiteDeviceDriver.java              | 4 ++--
 .../java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java  | 2 +-
 .../org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java
index 0d7a7c5..c63ec72 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java
@@ -443,11 +443,11 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi
             }
             String resp = acsToWmsService.applyTask(request);
             JSONObject res_jo = JSONObject.parseObject(resp);
-//            if (StrUtil.equals(res_jo.getString("code"), "200")) {
+            if (StrUtil.equals(res_jo.getString("code"), "200")) {
                 this.writing(type);
                 this.setRequireSucess(true);
                 log.info("acs申请任务", this.devicecode, "任务申请成功!");
-//            }
+            }
             return true;
         }
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java
index eccd683..856d246 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java
@@ -83,7 +83,7 @@ public class KJRKTask extends AbstractTask {
                 task.setRemark("未找到所需点位!");
                 taskService.update(task);
                 // 消息通知
-                log.info("原材料入库未找到当前符合条件的点位！");
+                log.info("空架入库未找到当前符合条件的点位！");
                 continue;
             }
             // 设置终点并修改创建成功状态
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java
index 9f5b1e7..66eb215 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java
@@ -87,7 +87,7 @@ public class SSXBKJTask extends AbstractTask {
                 continue;
             }
             // 设置终点并修改创建成功状态
-            task.setPoint_code2(point.getPoint_code());
+            task.setPoint_code1(point.getPoint_code());
             task.setTask_status(TaskStatus.CREATED.getCode());
             task.setRemark("");
             taskService.update(task);