opt: 添加堆垛机下发信号日志

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -1133,6 +1133,11 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                 itemMap.put(to_param, json.getString("value"));
             }
         }
+        LuceneLogDto logDto = LuceneLogDto.builder()
+                .device_code(device_code)
+                .content("下发电气信号:" + itemMap)
+                .build();
+        luceneExecuteLogService.deviceExecuteLog(logDto);
         logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap);
         try {
             this.checkcontrol(itemMap);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java

@@ -411,7 +411,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                 Object obj = accessor_value.getValue(relate);
                 sb.append("key:" + relate + "value:" + obj + ";");
             }
-            if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time")) {
+            if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time") && !itemDto.getItem_code().endsWith("consumption")) {
                 // 存在上次点位值为null情况 则不记录日志
                 if(!(his instanceof Float) && !(value instanceof Float)){
                     LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1),
@@ -434,7 +434,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
 //            }
 
 //            log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value});
-            if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time")) {
+            if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time") && !itemDto.getItem_code().endsWith("consumption")) {
                 if(!(his instanceof Float) && !(value instanceof Float)){
                     LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1),
                             String.valueOf(his), String.valueOf(value));

acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue

@@ -135,6 +135,7 @@
             <span v-if="scope.row.instruction_status=='0' ">{{ $t('task.select.Ready') }}</span>
             <span v-if="scope.row.instruction_status=='1' ">{{ $t('task.select.In_progress') }}</span>
             <span v-if="scope.row.instruction_status=='2' ">{{ $t('task.select.Completed') }}</span>
+            <span v-if="scope.row.instruction_status=='3' ">{{ $t('task.select.Cancel') }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))" />

acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue

@@ -268,6 +268,7 @@
             <span v-if="scope.row.task_status=='0' ">{{ $t('task.select.Ready') }}</span>
             <span v-if="scope.row.task_status=='1' ">{{ $t('task.select.In_progress') }}</span>
             <span v-if="scope.row.task_status=='2' ">{{ $t('task.select.Completed') }}</span>
+            <span v-if="scope.row.task_status=='3' ">{{ $t('task.select.Cancel') }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" />

acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue

@@ -114,6 +114,7 @@
             <span v-if="scope.row.task_status=='0' ">{{ $t('task.select.Ready') }}</span>
             <span v-if="scope.row.task_status=='1' ">{{ $t('task.select.In_progress') }}</span>
             <span v-if="scope.row.task_status=='2' ">{{ $t('task.select.Completed') }}</span>
+            <span v-if="scope.row.task_status=='3' ">{{ $t('task.select.Cancel') }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" :min-width="flexWidth('priority',crud.data,$t('TaskRecord.table.Priority'))" />

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -846,7 +846,7 @@ export default {
     handleCommand(index, row, command) {
       switch (command) {
         case 'a':// 完成
-          this.finish('3', row)
+          this.finish('2', row)
           break
         case 'b':// 取消
           this.cancel(index, row)