From 2eba078ddbc0b342ff3a26547098250bb3c99353 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 23 May 2023 12:26:30 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E8=80=81=E8=BD=A6=E9=97=B4=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E7=BA=BF=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ngOldLetteringPackageDeviceDefination.java |   2 +-
 ...iliangOldLetteringPackageDeviceDriver.java |  32 +---
 .../ItemProtocol.java                         | 135 ++++++++-----
 ...ldPackageReceivingStationDeviceDriver.java |  34 +---
 ...iliangLetteringPackageSsxDeviceDriver.java |  40 +++-
 .../ItemProtocol.java                         |  25 ++-
 .../HailiangOldPalletizingStationDriver.java  |  29 +++
 .../HailiangOldStackingManipulatorDriver.java | 181 ++++++++++++++----
 ...ailiangOldUnboxingMachineDeviceDriver.java |  86 +++------
 .../ItemProtocol.java                         |  23 ++-
 .../wms/service/impl/AcsToWmsServiceImpl.java |  56 +++---
 .../wms/service/impl/WmsToAcsServiceImpl.java |  30 +++
 .../service/dto/ProduceshiftorderDto.java     |  40 ++++
 .../org/nl/acs/order/service/wql/order.xls    | Bin 168448 -> 171008 bytes
 .../lucene/service/dto/LuceneLogDto.java      |   9 +
 ...hailiang_old_package_receiving_machine.vue |  85 +-------
 .../hailiang_old_package_ssx_station.vue      |  91 ++-------
 .../hailiang_old_unboxing_machine.vue         | 104 ++++------
 .../src/views/acs/monitor/device/index.vue    |  30 +++
 19 files changed, 562 insertions(+), 470 deletions(-)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDefination.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDefination.java
index e1a89032..05dc4824 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDefination.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDefination.java
@@ -11,7 +11,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * 开箱机
+ * 刻字包装机
  */
 @Service
 public class HailiangOldLetteringPackageDeviceDefination implements OpcDeviceDriverDefination {
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDriver.java
index 058f9118..5a265278 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDriver.java
@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 老车间-刻字包装输送线
+ * 老车间-刻字包装机
  */
 @Slf4j
 @Data
@@ -76,10 +76,7 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
         try {
             device_code = this.getDeviceCode();
             mode = this.itemProtocol.getMode();
-            move = this.itemProtocol.getMove();
             error = this.itemProtocol.getError();
-            task = this.itemProtocol.getTask();
-            barcode = this.itemProtocol.getBarcode();
 
             if (mode != last_mode) {
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
@@ -96,9 +93,6 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error + "复位请求标记");
             }
 
-            if (task != last_task) {
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task + "复位请求标记");
-            }
 
         } catch (Exception var17) {
             var17.printStackTrace();
@@ -117,12 +111,6 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
             Instruction instruction = null;
             List toInstructions;
 
-            if(move == 1 && error == 0 && barcode.length() > 0){
-                
-            }
-
-
-
 
 
         }
@@ -150,27 +138,27 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
 
     }
 
+
     @Override
     public void issuedOrderInfo(ProduceshiftorderDto dto) {
         EalingOrderDto ealingOrderDto = dto.getEalingOrderDto();
         if (ealingOrderDto != null) {
             String is_foreward = ealingOrderDto.getIs_foreward();
             Map<String, Object> map = new HashMap<>();
-            map.put("to_clear", "1");
-            map.put("to_is_foreward", is_foreward);
-            map.put("to_order_box_num", ealingOrderDto.getOrder_box_num());
-            map.put("to_order", ealingOrderDto.getOrder_code());
+            map.put("to_qty", dto.getQty());
+            map.put("to_order", dto.getOrder_code());
+            map.put("item_to_bz_qty", dto.getPackage_qty());
+            map.put("item_to_box_qty", dto.getBox_num());
+            map.put("to_one_box_qty", dto.getOne_box_package_qty());
+            map.put("to_one_bag_qty", dto.getOne_package_qty());
+            map.put("to_one_box_qty", dto.getOne_box_package_qty());
             this.writing(map);
         }
     }
 
     @Override
     public void issuedOrderFinish(String autoFinish) {
-        if (StrUtil.equals(autoFinish, WorkerOrderEnum.FORCEFINISH.getCode())) {
-            this.writing("to_order_compel_finished", "1");
-        } else {
-            this.writing("to_confirm_finished", "1");
-        }
+
     }
 
     @Override
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/ItemProtocol.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/ItemProtocol.java
index d8ca352a..f0e9d9b2 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/ItemProtocol.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/ItemProtocol.java
@@ -13,20 +13,32 @@ public class ItemProtocol {
 
     public static String item_heartbeat = "heartbeat";
     public static String item_mode = "mode";
-    public static String item_move = "move";
-    public static String item_action = "action";
+    public static String item_kz_mode = "kz_mode";
+    public static String item_ds_mode = "ds_mode";
+    public static String item_bz_mode = "bz_mode";
+    public static String item_kz_status = "kz_status";
+    public static String item_ds_status = "ds_status";
+    public static String item_bz_status = "bz_status";
     public static String item_error = "error";
-    public static String item_direction = "direction";
-    public static String item_vehicle_type = "vehicle_type";
-    public static String item_task = "task";
-    public static String item_barcode = "barcode";
-
-
-    public static String item_to_command = "to_command";
-    public static String item_to_target = "to_target";
-    public static String item_to_vehicle_type = "to_vehicle_type";
-    public static String item_to_task = "to_task";
+    public static String item_kz_error = "kz_error";
+    public static String item_ds_error = "ds_error";
+    public static String item_bz_error = "bz_error";
+    public static String item_kz_qty = "kz_qty";
+    public static String item_ds_qty = "ds_qty";
+    public static String item_bz_qty = "bz_qty";
+    public static String item_order_finish = "order_finish";
+    public static String item_order_compulsion_finish = "order_compulsion_finish";
+    public static String item_order = "order";
 
+    public static String item_to_order_qty = "to_order_qty";
+    public static String item_to_bz_qty = "to_bz_qty";
+    public static String item_to_box_qty = "to_box_qty";
+    public static String item_to_one_box_qty = "to_one_box_qty";
+    public static String item_to_one_bag_qty = "to_one_bag_qty";
+    public static String item_to_finish = "to_finish";
+    public static String item_to_compulsion_finish = "to_compulsion_finish";
+    public static String item_to_order = "to_order";
+    public static String item_to_clear = "to_clear";
 
 
     private HailiangOldLetteringPackageDeviceDriver driver;
@@ -43,45 +55,62 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_mode);
     }
 
-    public int getMove() {
-        return this.getOpcIntegerValue(item_move);
+    public int getKz_mode() {
+        return this.getOpcIntegerValue(item_kz_mode);
     }
 
-    public int getAction() {
-        return this.getOpcIntegerValue(item_action);
+    public int getDs_mode() {
+        return this.getOpcIntegerValue(item_ds_mode);
     }
 
-    public String getBarcode() {
-        return this.getOpcStringValue(item_barcode);
+    public int getBz_mode() {
+        return this.getOpcIntegerValue(item_bz_mode);
+    }
+
+    public int getKz_status() {
+        return this.getOpcIntegerValue(item_kz_status);
+    }
+
+    public int getDs_status() {
+        return this.getOpcIntegerValue(item_ds_status);
+    }
+
+    public int getBz_status() {
+        return this.getOpcIntegerValue(item_bz_status);
+    }
+
+    public int getKz_qty() {
+        return this.getOpcIntegerValue(item_kz_qty);
+    }
+
+    public int getDs_qty() {
+        return this.getOpcIntegerValue(item_ds_qty);
+    }
+
+    public int getBz_qty() {
+        return this.getOpcIntegerValue(item_bz_qty);
     }
 
     public int getError() {
         return this.getOpcIntegerValue(item_error);
     }
 
-    public int getVehicle_type() {
-        return this.getOpcIntegerValue(item_vehicle_type);
+    public int getKz_error() {
+        return this.getOpcIntegerValue(item_kz_error);
     }
 
-    public int getTask() {
-        return this.getOpcIntegerValue(item_task);
+    public int getDs_error() {
+        return this.getOpcIntegerValue(item_ds_error);
     }
 
-    public int getToCommand() {
-        return this.getOpcIntegerValue(item_to_command);
+    public int getBz_error() {
+        return this.getOpcIntegerValue(item_bz_error);
     }
 
-    public int getToTarget() {
-        return this.getOpcIntegerValue(item_to_target);
+    public int getOrder() {
+        return this.getOpcIntegerValue(item_order);
     }
 
-    public int getToVehicle_type() {
-        return this.getOpcIntegerValue(item_to_vehicle_type);
-    }
-
-    public int getToTask() {
-        return this.getOpcIntegerValue(item_to_task);
-    }
 
     //是否有货
     public int hasGoods(int move) {
@@ -116,24 +145,38 @@ public class ItemProtocol {
 
     public static List<ItemDto> getReadableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_heartbeat, "心跳", "VW0"));
-        list.add(new ItemDto(item_mode, "工作状态", "VW2", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_move, "光电开关信号", "VW4"));
-        list.add(new ItemDto(item_action, "取放信号", "VW6"));
-        list.add(new ItemDto(item_direction, "电机方向", "VW8"));
-        list.add(new ItemDto(item_vehicle_type, "托盘类型", "VW10"));
-        list.add(new ItemDto(item_error, "报警信号", "VW12"));
-        list.add(new ItemDto(item_task, "任务号", "VD14"));
-        list.add(new ItemDto(item_barcode, "条码", "VB18.20"));
+        list.add(new ItemDto(item_heartbeat, "心跳", "DB600.W0"));
+        list.add(new ItemDto(item_mode, "工作模式", "DB600.W2", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_kz_mode, "刻字机工作模式", "DB600.W4", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_ds_mode, "点数机工作模式", "DB600.W6", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_bz_mode, "包装机工作模式", "DB600.W8", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_kz_status, "刻字机工作状态", "DB600.W10"));
+        list.add(new ItemDto(item_ds_status, "点数机工作状态", "DB600.W12"));
+        list.add(new ItemDto(item_bz_status, "包装机工作状态", "DB600.W14"));
+        list.add(new ItemDto(item_error, "报警信号", "DB600.W16"));
+        list.add(new ItemDto(item_kz_error, "刻字机报警信号", "DB600.W18"));
+        list.add(new ItemDto(item_ds_error, "点数机报警信号", "DB600.W20"));
+        list.add(new ItemDto(item_bz_error, "包装机报警信号", "DB600.W22"));
+        list.add(new ItemDto(item_kz_qty, "刻字数量", "DB600.W24"));
+        list.add(new ItemDto(item_ds_qty, "点数数量", "DB600.W26"));
+        list.add(new ItemDto(item_bz_qty, "包装数量", "DB600.W28"));
+        list.add(new ItemDto(item_order_finish, "工单完成", "DB600.W30"));
+        list.add(new ItemDto(item_order_compulsion_finish, "工单强制完成", "DB600.W32"));
+        list.add(new ItemDto(item_order, "工单号", "DB600.D34"));
         return list;
     }
 
     public static List<ItemDto> getWriteableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_to_command, "下发作业命令", "VW2", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_to_target, "下发目标站", "VW4"));
-        list.add(new ItemDto(item_to_vehicle_type, "下发托盘类型", "VW6"));
-        list.add(new ItemDto(item_to_task, "任务号", "VD8"));
+        list.add(new ItemDto(item_to_order_qty, "下发工单数量", "DB610.W2", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_to_bz_qty, "下发包装袋数", "DB610.W4"));
+        list.add(new ItemDto(item_to_box_qty, "下发箱数", "DB610.W6"));
+        list.add(new ItemDto(item_to_one_box_qty, "下发每箱袋数", "DB610.W8"));
+        list.add(new ItemDto(item_to_one_bag_qty, "下发每袋数量", "DB610.W10"));
+        list.add(new ItemDto(item_to_finish, "下发工单完成反馈", "DB610.W12"));
+        list.add(new ItemDto(item_to_compulsion_finish, "下发工单强制完成反馈", "DB610.W14"));
+        list.add(new ItemDto(item_to_order, "下发工单号", "DB610.D16"));
+        list.add(new ItemDto(item_to_clear, "下发清零", "DB610.W20"));
         return list;
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_receiving_station/HailiangOldPackageReceivingStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_receiving_station/HailiangOldPackageReceivingStationDeviceDriver.java
index 7507ab25..943ee369 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_receiving_station/HailiangOldPackageReceivingStationDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_receiving_station/HailiangOldPackageReceivingStationDeviceDriver.java
@@ -34,7 +34,7 @@ import java.util.Map;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangOldPackageReceivingStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo {
+public class HailiangOldPackageReceivingStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
 
     DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
@@ -162,36 +162,4 @@ public class HailiangOldPackageReceivingStationDeviceDriver extends AbstractOpcD
 
     }
 
-    @Override
-    public void issuedOrderInfo(ProduceshiftorderDto dto) {
-        EalingOrderDto ealingOrderDto = dto.getEalingOrderDto();
-        if (ealingOrderDto != null) {
-            String is_foreward = ealingOrderDto.getIs_foreward();
-            Map<String, Object> map = new HashMap<>();
-            map.put("to_clear", "1");
-            map.put("to_is_foreward", is_foreward);
-            map.put("to_order_box_num", ealingOrderDto.getOrder_box_num());
-            map.put("to_order", ealingOrderDto.getOrder_code());
-            this.writing(map);
-        }
-    }
-
-    @Override
-    public void issuedOrderFinish(String autoFinish) {
-        if (StrUtil.equals(autoFinish, WorkerOrderEnum.FORCEFINISH.getCode())) {
-            this.writing("to_order_compel_finished", "1");
-        } else {
-            this.writing("to_confirm_finished", "1");
-        }
-    }
-
-    @Override
-    public void toStop() {
-
-    }
-
-    @Override
-    public void toStart() {
-
-    }
 }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/HailiangLetteringPackageSsxDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/HailiangLetteringPackageSsxDeviceDriver.java
index 5fed8a06..4b4ccaa7 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/HailiangLetteringPackageSsxDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/HailiangLetteringPackageSsxDeviceDriver.java
@@ -92,8 +92,8 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
                     this.writing("to_command", "0");
                     this.writing("to_target", "0");
                 }
+                requireSucess =false;
             }
-
             if (error != last_error) {
                 if (error != 0) {
                     DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -104,7 +104,6 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
                 }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error + "复位请求标记");
             }
-
             if (task != last_task) {
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task + "复位请求标记");
             }
@@ -126,7 +125,7 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
             Instruction instruction = null;
             List toInstructions;
 
-            if(move == 1 && error == 0 && barcode.length() > 0){
+            if(move == 1 && error == 0 && barcode.length() > 0 && requireSucess == false ){
                 //2305281100001
                if(barcode.trim().length() == 16){
                    if(isNumeric(barcode.trim())){
@@ -140,9 +139,10 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
                        int isFlip = Integer.parseInt(barcode.trim().substring(9,10));
                        int target = Integer.parseInt(barcode.trim().substring(10,11));
                        if(isFlip>0 && target>0){
-                           this.writing("to_command", String.valueOf(isFlip));
+                           this.writing("to_is_flip",String.valueOf(isFlip));
                            this.writing("to_target", String.valueOf(target));
-
+                           this.writing("to_command","1");
+                           requireSucess = true;
                        } else {
                            message = "条码:"+ barcode + ",是否翻转:"+isFlip + "目标巷道:"+target;
                        }
@@ -165,6 +165,7 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
         last_move = move;
         last_error = error;
         last_task = task;
+        last_barcode = barcode;
     }
 
 
@@ -172,8 +173,33 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();
         jo.put("device_name", this.getDevice().getDevice_name());
-        jo.put("mode", mode == 1 ? "联机" : "未联机");
-        jo.put("move", move == 1 ? "有货" : "无货");
+        String mode = "";
+        String action = "";
+        String move = "";
+        if (this.getMode() == 0) {
+            mode = "未联机";
+        } else if (this.getMode() == 1) {
+            mode = "单机";
+        } else if (this.getMode() == 2) {
+            mode = "联机";
+        } else if (this.getMode() == 3) {
+            mode = "运行中";
+        }
+        if (this.getMove() == 0) {
+            move = "无货";
+            jo.put("hasGoods", false);
+        } else if (this.getMove() == 1) {
+            move = "有货";
+            jo.put("hasGoods", true);
+        } else if (this.getMove() == 2) {
+            move = "有托盘有货";
+            jo.put("move", move);
+            jo.put("hasGoods", true);
+        }
+        jo.put("move", move);
+        jo.put("mode", mode);
+        jo.put("isOnline", this.getIsonline());
+        jo.put("isError", this.getIserror());
         jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error)));
         jo.put("task", task);
         jo.put("barcode", barcode);
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/ItemProtocol.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/ItemProtocol.java
index 3868dd53..2f0392a3 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/ItemProtocol.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/ItemProtocol.java
@@ -19,15 +19,17 @@ public class ItemProtocol {
     public static String item_action = "action";
     public static String item_error = "error";
     public static String item_direction = "direction";
-    public static String item_vehicle_type = "vehicle_type";
+    public static String item_is_flip = "is_flip";
     public static String item_task = "task";
     public static String item_barcode = "barcode";
 
 
     public static String item_to_command = "to_command";
     public static String item_to_target = "to_target";
-    public static String item_to_vehicle_type = "to_vehicle_type";
     public static String item_to_task = "to_task";
+    public static String item_to_is_flip = "to_is_flip";
+    public static String item_to_barcode = "to_barcode";
+
 
 
 
@@ -61,8 +63,8 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_error);
     }
 
-    public int getVehicle_type() {
-        return this.getOpcIntegerValue(item_vehicle_type);
+    public int getIsflip() {
+        return this.getOpcIntegerValue(item_is_flip);
     }
 
     public int getTask() {
@@ -77,10 +79,6 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_to_target);
     }
 
-    public int getToVehicle_type() {
-        return this.getOpcIntegerValue(item_to_vehicle_type);
-    }
-
     public int getToTask() {
         return this.getOpcIntegerValue(item_to_task);
     }
@@ -123,7 +121,7 @@ public class ItemProtocol {
         list.add(new ItemDto(item_move, "光电开关信号", "DB600.W4"));
         list.add(new ItemDto(item_action, "取放信号", "DB600.W6"));
         list.add(new ItemDto(item_direction, "电机方向", "DB600.W8"));
-        list.add(new ItemDto(item_vehicle_type, "托盘类型", "DB600.W10"));
+        list.add(new ItemDto(item_is_flip, "是否翻转", "DB600.W10"));
         list.add(new ItemDto(item_error, "报警信号", "DB600.W12"));
         list.add(new ItemDto(item_task, "任务号", "DB600.D14"));
         list.add(new ItemDto(item_barcode, "条码", "DB600.STRING18.20"));
@@ -132,10 +130,11 @@ public class ItemProtocol {
 
     public static List<ItemDto> getWriteableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_to_command, "下发作业命令", "DB601.W0", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_to_target, "下发目标站", "DB601.W2"));
-        list.add(new ItemDto(item_to_vehicle_type, "下发托盘类型", "DB601.W4"));
-        list.add(new ItemDto(item_to_task, "任务号", "DB601.D6"));
+        list.add(new ItemDto(item_to_command, "下发作业命令", "DB610.W2", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_to_target, "下发目标站", "DB610.W4"));
+        list.add(new ItemDto(item_to_is_flip, "下发是否翻转", "DB610.W6"));
+        list.add(new ItemDto(item_to_task, "下发任务号", "DB610.D8"));
+        list.add(new ItemDto(item_to_barcode, "下发条码", "DB610.STRING12.20"));
         return list;
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_palletizing_station/HailiangOldPalletizingStationDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_palletizing_station/HailiangOldPalletizingStationDriver.java
index 9bce7be5..7d5a0ea4 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_palletizing_station/HailiangOldPalletizingStationDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_palletizing_station/HailiangOldPalletizingStationDriver.java
@@ -12,6 +12,7 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
+import org.nl.acs.history.ErrorUtil;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;
 import org.nl.acs.log.service.DeviceExecuteLogService;
@@ -185,6 +186,34 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
     @Override
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();
+        jo.put("device_name", this.getDevice().getDevice_name());
+        String mode = "";
+        String action = "";
+        String move = "";
+        if (this.getMode() == 0) {
+            mode = "未联机";
+        } else if (this.getMode() == 1) {
+            mode = "单机";
+        } else if (this.getMode() == 2) {
+            mode = "联机";
+        } else if (this.getMode() == 3) {
+            mode = "运行中";
+        }
+        if (this.getMove() == 0) {
+            move = "无货";
+            jo.put("hasGoods", false);
+        } else if (this.getMove() == 1) {
+            move = "有货";
+            jo.put("hasGoods", true);
+        } else if (this.getMove() == 2) {
+            move = "有托盘有货";
+            jo.put("hasGoods", true);
+        }
+        jo.put("isOnline", this.getIsonline());
+        jo.put("isError", this.getIserror());
+        jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error)));
+        jo.put("isOnline", this.itemProtocol.getIsonline());
+        jo.put("message", message);
         return jo;
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_stacking_manipulator/HailiangOldStackingManipulatorDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_stacking_manipulator/HailiangOldStackingManipulatorDriver.java
index e7f623ac..8cdd07cb 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_stacking_manipulator/HailiangOldStackingManipulatorDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_stacking_manipulator/HailiangOldStackingManipulatorDriver.java
@@ -1,5 +1,8 @@
 package org.nl.acs.device_driver.basedriver.hailiang_old.hailiang_old_stacking_manipulator;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -8,18 +11,25 @@ import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
+import org.nl.acs.device_driver.basedriver.hailiang_old.hailiang_old_package_ssx.HailiangLetteringPackageSsxDeviceDriver;
+import org.nl.acs.device_driver.basedriver.hailiang_old.hailiang_old_palletizing_station.HailiangOldPalletizingStationDriver;
+import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_auto_cache_line.HailiangAutoCacheLineDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
+import org.nl.acs.history.ErrorUtil;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.log.service.DeviceExecuteLogService;
 import org.nl.acs.monitor.DeviceStageMonitor;
 import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.order.service.ProduceshiftorderService;
+import org.nl.acs.order.service.dto.ProduceshiftorderDto;
 import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.task.service.TaskService;
+import org.nl.modules.lucene.service.LuceneExecuteLogService;
+import org.nl.modules.lucene.service.dto.LuceneLogDto;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +62,9 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
     ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
     @Autowired
     DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
+    @Autowired
+    LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class);
+
     //心跳
     int heartbeat = 0;
     int last_heartbeat = 0;
@@ -87,7 +100,7 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
     //请求码垛完成标志
     Boolean stackingRequireSuccess = false;
 
-
+    JSONArray barcodeArr = new JSONArray();
     //当前设备状态    01代表 关机, 02代表 开机, 03代表 生产中, 04代表 待机, 05代表 异常
     int status_type = 0;
     //上次设备状态
@@ -139,6 +152,9 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号status：" + last_status + "->" + status);
             }
             if (action != last_action) {
+                vehicleInfoRequireSuccess = false;
+                singlePlacementRequireSuccess =false;
+                stackingRequireSuccess = false;
                 logServer.deviceItemValue(this.device_code, "action", String.valueOf(action));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action);
             }
@@ -220,28 +236,92 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
             //根据kep读取到的抓取工位的值 - 1 得到对应设备的下标,再根据下标获得对应设备的编码
             String getDeviceCode = getDeviceCodeList.get(getGetStation() - 1).replace("\"", "");
             //根据抓取工位获取托盘信息
-            JSONObject map = new JSONObject();
-            map.put("getStation", getDeviceCode);
-            JSONObject resp = acsToWmsService.getVehicle(map);
-            int code = Integer.parseInt(resp.getString("code"));
-            String message = resp.getString("message");
-            String getStation = resp.getString("getStation");
-            String putStation = resp.getString("putStation");
-            String encoder_qty = resp.getString("encoder_qty");
-            String boxtype = resp.getString("boxtype");
-            if (code == 200) {
-                //根据获取托盘信息返回的结果 得到对应抓取工位/放货工位设备编码所在的索引位置
-                int getIndex = getDeviceCodeList.indexOf(getStation);
-                int putIndex = putDeviceCodeList.indexOf(putStation);
-                //将的到的索引 + 1 写入kep中
-                this.writing("to_getStation", String.valueOf(getIndex + 1));
+//            JSONObject map = new JSONObject();
+//            map.put("getStation", getDeviceCode);
+//            JSONObject resp = acsToWmsService.getVehicle(map);
+//            int code = Integer.parseInt(resp.getString("code"));
+//            String message = resp.getString("message");
+//            String getStation = resp.getString("getStation");
+//            String putStation = resp.getString("putStation");
+//            String encoder_qty = resp.getString("encoder_qty");
+//            String boxtype = resp.getString("boxtype");
+//            if (code == 200) {
+//                //根据获取托盘信息返回的结果 得到对应抓取工位/放货工位设备编码所在的索引位置
+//                int getIndex = getDeviceCodeList.indexOf(getStation);
+//                int putIndex = putDeviceCodeList.indexOf(putStation);
+//                //将的到的索引 + 1 写入kep中
+//                this.writing("to_getStation", String.valueOf(getIndex + 1));
+//                this.writing("to_putStation", String.valueOf(putIndex + 1));
+//                this.writing("to_boxtype", boxtype);
+//                this.writing("to_feedback", "1");
+//                //获取托盘信息成功后 设为true 防止多次请求 等单次防止完成时设为false
+//                this.setVehicleInfoRequireSuccess(true);
+//            } else {
+//                log.warn("获取托盘信息失败!设备号:{},原因{}", device_code, message);
+//            }
+
+            int getIndex = 0;
+            int putIndex = 0;
+            //获取取货位条码
+            Device getDevice = deviceAppservice.findDeviceByCode(getDeviceCode);
+            HailiangLetteringPackageSsxDeviceDriver hailiangLetteringPackageSsxDeviceDriver;
+            if(getDevice.getDeviceDriver() instanceof HailiangLetteringPackageSsxDeviceDriver ) {
+                hailiangLetteringPackageSsxDeviceDriver = (HailiangLetteringPackageSsxDeviceDriver) getDevice.getDeviceDriver();
+                String barcode = hailiangLetteringPackageSsxDeviceDriver.getBarcode();
+                if (Objects.isNull(barcode)) {
+                    message = "获取托盘信息,取货位:" + getDeviceCode + "条码为空";
+                    return false;
+                }
+                String order = barcode.trim().substring(0,9);
+                ProduceshiftorderDto dto =produceshiftorderService.findByCodeFromCache(order);
+                if(Objects.isNull(dto)){
+                    message = "获取托盘信息,工单号:" + order + "未找到对应工单";
+                    return false;
+                }
+                String boxType = dto.getBox_type();
+                String tray_full_num = dto.getTray_full_num();
+                String targetStation = null;
+                for(int i=0;i<putDeviceCodeList.size();i++){
+                    Device device = deviceAppservice.findDeviceByCode(putDeviceCodeList.get(i));
+                    HailiangOldPalletizingStationDriver hailiangOldPalletizingStationDriver;
+                    if(device.getDeviceDriver() instanceof HailiangOldPalletizingStationDriver){
+                        hailiangOldPalletizingStationDriver = (HailiangOldPalletizingStationDriver) device.getDeviceDriver();
+                        if(hailiangOldPalletizingStationDriver.getMode() == 2 &&  hailiangOldPalletizingStationDriver.getMove()==1
+                                && StrUtil.equals(String.valueOf(hailiangOldPalletizingStationDriver.getBoxtype()),boxType)
+                                && hailiangOldPalletizingStationDriver.getNumber() < Integer.parseInt(tray_full_num) ){
+                            targetStation = putDeviceCodeList.get(i);
+                            putIndex = i;
+                            lucene.deviceExecuteLog(new LuceneLogDto(this.device_code,"单次码垛完成，取货位:"+getDeviceCode+",条码:"+barcode +",分配放货位:"+ putDeviceCodeList.get(i)));
+                            break;
+                        }
+                    }
+                }
+                if(StrUtil.isEmpty(targetStation)){
+                    for(int i=0;i<putDeviceCodeList.size();i++){
+                        Device device = deviceAppservice.findDeviceByCode(putDeviceCodeList.get(i));
+                        HailiangOldPalletizingStationDriver hailiangOldPalletizingStationDriver;
+                        if(device.getDeviceDriver() instanceof HailiangOldPalletizingStationDriver){
+                            hailiangOldPalletizingStationDriver = (HailiangOldPalletizingStationDriver) device.getDeviceDriver();
+                            if(hailiangOldPalletizingStationDriver.getNumber() == 0 ){
+                                targetStation = putDeviceCodeList.get(i);
+                                lucene.deviceExecuteLog(new LuceneLogDto(this.device_code,"单次码垛完成，取货位:"+getDeviceCode+",条码:"+barcode +",未找到相同箱型放货位,分配空放货位:"+ putDeviceCodeList.get(i)));
+                                putIndex = i;
+                                break;
+                            }
+                        }
+                    }
+                }
+                if(StrUtil.isEmpty(targetStation)){
+                    message = "单次码垛完成，取货位["+getDeviceCode+"],条码["+barcode + "]未找到可放置的放货位";
+                    return false;
+                }
+
+                this.writing("to_getStation", String.valueOf(this.getStation));
                 this.writing("to_putStation", String.valueOf(putIndex + 1));
-                this.writing("to_boxtype", boxtype);
+                this.writing("to_boxtype", boxType);
                 this.writing("to_feedback", "1");
                 //获取托盘信息成功后 设为true 防止多次请求 等单次防止完成时设为false
                 this.setVehicleInfoRequireSuccess(true);
-            } else {
-                log.warn("获取托盘信息失败!设备号:{},原因{}", device_code, message);
             }
         }
         return true;
@@ -264,21 +344,38 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
             String getDeviceCode = getDeviceCodeList.get(getGetStation() - 1).replace("\"", "");
             //根据kep读取到的放货工位的值 - 1 得到对应设备的下标,再根据下标获得对应设备的编码
             String putDeviceCode = putDeviceCodeList.get(getPutStation() - 1).replace("\"", "");
-            JSONObject map = new JSONObject();
-            map.put("getStation", getDeviceCode);
-            map.put("putStation", putDeviceCode);
-            map.put("encoder_qty", getEncoder_qty());
-            map.put("boxtype", getBoxtype());
-            JSONObject resp = acsToWmsService.singlePlacementCompleted(map);
-            int code = Integer.parseInt(resp.getString("code"));
-            String message = resp.getString("message");
-            JSONObject data = resp.getJSONObject("data");
-            if (code == 200) {
-                this.writing("to_feedback", "2");
-                this.setSinglePlacementRequireSuccess(true);
-            } else {
-                log.warn("单次放置完成反馈失败!设备号:{},原因{}", device_code, message);
+//            JSONObject map = new JSONObject();
+//            map.put("getStation", getDeviceCode);
+//            map.put("putStation", putDeviceCode);
+//            map.put("encoder_qty", getEncoder_qty());
+//            map.put("boxtype", getBoxtype());
+//            JSONObject resp = acsToWmsService.singlePlacementCompleted(map);
+//            int code = Integer.parseInt(resp.getString("code"));
+//            String message = resp.getString("message");
+//            JSONObject data = resp.getJSONObject("data");
+//            if (code == 200) {
+//                this.writing("to_feedback", "2");
+//                this.setSinglePlacementRequireSuccess(true);
+//            } else {
+//                log.warn("单次放置完成反馈失败!设备号:{},原因{}", device_code, message);
+//            }
+
+            //暂时不反馈MES
+            Device getDevice = deviceAppservice.findDeviceByCode(getDeviceCode);
+            HailiangLetteringPackageSsxDeviceDriver hailiangLetteringPackageSsxDeviceDriver;
+            if(getDevice.getDeviceDriver() instanceof HailiangLetteringPackageSsxDeviceDriver ){
+                hailiangLetteringPackageSsxDeviceDriver = (HailiangLetteringPackageSsxDeviceDriver) getDevice.getDeviceDriver();
+                String barcode = hailiangLetteringPackageSsxDeviceDriver.getLast_barcode();
+                if(Objects.isNull(barcode)){
+                    message = "单次码垛完成,取货位:"+getDeviceCode+"条码为空";
+                    return false;
+                }
+                lucene.deviceExecuteLog(new LuceneLogDto(this.device_code,"单次码垛完成，取货位:"+getDeviceCode+",条码:"+barcode));
+                barcodeArr.add(barcode);
             }
+
+            this.writing("to_feedback", "2");
+            this.setSinglePlacementRequireSuccess(true);
         }
         return true;
     }
@@ -297,9 +394,11 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
             //根据kep读取到的放货工位的值 - 1 得到对应设备的下标,再根据下标获得对应设备的编码
             String putDeviceCode = putDeviceCodeList.get(getPutStation() - 1).replace("\"", "");
             JSONObject map = new JSONObject();
-            map.put("putStation", putDeviceCode);
-            map.put("encoder_qty", getEncoder_qty());
-            map.put("boxtype", getBoxtype());
+            map.put("device_code", putDeviceCode);
+            map.put("encoder_qty", String.valueOf(getEncoder_qty()));
+            map.put("boxtype", String.valueOf(getBoxtype()));
+            map.put("barcodeArr",barcodeArr);
+            map.put("id", IdUtil.simpleUUID());
             JSONObject resp = acsToWmsService.stackingCompleted(map);
             int code = Integer.parseInt(resp.getString("code"));
             String message = resp.getString("message");
@@ -340,7 +439,15 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
 
     @Override
     public JSONObject getDeviceStatusName() {
-        return null;
+        JSONObject jo = new JSONObject();
+        jo.put("device_name", this.getDevice().getDevice_name());
+        jo.put("mode", mode == 1 ? "联机" : "未联机");
+        jo.put("action", action);
+        jo.put("error", ErrorUtil.getDictDetail("jxs_error_type", String.valueOf(error)));
+        jo.put("barcodeArr", barcodeArr);
+        jo.put("isOnline", this.itemProtocol.getIsonline());
+        jo.put("message", message);
+        return jo;
     }
 
     @Override
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/HailiangOldUnboxingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/HailiangOldUnboxingMachineDeviceDriver.java
index ff866816..1b22675e 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/HailiangOldUnboxingMachineDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/HailiangOldUnboxingMachineDeviceDriver.java
@@ -34,7 +34,7 @@ import java.util.Map;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo {
+public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
 
     DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
@@ -44,34 +44,22 @@ public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDri
 
     int heartbeat = 0;
     int mode = 0;
-    int unboxing_error = 0;
-    int unboxing_running = 0;
-    int unboxing_ready = 0;
-    int order_finish = 0;
-    int order_compel_finish = 0;
+    int qty = 0;
+    int one_qty = 0;
+    int two_qty = 0;
+    int three_qty = 0;
+    int four_qty = 0;
+    int five_qty = 0;
+    int one_status = 0;
+    int two_status = 0;
+    int three_status = 0;
+    int four_status = 0;
+    int five_status = 0;
     int error = 0;
-    int now_order_num = 0;
-    int task = 0;
-    int open_ready_time = 0;
-    int device_running_time = 0;
-    int await_time = 0;
-    int order = 0;
 
     int last_heartbeat = 0;
     int last_mode = 0;
-    int last_unboxing_error = 0;
-    int last_unboxing_running = 0;
-    int last_unboxing_ready = 0;
-    int last_order_finish = 0;
-    int last_order_compel_finish = 0;
     int last_error = 0;
-    int last_now_order_num = 0;
-    int last_task = 0;
-    int last_open_ready_time = 0;
-    int last_device_running_time = 0;
-    int last_await_time = 0;
-    int last_order = 0;
-
 
     Boolean isonline = true;
     String message = null;
@@ -95,6 +83,8 @@ public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDri
             device_code = this.getDeviceCode();
             mode = this.itemProtocol.getMode();
             error = this.itemProtocol.getError();
+            qty = this.itemProtocol.getQty();
+
 
             if (mode != last_mode) {
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
@@ -142,9 +132,19 @@ public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDri
         jo.put("device_name", this.getDevice().getDevice_name());
         jo.put("mode", mode == 1 ? "联机" : "未联机");
         jo.put("error", ErrorUtil.getDictDetail("unbox_error_type", String.valueOf(error)));
-        jo.put("now_order_num", now_order_num);
-        jo.put("task", task);
-        jo.put("order", order);
+        jo.put("qty", qty);
+        jo.put("status", this.itemProtocol.getStatus()==1 ? "未知":"工作中");
+        jo.put("one_qty", this.itemProtocol.getOne_qty());
+        jo.put("two_qty", this.itemProtocol.getTwo_qty());
+        jo.put("three_qty", this.itemProtocol.getThree_qty());
+        jo.put("four_qty", this.itemProtocol.getFour_qty());
+        jo.put("five_qty", this.itemProtocol.getFive_qty());
+        jo.put("one_status", this.itemProtocol.getStatus());
+        jo.put("two_status", this.itemProtocol.getStatus());
+        jo.put("three_status", this.itemProtocol.getStatus());
+        jo.put("four_status", this.itemProtocol.getStatus());
+        jo.put("five_status", this.itemProtocol.getStatus());
+        jo.put("is_disable", this.itemProtocol.getIs_disable());
         jo.put("isOnline", this.itemProtocol.getIsonline());
         return jo;
     }
@@ -154,36 +154,4 @@ public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDri
 
     }
 
-    @Override
-    public void issuedOrderInfo(ProduceshiftorderDto dto) {
-        EalingOrderDto ealingOrderDto = dto.getEalingOrderDto();
-        if (ealingOrderDto != null) {
-            String is_foreward = ealingOrderDto.getIs_foreward();
-            Map<String, Object> map = new HashMap<>();
-            map.put("to_clear", "1");
-            map.put("to_is_foreward", is_foreward);
-            map.put("to_order_box_num", ealingOrderDto.getOrder_box_num());
-            map.put("to_order", ealingOrderDto.getOrder_code());
-            this.writing(map);
-        }
-    }
-
-    @Override
-    public void issuedOrderFinish(String autoFinish) {
-        if (StrUtil.equals(autoFinish, WorkerOrderEnum.FORCEFINISH.getCode())) {
-            this.writing("to_order_compel_finished", "1");
-        } else {
-            this.writing("to_confirm_finished", "1");
-        }
-    }
-
-    @Override
-    public void toStop() {
-
-    }
-
-    @Override
-    public void toStart() {
-
-    }
 }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/ItemProtocol.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/ItemProtocol.java
index 0713e327..7b74a467 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/ItemProtocol.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/ItemProtocol.java
@@ -41,6 +41,8 @@ public class ItemProtocol {
     public static String item_four_status = "four_status";
     //前往5巷道状态
     public static String item_five_status = "five_status";
+    //是否禁用
+    public static String item_is_disable = "is_disable";
 
 
     //前往1巷道状态
@@ -55,6 +57,9 @@ public class ItemProtocol {
     public static String item_to_five_status = "to_five_status";
     //清零
     public static String item_to_clear = "to_clear";
+    //禁用
+    public static String item_to_is_disable = "to_is_disable";
+
 
     private HailiangOldUnboxingMachineDeviceDriver driver;
 
@@ -122,6 +127,9 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_five_status);
     };
 
+    public int getIs_disable() {
+        return this.getOpcIntegerValue(item_is_disable);
+    };
 
     Boolean isonline;
 
@@ -155,17 +163,20 @@ public class ItemProtocol {
         list.add(new ItemDto(item_three_status, "3号巷道状态", "DB600.W24"));
         list.add(new ItemDto(item_four_status, "4号巷道状态", "DB600.W26"));
         list.add(new ItemDto(item_five_status, "5号巷道状态", "DB600.W28"));
+        list.add(new ItemDto(item_is_disable, "是否禁用", "DB600.W30"));
         return list;
     }
 
     public static List<ItemDto> getWriteableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_to_one_status, "禁用1号巷道状态", "DB601.W2"));
-        list.add(new ItemDto(item_to_two_status, "禁用2号巷道状态", "DB600.W4"));
-        list.add(new ItemDto(item_to_three_status, "禁用3号巷道状态", "DB600.W6"));
-        list.add(new ItemDto(item_to_four_status, "禁用4号巷道状态", "DB600.W8"));
-        list.add(new ItemDto(item_to_five_status, "禁用5号巷道状态", "DB600.W10"));
-        list.add(new ItemDto(item_to_clear, "清零", "DB600.W12"));
+        list.add(new ItemDto(item_to_one_status, "禁用1号巷道状态", "DB610.W2"));
+        list.add(new ItemDto(item_to_two_status, "禁用2号巷道状态", "DB610.W4"));
+        list.add(new ItemDto(item_to_three_status, "禁用3号巷道状态", "DB610.W6"));
+        list.add(new ItemDto(item_to_four_status, "禁用4号巷道状态", "DB610.W8"));
+        list.add(new ItemDto(item_to_five_status, "禁用5号巷道状态", "DB610.W10"));
+        list.add(new ItemDto(item_to_clear, "下发清零", "DB610.W12"));
+        list.add(new ItemDto(item_to_is_disable, "下发禁用", "DB610.W14"));
+
         return list;
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index f5db58d4..fd423fe8 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -572,34 +572,34 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     @Override
     public JSONObject stackingCompleted(JSONObject param) {
-        a = 20;
-        JSONObject map = new JSONObject();
-        map.put("code", 200);
-        map.put("message", "成功");
-        map.put("data", null);
-        return map;
-//        try {
-//            MDC.put(log_file_type, log_type);
-//            String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue();
-//            HttpResponse result = null;
-//            log.info("stackingCompleted-----码垛完成请求");
-//            AddressDto addressDto = addressService.findByCode("stackingCompleted");
-//            String methods_url = addressDto.getMethods_url();
-//            try {
-//                result = HttpRequest.get(wmsurl + methods_url)
-//                        .body("")
-//                        .execute();
-//                log.info("stackingCompleted-----码垛完成输出参数{}", result.body().toString());
-//            } catch (Exception e) {
-//                String msg = e.getMessage();
-//                //网络不通
-//                System.out.println(msg);
-//            }
-//            JSONObject jo = JSONObject.parseObject(result.body());
-//            return jo;
-//        }  finally {
-//            MDC.remove(log_file_type);
-//        }
+//        a = 20;
+//        JSONObject map = new JSONObject();
+//        map.put("code", 200);
+//        map.put("message", "成功");
+//        map.put("data", null);
+//        return map;
+        try {
+            MDC.put(log_file_type, log_type);
+            String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue();
+            HttpResponse result = null;
+            log.info("stackingCompleted-----码垛完成请求");
+            AddressDto addressDto = addressService.findByCode("stackingCompleted");
+            String methods_url = addressDto.getMethods_url();
+            try {
+                result = HttpRequest.get(wmsurl + methods_url)
+                        .body("")
+                        .execute();
+                log.info("stackingCompleted-----码垛完成输出参数{}", result.body().toString());
+            } catch (Exception e) {
+                String msg = e.getMessage();
+                //网络不通
+                System.out.println(msg);
+            }
+            JSONObject jo = JSONObject.parseObject(result.body());
+            return jo;
+        }  finally {
+            MDC.remove(log_file_type);
+        }
     }
 
 }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index c61325d7..dfc68fc7 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -246,6 +246,28 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 String is_used_fxx = param.getString("is_used_fxx");
                 String ealing_device_code = param.getString("ealing_device_code");
                 String unboxing_device_code = param.getString("unboxing_device_code");
+
+                Map<String, Object> extra_map = param.getJSONObject("extra_map");
+
+                //老车间包装工单信息
+                //每箱袋数
+                String one_box_package_qty = extra_map.get("one_box_package_qty").toString();
+                //袋数
+                String package_qty = extra_map.get("package_qty").toString();
+                //每袋数量
+                String one_package_qty = extra_map.get("one_package_qty").toString();
+                //箱数
+                String box_num = extra_map.get("box_num").toString();
+                //箱型
+                String box_type = extra_map.get("box_type").toString();
+                //目标巷道
+                String target_roadway = extra_map.get("target_roadway").toString();
+                //是否翻转
+                String is_flip = extra_map.get("is_flip").toString();
+                //托盘满托数量
+                String tray_full_num = extra_map.get("tray_full_num").toString();
+
+
                 Map<String, Object> params = param.getJSONObject("params");
                 EalingOrderDto ealingOrderDto = null;
                 if (ObjectUtil.isNotEmpty(params)) {
@@ -317,6 +339,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 dto.setIs_used_fxx(is_used_fxx);
                 dto.setEaling_device_code(ealing_device_code);
                 dto.setUnboxing_device_code(unboxing_device_code);
+                dto.setOne_box_package_qty(one_box_package_qty);
+                dto.setOne_package_qty(one_package_qty);
+                dto.setPackage_qty(package_qty);
+                dto.setBox_num(box_num);
+                dto.setBox_type(box_type);
+                dto.setTarget_roadway(target_roadway);
+                dto.setIs_flip(is_flip);
+                dto.setTray_full_num(tray_full_num);
                 dto.setEalingOrderDto(ealingOrderDto);
                 dto.setCreate_by("mes");
                 try {
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java
index c92b4eef..3cbfa997 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java
@@ -135,4 +135,44 @@ public class ProduceshiftorderDto implements Serializable {
      */
     private EalingOrderDto ealingOrderDto;
 
+    /**
+     * 每箱袋数
+     */
+    private String one_box_package_qty;
+
+    /**
+     * 每袋数量
+     */
+    private String one_package_qty;
+
+    /**
+     * 箱数
+     */
+    private String box_num;
+
+    /**
+     * 箱型
+     */
+    private String box_type;
+
+    /**
+     * 目标巷道
+     */
+    private String target_roadway;
+
+    /**
+     * 是否翻转
+     */
+    private String is_flip;
+
+    /**
+     * 托盘满托数量
+     */
+    private String tray_full_num;
+
+    /**
+     * 袋数
+     */
+    private String package_qty;
+
 }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls
index 86ffb1b05bf9f837359c522bc1a223e50840dbec..cb0849618786e39707406263f923ca80a9ca4d3d 100644
GIT binary patch
delta 11190
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

delta 9108
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

diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java b/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java
index 90e89fd9..57cdcea3 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java
@@ -82,4 +82,13 @@ public class LuceneLogDto {
                 + last_home + " -> "
                 + home;
     }
+
+    public LuceneLogDto(final String device_code, final String remark) {
+        super();
+        this.device_code = device_code;
+        this.content = "设备 ["
+                + device_code
+                + "] : "
+                + remark;
+    }
 }
diff --git a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_receiving_machine.vue b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_receiving_machine.vue
index ee900862..a30b7f00 100644
--- a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_receiving_machine.vue
+++ b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_receiving_machine.vue
@@ -334,61 +334,19 @@ export default {
         }
         for (const val in this.data1) {
           if (this.data1[val].code.indexOf('move') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
-          }
-          if (this.data1[val].code.indexOf('action') !== -1) {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
           }
-          if (this.data1[val].code.indexOf('ioaction') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3)
-          }
-          if (this.data1[val].code.indexOf('error') !== -1) {
+          if (this.data1[val].code.indexOf('action') !== -1) {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
           }
+          if (this.data1[val].code.indexOf('is_full') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 6)
+          }
+          if (this.data1[val].code.indexOf('error') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 8)
+          }
           if (this.data1[val].code.indexOf('task') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 5)
-          }
-          if (this.data1[val].code.indexOf('weight') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 9)
-          }
-          if (this.data1[val].code.indexOf('batch') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 13)
-          }
-          if (this.data1[val].code.indexOf('specifications') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 17) + '.50'
-          }
-          if (this.data1[val].code.indexOf('material') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 273) + '.50'
-          }
-          if (this.data1[val].code.indexOf('barcode') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 529) + '.50'
-          }
-          if (this.data1[val].code.indexOf('AlongSide') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 785)
-          }
-          if (this.data1[val].code.indexOf('BshortSide') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 787)
-          }
-          if (this.data1[val].code.indexOf('Htrapezoidal') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 789)
-          }
-          if (this.data1[val].code.indexOf('Wthickness') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 791)
-          }
-          if (this.data1[val].code.indexOf('status') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 795)
-          }
-          if (this.data1[val].code.indexOf('unqualified_qty') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 795)
-          }
-          if (this.data1[val].code.indexOf('encoder_qty') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 799)
-          }
-          if (this.data1[val].code.indexOf('order_qty') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 803)
-          }
-          if (this.data1[val].code.indexOf('order_No') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 807) + '.50'
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 10)
           }
         }
       }
@@ -414,33 +372,6 @@ export default {
           if (this.data2[val].code.indexOf('to_task') !== -1) {
             this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4)
           }
-          if (this.data2[val].code.indexOf('to_barcode') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 8) + '.50'
-          }
-          if (this.data2[val].code.indexOf('to_error') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 264)
-          }
-          if (this.data2[val].code.indexOf('to_allow_pallet_qty') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 266)
-          }
-          if (this.data2[val].code.indexOf('to_material_type') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 268)
-          }
-          // if (this.data2[val].code.indexOf('to_material_code') !== -1) {
-          //   this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 272)
-          // }
-          if (this.data2[val].code.indexOf('to_order_qty') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 276)
-          }
-          if (this.data2[val].code.indexOf('to_product_code') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 280)
-          }
-          if (this.data2[val].code.indexOf('to_order_No') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 284) + '.50'
-          }
-          if (this.data2[val].code.indexOf('to_material_code') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 540) + '.50'
-          }
         }
       }
     },
diff --git a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_ssx_station.vue b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_ssx_station.vue
index e724b65d..f6ab9efc 100644
--- a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_ssx_station.vue
+++ b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_ssx_station.vue
@@ -334,61 +334,25 @@ export default {
         }
         for (const val in this.data1) {
           if (this.data1[val].code.indexOf('move') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
-          }
-          if (this.data1[val].code.indexOf('action') !== -1) {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
           }
-          if (this.data1[val].code.indexOf('ioaction') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3)
-          }
-          if (this.data1[val].code.indexOf('error') !== -1) {
+          if (this.data1[val].code.indexOf('action') !== -1) {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
           }
+          if (this.data1[val].code.indexOf('direction') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 6)
+          }
+          if (this.data1[val].code.indexOf('is_flip') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 8)
+          }
+          if (this.data1[val].code.indexOf('error') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 10)
+          }
           if (this.data1[val].code.indexOf('task') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 5)
-          }
-          if (this.data1[val].code.indexOf('weight') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 9)
-          }
-          if (this.data1[val].code.indexOf('batch') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 13)
-          }
-          if (this.data1[val].code.indexOf('specifications') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 17) + '.50'
-          }
-          if (this.data1[val].code.indexOf('material') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 273) + '.50'
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 12)
           }
           if (this.data1[val].code.indexOf('barcode') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 529) + '.50'
-          }
-          if (this.data1[val].code.indexOf('AlongSide') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 785)
-          }
-          if (this.data1[val].code.indexOf('BshortSide') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 787)
-          }
-          if (this.data1[val].code.indexOf('Htrapezoidal') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 789)
-          }
-          if (this.data1[val].code.indexOf('Wthickness') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 791)
-          }
-          if (this.data1[val].code.indexOf('status') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 795)
-          }
-          if (this.data1[val].code.indexOf('unqualified_qty') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 795)
-          }
-          if (this.data1[val].code.indexOf('encoder_qty') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 799)
-          }
-          if (this.data1[val].code.indexOf('order_qty') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 803)
-          }
-          if (this.data1[val].code.indexOf('order_No') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 807) + '.50'
+            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 16) + '.20'
           }
         }
       }
@@ -411,35 +375,14 @@ export default {
           if (this.data2[val].code.indexOf('to_target') !== -1) {
             this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
           }
+          if (this.data2[val].code.indexOf('to_is_flip') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
+          }
           if (this.data2[val].code.indexOf('to_task') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4)
+            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
           }
           if (this.data2[val].code.indexOf('to_barcode') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 8) + '.50'
-          }
-          if (this.data2[val].code.indexOf('to_error') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 264)
-          }
-          if (this.data2[val].code.indexOf('to_allow_pallet_qty') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 266)
-          }
-          if (this.data2[val].code.indexOf('to_material_type') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 268)
-          }
-          // if (this.data2[val].code.indexOf('to_material_code') !== -1) {
-          //   this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 272)
-          // }
-          if (this.data2[val].code.indexOf('to_order_qty') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 276)
-          }
-          if (this.data2[val].code.indexOf('to_product_code') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 280)
-          }
-          if (this.data2[val].code.indexOf('to_order_No') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 284) + '.50'
-          }
-          if (this.data2[val].code.indexOf('to_material_code') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 540) + '.50'
+            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 10) + '.20'
           }
         }
       }
diff --git a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_unboxing_machine.vue b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_unboxing_machine.vue
index 9b0a681c..1bc5454a 100644
--- a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_unboxing_machine.vue
+++ b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_unboxing_machine.vue
@@ -333,69 +333,54 @@ export default {
           return
         }
         for (const val in this.data1) {
-          if (this.data1[val].code.indexOf('move') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
-          }
-          if (this.data1[val].code.indexOf('action') !== -1) {
+          if (this.data1[val].code.indexOf('status') !== -1) {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
           }
-          if (this.data1[val].code.indexOf('ioaction') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3)
-          }
           if (this.data1[val].code.indexOf('error') !== -1) {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
           }
-          if (this.data1[val].code.indexOf('task') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 5)
+          if (this.data1[val].code.indexOf('qty') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 6)
           }
-          if (this.data1[val].code.indexOf('weight') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 9)
+          if (this.data1[val].code.indexOf('one_qty') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 6)
           }
-          if (this.data1[val].code.indexOf('batch') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 13)
+          if (this.data1[val].code.indexOf('two_qty') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 8)
           }
-          if (this.data1[val].code.indexOf('specifications') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 17) + '.50'
+          if (this.data1[val].code.indexOf('three_qty') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 10)
           }
-          if (this.data1[val].code.indexOf('material') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 273) + '.50'
+          if (this.data1[val].code.indexOf('four_qty') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 12)
           }
-          if (this.data1[val].code.indexOf('barcode') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 529) + '.50'
+          if (this.data1[val].code.indexOf('five_qty') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 14)
           }
-          if (this.data1[val].code.indexOf('AlongSide') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 785)
+          if (this.data1[val].code.indexOf('one_status') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 16)
           }
-          if (this.data1[val].code.indexOf('BshortSide') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 787)
+          if (this.data1[val].code.indexOf('two_status') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 18)
           }
-          if (this.data1[val].code.indexOf('Htrapezoidal') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 789)
+          if (this.data1[val].code.indexOf('three_status') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 20)
           }
-          if (this.data1[val].code.indexOf('Wthickness') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 791)
+          if (this.data1[val].code.indexOf('four_status') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 22)
           }
-          if (this.data1[val].code.indexOf('status') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 795)
+          if (this.data1[val].code.indexOf('five_status') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 24)
           }
-          if (this.data1[val].code.indexOf('unqualified_qty') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 795)
-          }
-          if (this.data1[val].code.indexOf('encoder_qty') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 799)
-          }
-          if (this.data1[val].code.indexOf('order_qty') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 803)
-          }
-          if (this.data1[val].code.indexOf('order_No') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 807) + '.50'
+          if (this.data1[val].code.indexOf('is_disable') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 26)
           }
         }
       }
     },
     finishWriteEdit(data) {
       // 编辑的是code列,并且值包含mode
-      if (data.code.indexOf('to_command') !== -1) {
+      if (data.code.indexOf('to_one_status') !== -1) {
         const dbValue = data.db
         // .之前的字符串
         const beforeStr = dbValue.match(/(\S*)\./)[1]
@@ -408,38 +393,23 @@ export default {
           return
         }
         for (const val in this.data2) {
-          if (this.data2[val].code.indexOf('to_target') !== -1) {
+          if (this.data2[val].code.indexOf('to_two_status') !== -1) {
             this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
           }
-          if (this.data2[val].code.indexOf('to_task') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4)
+          if (this.data2[val].code.indexOf('to_three_status') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
           }
-          if (this.data2[val].code.indexOf('to_barcode') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 8) + '.50'
+          if (this.data2[val].code.indexOf('to_four_status') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 6)
           }
-          if (this.data2[val].code.indexOf('to_error') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 264)
+          if (this.data2[val].code.indexOf('to_five_status') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 8)
           }
-          if (this.data2[val].code.indexOf('to_allow_pallet_qty') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 266)
+          if (this.data2[val].code.indexOf('to_clear') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 10)
           }
-          if (this.data2[val].code.indexOf('to_material_type') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 268)
-          }
-          // if (this.data2[val].code.indexOf('to_material_code') !== -1) {
-          //   this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 272)
-          // }
-          if (this.data2[val].code.indexOf('to_order_qty') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 276)
-          }
-          if (this.data2[val].code.indexOf('to_product_code') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 280)
-          }
-          if (this.data2[val].code.indexOf('to_order_No') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 284) + '.50'
-          }
-          if (this.data2[val].code.indexOf('to_material_code') !== -1) {
-            this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 540) + '.50'
+          if (this.data2[val].code.indexOf('to_is_disable') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 12)
           }
         }
       }
diff --git a/wcs/nladmin-ui/src/views/acs/monitor/device/index.vue b/wcs/nladmin-ui/src/views/acs/monitor/device/index.vue
index a3530ae0..14249508 100644
--- a/wcs/nladmin-ui/src/views/acs/monitor/device/index.vue
+++ b/wcs/nladmin-ui/src/views/acs/monitor/device/index.vue
@@ -440,6 +440,36 @@ export default {
           } else if (val === 'is_disable') {
             const obj = { name: '是否禁用', value: data[val] }
             arr.push(obj)
+          } else if (val === 'one_qty') {
+            const obj = { name: '1号口数量', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'two_qty') {
+            const obj = { name: '2号口数量', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'three_qty') {
+            const obj = { name: '3号口数量', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'four_qty') {
+            const obj = { name: '4号口数量', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'five_qty') {
+            const obj = { name: '5号口数量', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'one_status') {
+            const obj = { name: '1号口状态', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'two_status') {
+            const obj = { name: '2号口状态', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'three_status') {
+            const obj = { name: '3号口状态', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'four_status') {
+            const obj = { name: '4号口状态', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'five_status') {
+            const obj = { name: '5号口状态', value: data[val] }
+            arr.push(obj)
           }
         }
         return arr