From 6062f023cf3d2230ff31aec2e2ac64c3f3e93ad9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 06 八月 2020 17:37:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/DevpSlave.java | 7 +++++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 ++++++++++++++-
src/main/java/com/zy/core/MainProcess.java | 3 ++-
src/main/resources/application.yml | 3 +++
4 files changed, 24 insertions(+), 4 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 1236cfc..c526129 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -60,7 +60,7 @@
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
- for (DevpSlave.InSta inSta : devp.getInSta()) {
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
// 鑾峰彇鏉＄爜
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
String barcode = barcodeThread.getBarcode();
@@ -146,4 +146,17 @@
}
+ /**
+ * 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+ */
+ public void stnToCrnStnPick(){
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
+ for (DevpSlave.Sta pickSta : devp.getPickSta()) {
+
+ }
+
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index dc8bcdb..680ac07 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -36,7 +36,8 @@
}
// 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵��2锛屾棤璁惧鍛戒护涓嬪彂
mainService.generateStoreWrkFile();
-
+ // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+ mainService.stnToCrnStnPick();
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index 6b0b563..dcbbe12 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -8,16 +8,19 @@
import java.util.List;
/**
+ * 杈撻�佺嚎閰嶇疆
* Created by vincent on 2020/8/6
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class DevpSlave extends Slave {
- private List<InSta> inSta = new ArrayList<>();
+ private List<Sta> inSta = new ArrayList<>();
+
+ private List<Sta> pickSta = new ArrayList<>();
@Data
- public static class InSta {
+ public static class Sta {
private Integer staNo;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 51a6c51..c102779 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -49,6 +49,9 @@
inSta[0]:
staNo: 2
barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�
+ pickSta[0]:
+ staNo: 2
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
--
Gitblit v1.9.1