From 61379ba6c25f5ad7a26da0bf2a77a0724ee13eff Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期一, 15 一月 2024 12:24:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/DevpSlave.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
src/main/java/com/zy/core/MainProcess.java | 2 +-
src/main/resources/application.yml | 11 ++++++++++-
4 files changed, 16 insertions(+), 6 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 9530193..6732cd6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -291,7 +291,7 @@
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
- for (DevpSlave.Sta inSta : devp.getInSta()) {
+ for (DevpSlave.Sta inSta : devp.getInWmsSta()) {
// 鑾峰彇鍏ュ簱绔欎俊鎭�
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
@@ -302,9 +302,9 @@
}
// // 鍏ュ嚭搴撴ā寮忓垽鏂�
- if (inSta.getStaNo() == 203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) {
- continue;
- }
+// if (inSta.getStaNo() == 203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) {
+// continue;
+// }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 0480680..491999c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -55,7 +55,7 @@
mainService.generateStoreWrkFile(); // 缁勬墭
// 鍏ュ簱 ===>> 鐮佸灈浣嶈幏鍙栫┖鏉挎潯鐮佷俊鎭�
mainService.generateStoreWrkFileFull2LouM(); // 缁勬墭
-// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+ mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick();
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃�
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index 2859b73..1acdd98 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -21,6 +21,7 @@
private List<Sta> inSta = new ArrayList<>();
private List<Sta> driveSta = new ArrayList<>();
+ private List<Sta> inWmsSta = new ArrayList<>();
private List<Sta> emptyInSta = new ArrayList<>();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 11c7ed9..da9970c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -43,7 +43,7 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
@@ -342,6 +342,12 @@
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 122
+ # WMS鍏ュ簱鍙�1
+ inWmsSta[0]:
+ staNo: 118
+ # WMS鍏ュ簱鍙�1
+ inWmsSta[1]:
+ staNo: 119
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 122
@@ -415,6 +421,9 @@
inSta[1]:
staNo: 221
barcode: ${wcs-slave.barcode[1].id}
+ # WMS鍏ュ簱鍙�1
+ inWmsSta[0]:
+ staNo: 212
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 212
--
Gitblit v1.9.1