From 94707ed9664f7c9d60cb3dc4b88e04a76cc8ea19 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 08 六月 2025 17:04:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 3 +++
src/main/resources/application.yml | 22 +++++++++++++++-------
3 files changed, 22 insertions(+), 7 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 573943d..5787dcb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -509,9 +509,13 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", wrkMast.getSourceLocNo()));
+
// 涓嬪彂绔欑偣淇℃伅
staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ staProtocol.setPalletSize(locMast.getLocType2());
if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
continue;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 23570a9..0dec0b6 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -245,6 +245,9 @@
staProtocol.setWeightError(statusError[5]); // 瓒呴噸鎶ヨ
staProtocol.setBarcodeError(statusError[6]); // 鎵爜鎶ヨ
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ }
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 55135ea..3e59121 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,7 +42,15 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 31,34
+ doubleLocs: 3,4,7,10,11,14,15,18,19,22,23,26
+ # 宸︽繁搴撲綅鎺掑彿
+ doubleLocsLeft: 4,7,11,15,19,23
+ # 鍙虫繁搴撲綅鎺掑彿
+ doubleLocsRight: 3,7,10,14,18,22,26
+ # 宸︽祬搴撲綅鎺掑彿
+ shallowLocsLeft: 5,8,12,16,20,24
+ # 鍙虫祬搴撲綅鎺掑彿
+ shallowLocsRight: 2,6,9,13,17,21,25
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
@@ -138,14 +146,14 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1036
- row: 2
+ row: 16
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1039
- row: 3
+ row: 17
bay: 1
lev: 1
# 鍫嗗灈鏈�5
@@ -162,14 +170,14 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1042
- row: 6
+ row: 20
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1045
- row: 7
+ row: 21
bay: 1
lev: 1
# 鍫嗗灈鏈�6
@@ -186,14 +194,14 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1049
- row: 2
+ row: 24
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1052
- row: 3
+ row: 25
bay: 1
lev: 1
# 杈撻�佺嚎1
--
Gitblit v1.9.1