From 9c3d8f33225c80c4d8b2465d13421fb45ebec461 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Wed, 8 May 2024 15:13:22 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E8=B4=B4=E6=A0=87=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nishedProductOutBindLableDeviceDriver.java | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java
index 250c4a72b..ed7fafc21 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java
@@ -291,6 +291,11 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
                     if (move > 0 && !requireSucess) {
                         applyLaStrangulationAndLabeling(mode);
                     }
+                case 17:
+                    //申请调试贴标
+                    if(move > 0 && !requireSucess){
+                        applyLaStrangulationAndLabeling(mode);
+                    }
                     break;
             }
         }
@@ -413,6 +418,8 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
         String bindingTemplate = jo.get("bindingTemplate").toString();
         String printDevice = jo.get("printDevice").toString();
         String bundleTimes = jo.get("bundleTimes").toString();
+        String case1 = jo.get("case").toString();
+        String direction = jo.get("direction").toString();
 
         List list = new ArrayList();
         if (mode == 10 || mode == 16) {
@@ -521,6 +528,41 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
             map12.put("value", labelingTemplate);
             list.add(map12);
         }
+
+        if(mode == 17){
+            Map map = new HashMap();
+            map.put("code", "to_length");
+            map.put("value", length);
+            list.add(map);
+            Map map2 = new HashMap();
+            map2.put("code", "to_weight");
+            map2.put("value", weight);
+            list.add(map2);
+            Map map3 = new HashMap();
+            map3.put("code", "to_height");
+            map3.put("value", height);
+            list.add(map3);
+            Map map5 = new HashMap();
+            map5.put("code", "to_command");
+            map5.put("value", mode);
+            list.add(map5);
+            Map map11 = new HashMap();
+            map11.put("code", "to_binding_times");
+            map11.put("value", bundleTimes);
+            list.add(map11);
+            if(StrUtil.isNotEmpty(case1) && !" ".equals(case1)){
+                Map map12 = new HashMap();
+                map12.put("code", "to_binding_times");
+                map12.put("value", bundleTimes);
+                list.add(map12);
+            }
+            if(StrUtil.isNotEmpty(direction) && !" ".equals(direction)){
+                Map map13 = new HashMap();
+                map13.put("code", "to_direction");
+                map13.put("value", direction);
+                list.add(map13);
+            }
+        }
         try {
             this.writing(list);
         } catch (Exception e) {