From bdadb9d6221c618820690f83bd51e288efa4ffea Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Wed, 19 Jun 2024 09:13:30 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8B=94=E5=89=8D?=
 =?UTF-8?q?=E8=A1=8C=E6=9E=B6=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=85=A8=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7=E4=BA=A4=E4=BA=92=E4=BB=A5=E5=8F=8A=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/acs/agv/AgvWaitUtil.java      |  2 ++
 .../PullHeadManipulatorDeviceDriver.java               |  2 +-
 .../service/impl/InstructionServiceImpl.java           | 10 +++++++++-
 .../nl/system/service/quartz/task/AutoCreateInst.java  |  2 +-
 .../src/views/acs/history/taskRecord/index.vue         |  2 +-
 acs2/nladmin-ui/src/views/acs/task/index.vue           |  2 +-
 acs2/nladmin-ui/src/views/monitor/logQuery/index.vue   |  6 +++---
 acs2/nladmin-ui/src/views/monitor/lucene/index.vue     |  6 +++---
 8 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java
index 345bfcf7e..39941e15b 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java
@@ -46,6 +46,7 @@ public class AgvWaitUtil {
         Device startDevice = deviceAppService.findDeviceByCode(startDeviceCode);
         ManipulatorAgvStationDeviceDriver manipulatorAgvStationDeviceDriver;
         BoxSubvolumesConveyorDeviceDriver boxSubvolumesConveyorDeviceDriver;
+        //agv诺宝对接位安全信号交互
         if(startDevice.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver){
             manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) startDevice.getDeviceDriver();
             manipulatorAgvStationDeviceDriver.writing(2);
@@ -53,6 +54,7 @@ public class AgvWaitUtil {
                 throw new BadRequestException("上位系统不允许取货");
             }
         }
+        //agv叉车对接位安全信号交互
         if(startDevice.getDeviceDriver() instanceof BoxSubvolumesConveyorDeviceDriver){
             boxSubvolumesConveyorDeviceDriver = (BoxSubvolumesConveyorDeviceDriver) startDevice.getDeviceDriver();
             if(boxSubvolumesConveyorDeviceDriver.getMode() != 2){
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java
index 7aecf053a..21019aaed 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java
@@ -385,7 +385,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                 PlugPullDeviceSiteDeviceDriver plugPullDeviceSiteDeviceDriver;
                 if (device.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) {
                     plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) device.getDeviceDriver();
-                    if (plugPullDeviceSiteDeviceDriver.getMode() != 2 && plugPullDeviceSiteDeviceDriver.getMove() != 0)
+                    if (plugPullDeviceSiteDeviceDriver.getMode() != 2 && plugPullDeviceSiteDeviceDriver.getMove() != 0 && plugPullDeviceSiteDeviceDriver.getAction() != 1)
                         return false;
                 }
                 String taskId = task.getTask_id();
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 1826a5ebf..e9a970c0e 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -1177,6 +1177,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             // NDC agv指令不当场取消指令,需要等agv上报
             if (!StrUtil.isEmpty(entity.getAgv_jobno())) {
                 ndcAgvService.deleteAgvInstToNDC(BeanUtil.copyProperties(entity, Instruction.class));
+                flag = true;
             } else {
                 flag = true;
             }
@@ -1185,7 +1186,14 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class);
             xianGongAgvService.deleteXZAgvInst(entity.getInstruction_code());
             flag = true;
-        } else {
+        }
+        else if (ObjectUtil.isNotEmpty(entity.getAgv_system_type()) && entity.getAgv_system_type().equals(AgvSystemTypeEnum.XG_System_Type)
+                && !StrUtil.equals(entity.getSend_status(), "2")) {
+            XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class);
+            xianGongAgvService.deleteXZAgvInst(entity.getInstruction_code());
+            flag = true;
+        }
+        else {
             flag = true;
         }
         if (flag) {
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java
index 3debd9ce3..a8bd8141f 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java
@@ -162,7 +162,7 @@ public class AutoCreateInst {
             //1、1楼叉车系统
             //2、2楼1区域AGV系统
             //3、2楼2区域AGV系统 -已废弃
-            if (!StrUtil.equals(agv_system_type, CommonFinalParam.ONE)) {
+            if (StrUtil.equals(agv_system_type, CommonFinalParam.TWO)) {
                 // task_type
                 //1、生箔； Itype=1:取空，取满，放空，放满；
                 //2、分切  Itype=3取满、取空、放满、放空；
diff --git a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
index 845149f9c..7fd33e69e 100644
--- a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
@@ -295,7 +295,7 @@
         <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
         <el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
         <el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
-        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" :show-overflow-tooltip="true" />
+        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" :show-overflow-tooltip="true" width="150px" />
         <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
         <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" />
diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue
index 1c4575bbf..90b23f6b8 100644
--- a/acs2/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/task/index.vue
@@ -502,7 +502,7 @@
         <el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
         <el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
         <el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
-        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true" />
+        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true":show-overflow-tooltip="true" width="150px" />
         <el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
         <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
diff --git a/acs2/nladmin-ui/src/views/monitor/logQuery/index.vue b/acs2/nladmin-ui/src/views/monitor/logQuery/index.vue
index fbd64af79..39cab5cb6 100644
--- a/acs2/nladmin-ui/src/views/monitor/logQuery/index.vue
+++ b/acs2/nladmin-ui/src/views/monitor/logQuery/index.vue
@@ -17,10 +17,10 @@
       <el-table-column prop="operate" label="操作" :min-width="flexWidth('operate',crud.data,操作)" />
       <!-- <el-table-column prop="trace_id" label="链路追踪" /> -->
       <el-table-column prop="method" label="方法" :min-width="flexWidth('method',crud.data,方法)" />
-      <el-table-column prop="requestparam" label="请求参数" :min-width="flexWidth('requestparam',crud.data,请求参数)" />
-      <el-table-column prop="responseparam" label="返回参数" :min-width="flexWidth('responseparam',crud.data,返回参数)" />
+      <el-table-column prop="requestparam" label="请求参数" :show-overflow-tooltip="true" width="300px" />
+      <el-table-column prop="responseparam" label="返回参数" :show-overflow-tooltip="true" width="300px" />
       <el-table-column prop="logTime" label="记录时间" :min-width="flexWidth('logTime',crud.data,记录时间)" />
-      <el-table-column prop="content" label="内容详情" :show-overflow-tooltip="true" />
+      <el-table-column prop="content" label="内容详情" :show-overflow-tooltip="true" width="300px" />
 
     </el-table>
     <!--分页组件-->
diff --git a/acs2/nladmin-ui/src/views/monitor/lucene/index.vue b/acs2/nladmin-ui/src/views/monitor/lucene/index.vue
index a83b8cbdd..84f14c8c8 100644
--- a/acs2/nladmin-ui/src/views/monitor/lucene/index.vue
+++ b/acs2/nladmin-ui/src/views/monitor/lucene/index.vue
@@ -21,10 +21,10 @@
       <el-table-column prop="instruct_code" label="指令编号" :min-width="flexWidth('instruct_code',crud.data,指令编号)" />
       <el-table-column prop="method" label="方法" :min-width="flexWidth('method',crud.data,方法)" />
       <el-table-column prop="status_code" label="状态码" :min-width="flexWidth('status_code',crud.data,状态码)" />
-      <el-table-column prop="requestparam" label="请求参数" :min-width="flexWidth('requestparam',crud.data,请求参数)" />
-      <el-table-column prop="responseparam" label="返回参数" :min-width="flexWidth('responseparam',crud.data,返回参数)" />
+      <el-table-column prop="requestparam" label="请求参数" :show-overflow-tooltip="true" width="300px" />
+      <el-table-column prop="responseparam" label="返回参数" :show-overflow-tooltip="true" width="300px" />
       <el-table-column prop="logTime" label="记录时间" :min-width="flexWidth('logTime',crud.data,记录时间)" />
-      <el-table-column prop="content" label="内容详情" :show-overflow-tooltip="true" />
+      <el-table-column prop="content" label="内容详情" :show-overflow-tooltip="true" width="300px"/>
 
     </el-table>
     <!--分页组件-->