From 11dacec56a213218645c7f230096a02f9560e76d Mon Sep 17 00:00:00 2001
From: LENOVO <1793460677@qq.com>
Date: Mon, 22 Apr 2024 19:24:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B1=8F=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SubRollConveyorSiteDeviceDriver.java      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java
index 0fb13996c..a80366db9 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java
@@ -106,6 +106,8 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp
     //当前指令
     Instruction inst = null;
 
+    String notCreateTaskMessage = "";
+
     /**
      * 1-执行任务；2-取货完成；3-放货完成；
      */
@@ -166,6 +168,24 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp
                         Map<String, Object> map = new LinkedHashMap<>();
                         map.put("to_command", 1);
                         this.writing(map);
+                    }else {
+                        String remark = "";;
+                        if (mode != 2) {
+                            remark = "universal_remark2";
+                        }
+                        if (move != 0) {
+                            remark = "universal_remark3";
+                        }
+                        if (task != 0) {
+                            remark = "universal_remark4";
+                            if (ObjectUtil.isNotEmpty(this.inst)) {
+                                this.inst = null;
+                            }
+                        }
+                        if (requireSucess) {
+                            remark = "universal_remark5";
+                        }
+                        this.setNotCreateTaskMessage(remark);
                     }
                     break;
                 default:
@@ -262,6 +282,7 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp
         jo.put("move", move);
         jo.put("isOnline", this.getIsonline());
         jo.put("isError", this.getIserror());
+        jo.put("notCreateTaskMessage", notCreateTaskMessage);
         return jo;
     }