From 5caa5aca98fb035f263ba7f2777722237e2b5eb4 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 18 七月 2025 14:57:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 8054823..fc27a46 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -967,6 +967,13 @@
if (crnProtocol.getBay() == 121) {
return;
}
+ int x=1;
+ switch (crnProtocol.getCrnNo()){
+ case 1: x =1; break;
+ case 2: x =3; break;
+ case 3: x =5; break;
+ case 4: x =7; break;
+ }
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�3,12
if (wrkMastMapper.selectWorking(crnProtocol.getCrnNo()) != null) {
@@ -979,7 +986,7 @@
}
//杈撻�佺嚎娌℃湁鍏ュ簱浠诲姟锛岃繃婊�2
- if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) == null) {
+ if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) != null) {
return;
}
News.info("鍫嗗灈鏈哄彫鍥炲師鐐�==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満鏈夊叆搴撲换鍔�,鍙洖鍘熺偣");
@@ -989,9 +996,9 @@
crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.X_MOVE); // 浠诲姟妯″紡: 鍥炲師鐐�
- crnCommand.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosX((short) x); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY((short) 121); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
+ crnCommand.setSourcePosZ((short) 2); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
@@ -1002,6 +1009,13 @@
}
} else {
int y = 1; // 榛樿鍒�
+ int x=1;
+ switch (crnProtocol.getCrnNo()){
+ case 1: x =1; break;
+ case 2: x =3; break;
+ case 3: x =5; break;
+ case 4: x =7; break;
+ }
int staNoInt = Integer.parseInt(staNo);
int z = staNoInt / 100; // 灞�
@@ -1025,10 +1039,6 @@
return;
}
- // 杈撻�佺嚎娌℃湁鍏ュ簱浠诲姟
- if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) == null) {
- return;
- }
News.info("鍫嗗灈鏈哄彫鍥炲師鐐�==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満鏈夊叆搴撲换鍔�,鍙洖鍘熺偣");
// 鍛戒护涓嬪彂
@@ -1037,7 +1047,7 @@
crnCommand.setTaskNo((short) 9999);
crnCommand.setAckFinish((short) 0);
crnCommand.setTaskMode(CrnTaskModeType.X_MOVE);
- crnCommand.setSourcePosX((short) 1); // 榛樿鎺掑缁堜负1
+ crnCommand.setSourcePosX((short) x); // 榛樿鎺掑缁堜负1
crnCommand.setSourcePosY((short) y); // 鍔ㄦ�佸垪
crnCommand.setSourcePosZ((short) z); // 鍔ㄦ�佸眰
crnCommand.setDestinationPosX((short) 0);
--
Gitblit v1.9.1