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 | 16 ++++++++--------
src/main/java/com/zy/core/MainProcess.java | 3 ++-
src/main/resources/application.yml | 17 ++---------------
3 files changed, 12 insertions(+), 24 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 da5d307..6f2226b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2277,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 {
@@ -2419,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 {
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 48f0782..cceb6ef 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -41,13 +41,14 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
- //浜屾湡
//绌烘《搴撲换鍔＄敓鎴�
mainService.crn5TaskCreate();
//绌烘《搴撳叆搴�
mainService.crn5InTask();
//绌烘《鍑哄簱瀹屾垚
mainService.crn5StnToOutStn();
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ mainService.storeFinished();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5731eb2..d84c831 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -52,7 +52,7 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 1
demo: false
# 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
@@ -61,13 +61,6 @@
row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1022
- row: 3
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -75,13 +68,7 @@
row: 3
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1016
- row: 2
- bay: 1
- lev: 2
+
# 杈撻�佺嚎1
devp[0]:
id: 1
--
Gitblit v1.9.1