From d7c8665c540e909417c1469da1c2431ffdef4893 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Wed, 13 Dec 2023 10:53:17 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E5=A5=97=E7=AE=A1=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=A5=97=E7=AE=A1=E5=AE=8C=E6=88=90=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CasingStationConveyorDeviceDriver.java    | 45 ++++++++++++++++---
 .../casing_station/ItemProtocol.java          |  4 +-
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java
index 80205e875..7887b995a 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java
@@ -206,7 +206,7 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号qty：" + last_qty + "->" + qty);
             }
 
-            if (move != 0 && task > 0 && task1 > 0) {
+            if (move != 0 && task > 0 ) {
                 update_instruction_status();
             }
 
@@ -241,12 +241,16 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                 case 3:
                     log.info("运行中");
                     break;
-                default:
-                    if (move == 1 && !requireSucess) {
+                case 4:
+                    if (move == 1 && !requireSucess && task > 0 && task1 > 0) {
                         //申请套管校验
-                        apply_for_casing_inspection(material1, material2);
+//                        apply_for_casing_inspection(material1, material2);
+                        bushingSucess();
                     }
                     break;
+                default:
+                    log.info("未知模式");
+                    break;
             }
         }
         last_heartbeat = heartbeat;
@@ -261,7 +265,38 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
         last_to_command = to_command;
         last_qty = qty;
     }
-    
+
+
+    private synchronized void bushingSucess() {
+        ApplyManipulatorActionRequest applyManipulatorActionRequest = new ApplyManipulatorActionRequest();
+        ApplyManipulatorActionResponse applyManipulatorActionResponse;
+        Instruction inst1 = instructionService.findByCode(String.valueOf(task1));
+//        Instruction inst2 = instructionService.findByCode(String.valueOf(task2));
+        String task_code1 = inst1.getTask_code();
+//        String task_code2 = inst2.getTask_code();
+        applyManipulatorActionRequest.setDevice_code(device_code);
+        applyManipulatorActionRequest.setTask_code1(task_code1);
+//        applyManipulatorActionRequest.setTask_code2(task_code2);
+        applyManipulatorActionRequest.setType("7");
+        applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest);
+        if (applyManipulatorActionResponse.getstatus() == 200) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("to_command", 4);
+            this.writing(map);
+            requireSucess = true;
+            logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管,返回参数:" + applyManipulatorActionResponse);
+            message = "套轴完成成功";
+        } else {
+            message = applyManipulatorActionResponse.getMessage();
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("to_command", 99);
+            this.writing(map);
+            requireSucess = true;
+            message = "套轴失败";
+            logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管,返回参数:" + applyManipulatorActionResponse);
+        }
+    }
+
     /**
      * 更新指令状态
      */
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/ItemProtocol.java
index 370fdf465..be18b5821 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/ItemProtocol.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/ItemProtocol.java
@@ -117,8 +117,8 @@ public class ItemProtocol {
         list.add(new ItemDto(item_move, "光电信号", "DB101.W4"));
         list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB101.W6"));
         list.add(new ItemDto(item_error, "报警", "DB101.W8"));
-        list.add(new ItemDto(item_task, "任务号1", "DB101.D116"));
-        list.add(new ItemDto(item_task1, "任务号2", "DB101.D118"));
+        list.add(new ItemDto(item_task, "任务号1", "DB101.DW116"));
+        list.add(new ItemDto(item_task1, "任务号2", "DB101.DW118"));
         list.add(new ItemDto(item_material1, "物料1", "DB101.STRING10.50"));
         list.add(new ItemDto(item_material2, "物料2", "DB101.STRING62.50"));
         list.add(new ItemDto(item_qty, "数量", "DB101.W114"));