From b3554a7c639a53acd453eb920404bb5733cf4b87 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Fri, 22 Dec 2023 13:53:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=B3=E8=AF=B7=E5=A5=97=E7=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PluggingUnpluggingMachineDeviceDriver.java                 | 3 ++-
 acs/nladmin-ui/src/views/acs/task/index.vue                    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java
index 515e1ad4d..601affab1 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.jinterop.dcom.common.JIException;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
@@ -240,7 +241,7 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
 //        applyManipulatorActionRequest.setTask_code2(task_code2);
         applyManipulatorActionRequest.setType("6");
         applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest);
-        if (applyManipulatorActionResponse.getstatus()==200) {
+        if (ObjectUtils.isNotEmpty(applyManipulatorActionResponse) && "1".equals(applyManipulatorActionResponse.getIs_bushing())) {
             Map<String, Object> map = new LinkedHashMap<>();
             map.put("to_command", 4);
             this.writing(map);
diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index 91259cf24..e97158864 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -441,6 +441,7 @@
         </el-table-column>
         <el-table-column prop="start_height" label="取货高度" />
         <el-table-column prop="next_height" label="放货高度" />
+        <el-table-column prop="truss_type" label="内包间行架任务类型" />
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_by" label="创建者" />
         <el-table-column prop="create_time" label="创建时间" width="135" />