From a01af25e1b22558174014839581de144d683ad10 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 十二月 2023 21:00:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ----
src/main/java/com/zy/core/MainProcess.java | 4 ++--
src/main/resources/application.yml | 38 +++++++++++++++++++-------------------
3 files changed, 21 insertions(+), 25 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 990265b..2a99f8c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -409,10 +409,6 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
- if (pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339) {
- continue;
- }
-
// 鑾峰彇鎷ｆ枡鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 489211f..261ec36 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -52,8 +52,8 @@
mainService.initRealtimeBasMap();
// 鎷ｆ枡銆佸苟鏉垮啀鍏ュ簱
mainService.stnToCrnStnPick();
- // 鎷ｆ枡銆佸苟鏉垮啀鍏ュ簱(325銆�331銆�333銆�339)
- mainService.stnToCrnStnPick2();
+// // 鎷ｆ枡銆佸苟鏉垮啀鍏ュ簱(325銆�331銆�333銆�339)
+// mainService.stnToCrnStnPick2();
// 鐩樼偣鍐嶅叆搴�
mainService.stnToCrnStnPlate();
// 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b44805b..d18528f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -241,29 +241,29 @@
led: ${wcs-slave.led[11].id}
liftNo: ${wcs-slave.lift[2].id}
pickInSta[7]:
- staNo: 325
+ staNo: 341
backSta: 341
barcode: ${wcs-slave.barcode[7].id}
led: ${wcs-slave.led[7].id}
liftNo: ${wcs-slave.lift[1].id}
- pickInSta[8]:
- staNo: 331
- backSta: 341
- barcode: ${wcs-slave.barcode[7].id}
- led: ${wcs-slave.led[8].id}
- liftNo: ${wcs-slave.lift[1].id}
- pickInSta[9]:
- staNo: 333
- backSta: 341
- barcode: ${wcs-slave.barcode[7].id}
- led: ${wcs-slave.led[9].id}
- liftNo: ${wcs-slave.lift[1].id}
- pickInSta[10]:
- staNo: 339
- backSta: 341
- barcode: ${wcs-slave.barcode[7].id}
- led: ${wcs-slave.led[10].id}
- liftNo: ${wcs-slave.lift[1].id}
+# pickInSta[8]:
+# staNo: 331
+# backSta: 341
+# barcode: ${wcs-slave.barcode[7].id}
+# led: ${wcs-slave.led[8].id}
+# liftNo: ${wcs-slave.lift[1].id}
+# pickInSta[9]:
+# staNo: 333
+# backSta: 341
+# barcode: ${wcs-slave.barcode[7].id}
+# led: ${wcs-slave.led[9].id}
+# liftNo: ${wcs-slave.lift[1].id}
+# pickInSta[10]:
+# staNo: 339
+# backSta: 341
+# barcode: ${wcs-slave.barcode[7].id}
+# led: ${wcs-slave.led[10].id}
+# liftNo: ${wcs-slave.lift[1].id}
# # 璐ф灦鍏ュ簱绔欑偣
# rackInStn[0]:
# devpPlcId: ${wcs-slave.devp[0].id}
--
Gitblit v1.9.1