From 4958451d972b1872d8e852b6c3c3446e700bd806 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 01 七月 2025 10:03:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czscwcs-version' into czscwcs-version
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/entity/param/Result.java | 1 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 9 ---------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/Result.java b/src/main/java/com/zy/asrs/entity/param/Result.java
index d80d41f..eef7229 100644
--- a/src/main/java/com/zy/asrs/entity/param/Result.java
+++ b/src/main/java/com/zy/asrs/entity/param/Result.java
@@ -11,6 +11,7 @@
private int Row; //鍒嗛厤鐨勮揣浣嶆墍灞炴帓
private int Floor; //鍒嗛厤鐨勮揣浣嶆墍灞炲眰
private int Column; //鍒嗛厤鐨勮揣浣嶆墍灞炲垪
+ private int priority; //浼樺厛绾�
//绔欎綅缂栧彿 鐢ㄦ埛鏄粠鍝釜鍙ｅ叆鐨�
private Integer TerminalNo;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 102c053..5847bf1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1839,7 +1839,7 @@
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
taskWrk.setIoType(1);//浠诲姟绫诲瀷 鍏ュ簱
- taskWrk.setIoPri(13);//浼樺厛绾�
+ taskWrk.setIoPri(result.getPriority());//浼樺厛绾�
taskWrk.setBarcode(barcode);//鏉＄爜
taskWrk.setTargetPoint(locNo);
taskWrk.setStartPoint(staNo+"");
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 3cf81fc..7950775 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -83,15 +83,6 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
- try {
- if (param.getIoType() > 1) {
- if (Utils.locNoRowBoolean(locMast.getRow1())) {
- param.setTaskPriority(11);
- }
- }
- } catch (Exception e) {
-
- }
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c7343bd..1453933 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -266,7 +266,7 @@
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
- staProtocol.setAutoing(status[0]); // 鑷姩
+ staProtocol.setAutoing(status[0]); //
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
staProtocol.setOutEnable(status[3]);// 鍙嚭
--
Gitblit v1.9.1