From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001 From: cpT <1@123> Date: 星期四, 19 六月 2025 15:02:52 +0800 Subject: [PATCH] #改造 --- src/main/java/com/zy/core/model/protocol/TaskProtocol.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/core/model/protocol/TaskProtocol.java b/src/main/java/com/zy/core/model/protocol/TaskProtocol.java index 9ddcc19..ad8cc4d 100644 --- a/src/main/java/com/zy/core/model/protocol/TaskProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/TaskProtocol.java @@ -10,12 +10,14 @@ private volatile String taskNoDirection; // 浠诲姟鍙凤紙涓诲睘鎬э級 private volatile Long taskNo; // 浠诲姟鍙凤紙涓诲睘鎬э級 private volatile Long targetPosition = 0L; // 鐩爣浣嶇疆 + private volatile Integer targetPositionStaNo = 0; // 鐩爣浣嶇疆 + private volatile Integer targetPositionStaNoPlcId = 1; // 鐩爣浣嶇疆 private volatile int isRunning = 0; // 杩愯鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呮墽琛� 2锛氭墽琛屼腑 3锛氭墽琛屼腑鏂� 4锛氬畬缁� private volatile int taskStatus = 0; //浣滀笟妯″紡 1锛氳璧� 2锛氬彇 3锛氭斁 0:鏃� - private volatile boolean direction; // 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙� + private volatile boolean direction; // 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙� 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 1:鑷繁 2 杞ㄩ亾 true:鑷繁 false:杞ㄩ亾 public TaskProtocol(){} @@ -35,13 +37,24 @@ } + + public TaskProtocol(TaskProtocol taskProtocol,boolean direction) { + this.taskNo = taskProtocol.getTaskNo(); + this.targetPosition = taskProtocol.getTargetPosition(); + this.taskStatus = 1; + this.direction = taskProtocol.direction; + } + + public String gettaskNoDirection$(Long taskNo,int taskStatus){ String taskStatusStr = "Walk"; switch (taskStatus){ - case 1: - taskStatusStr = "Tack"; case 2: + taskStatusStr = "Tack"; + break; + case 3: taskStatusStr = "Put"; + break; } return taskNo+"_"+taskStatusStr; } -- Gitblit v1.9.1