From 2dd8113f890cca042ac20335a5d074bf43e68494 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 19 八月 2024 15:22:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
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 de5891e..6f2226b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2203,9 +2203,6 @@
public synchronized void crn5InTask(){
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId() != 5){
- continue;
- }
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -2280,10 +2277,10 @@
crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setLocType1(locMast.getLocType1().shortValue()); // 璐х墿绫诲瀷
+ crnCommand.setDestinationPosX((short) (locMast.getRow1()+slave.getOffset())); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) (locMast.getBay1()+slave.getOffset())); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) (locMast.getLev1()+slave.getOffset())); // 鐩爣搴撲綅灞�
+ crnCommand.setLocType1(locMast.getLocType1()); // 璐х墿绫诲瀷
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -2306,9 +2303,6 @@
public synchronized void crn5StnToOutStn() {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId() != 5){
- continue;
- }
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
@@ -2425,13 +2419,13 @@
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(locMast.getRow1().shortValue()); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY(locMast.getBay1().shortValue()); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ(locMast.getLev1().shortValue()); // 婧愬簱浣嶅眰
+ crnCommand.setSourcePosX((short) (locMast.getRow1()+slave.getOffset())); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY((short) (locMast.getBay1()+slave.getOffset())); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ((short) (locMast.getLev1()+slave.getOffset())); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setLocType1(locMast.getLocType1().shortValue()); // 璐х墿绫诲瀷
+ crnCommand.setLocType1(locMast.getLocType1()); // 璐х墿绫诲瀷
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -2452,9 +2446,6 @@
public synchronized void crn5TaskCreate() throws IOException {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId() != 5){
- continue;
- }
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnInStn()) {
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
--
Gitblit v1.9.1