From c2b6ac4b964e78cc3cc3410db90c3d97de8b6d1c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 21 十一月 2024 08:11:01 +0800
Subject: [PATCH] 库位转移按优先级排序
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 5072272..c89817a 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -39,6 +39,10 @@
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
+ public Long sign = System.currentTimeMillis();
+
+ public boolean isRunning = true;
+
/**
* 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
*/
@@ -52,7 +56,7 @@
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
this.connect();
- while (true) {
+ while (isRunning) {
try {
int step = 1;
Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
@@ -93,7 +97,8 @@
} catch (Exception e) {
// e.printStackTrace();
}
-
+// System.out.println("绗�"+slave.getId()+"涓爢鍨涙満绾跨▼杩愯涓�杞細"+(System.currentTimeMillis()-sign));
+ sign = System.currentTimeMillis();
}
}
@@ -237,7 +242,7 @@
}
// convertRow(command);
command.setCrnNo(slave.getId());
- short[] array = new short[10];
+ short[] array = new short[12];
array[0] = command.getAckFinish();
array[1] = command.getTaskNo();
array[2] = command.getTaskMode();
@@ -247,15 +252,18 @@
array[6] = command.getDestinationPosX();
array[7] = command.getDestinationPosY();
array[8] = command.getDestinationPosZ();
-// array[9] = command.getSourceStaNo();
-// array[10] = command.getDestinationStaNo();
- array[9] = command.getCommand();
+ array[9] = command.getSourceStaNo();
+ array[10] = command.getDestinationStaNo();
+ array[11] = command.getCommand();
OperateResult result = siemensNet.Write("DB100.0", array);
- if (command.getAckFinish() == 0) {
+ if(!result.IsSuccess){
+ return false;
+ }
+ if (command.getAckFinish().intValue() == 0) {
short commandFinish = 1;
Thread.sleep(100L);
- result = siemensNet.Write("DB100.18", commandFinish);
+ result = siemensNet.Write("DB100.22", commandFinish);
}
try {
@@ -268,12 +276,12 @@
command.getTaskModeType().toString(), // 妯″紡
command.getSourcePosX().intValue(), // 婧愭帓
command.getSourcePosY().intValue(), // 婧愬垪
- command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
+ command.getSourceStaNo().intValue(), // 婧愬眰
+ command.getDestinationPosZ().intValue(), // 婧愮珯
command.getDestinationPosX().intValue(), // 鐩爣鎺�
command.getDestinationPosY().intValue(), // 鐩爣鍒�
command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
+ command.getDestinationStaNo().intValue(), // 鐩爣绔�
null, // 鍝嶅簲缁撴灉
null, // 淇敼鏃堕棿
null // 淇敼浜哄憳
@@ -415,4 +423,9 @@
}
+ // 鎻愪緵涓�涓柟娉曟潵鍋滄绾跨▼
+ public void requestStop() {
+ isRunning = false;
+ }
+
}
--
Gitblit v1.9.1