From 96c02a0f71f1f42db5f235bc380103bb667ba30a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 十二月 2024 15:53:05 +0800
Subject: [PATCH] wcs调试修改
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 38 ++++++++++--
src/main/resources/application.yml | 95 +++++++++++++++++++++++++++++++
2 files changed, 125 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 5a82ad9..f2e9c42 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -270,7 +270,7 @@
param.setLocType1(locTypeDto.getLocType1());
if (inSta.getStaNo() == 102) {
param.setLocType2((short) 3);
- } else if (inSta.getStaNo() == 211) {
+ } else if (inSta.getStaNo() == 211 || inSta.getStaNo() == 104) {
param.setLocType1((short) 5);
param.setLocType2((short) 4);
} else if (inSta.getStaNo() == 201) {
@@ -418,10 +418,20 @@
staProtocol = staProtocol.clone();
}
- if (barcodeThread == null) {
+ String barcode = "";
+ if (barcodeThread == null && staProtocol.getSiteId() != 104) {
continue;
+ } else if (staProtocol.getSiteId() == 104) {
+ if (staProtocol.getWorkNo() == 9996) {
+ // 鑾峰彇鍒版嫞鏂欎换鍔＄殑鎵樼洏鐮�
+ WrkMast wrkMast = wrkMastMapper.selectOne(new QueryWrapper<WrkMast>().eq("wrk_sts", 14).eq("io_type", 103).eq("source_sta_no", 104));
+ if (wrkMast != null) {
+ barcode = wrkMast.getBarcode();
+ }
+ }
+ } else {
+ barcode = barcodeThread.getBarcode();
}
- String barcode = barcodeThread.getBarcode();
// 灏哄妫�娴嬪紓甯�
boolean back = false;
String errMsg = "";
@@ -910,6 +920,9 @@
crnCommand.setDestinationPosXTwo(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosYTwo(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZTwo(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
+ if (crnStn.getStaNo() == 202) {
+ crnCommand.setSourcePosYTwo((short) 6); // 婧愬簱浣嶅垪
+ }
} else {
if (workMode == 1) {
crnCommand.setTaskMode(CrnTaskModeType.PAKIN);
@@ -922,6 +935,9 @@
crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
+ if (workMode == 1 && crnStn.getStaNo() == 202) {
+ crnCommand.setSourcePosY((short) 6); // 婧愬簱浣嶅垪
+ }
}
// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
@@ -1088,6 +1104,9 @@
crnCommand.setDestinationPosXTwo(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosYTwo(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZTwo(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
+ if (crnStn.getStaNo() == 202) {
+ crnCommand.setDestinationPosYTwo((short) 6); // 婧愬簱浣嶅垪
+ }
} else {
if (workMode == 1) {
crnCommand.setTaskMode(CrnTaskModeType.PAKIN);
@@ -1100,6 +1119,9 @@
crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
+ if (workMode == 1 && crnStn.getStaNo() == 202) {
+ crnCommand.setDestinationPosY((short) 6); // 婧愬簱浣嶅垪
+ }
}
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
@@ -1540,10 +1562,10 @@
staProtocol = staProtocol.clone();
}
- if (barcodeThread == null) {
- continue;
- }
- String barcode = barcodeThread.getBarcode();
+// if (barcodeThread == null) {
+// continue;
+// }
+// String barcode = barcodeThread.getBarcode();
// 灏哄妫�娴嬪紓甯�
boolean back = false;
String errMsg = "";
@@ -1618,7 +1640,7 @@
param.setLocType1(locTypeDto.getLocType1());
if (emptyInSta.getStaNo() == 102) {
param.setLocType2((short) 3);
- } else if (emptyInSta.getStaNo() == 211) {
+ } else if (emptyInSta.getStaNo() == 211 || emptyInSta.getStaNo() == 104) {
param.setLocType1((short) 5);
param.setLocType2((short) 4);
} else if (emptyInSta.getStaNo() == 201) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9cc07b5..739a37e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -62,11 +62,53 @@
row: 4
bay: 2
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 3
+ bay: 7
+ lev: 10
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 212
+ row: 3
+ bay: 2
+ lev: 10
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�4
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 104
+ row: 1
+ bay: 2
+ lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 103
row: 4
+ bay: 2
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 3
+ bay: 7
+ lev: 10
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 212
+ row: 3
+ bay: 2
+ lev: 10
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�4
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 104
+ row: 1
bay: 2
lev: 1
# 杈撻�佺嚎1
@@ -82,22 +124,75 @@
barcode: ${wcs-slave.barcode[0].id}
backSta: 101
led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 210
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 102
barcode: ${wcs-slave.barcode[0].id}
backSta: 101
led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 210
+ led: ${wcs-slave.led[2].id}
+ # 绌烘澘鍏ュ簱鍙�4
+ emptyInSta[3]:
+ staNo: 104
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 102
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[0].id}
backSta: 101
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 200
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ backSta: 210
+ # 鎷ｆ枡鍏ュ簱鍙�4
+ pickSta[3]:
+ staNo: 104
# 鍑哄簱鍙�1
outSta[0]:
staNo: 101
led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 200
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 210
+ led: ${wcs-slave.led[2].id}
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 104
# 杈撻�佺嚎2
# devp[1]:
# id: 2
--
Gitblit v1.9.1