From 0dd8ea62972ac8e662e784672714d836487d4dd4 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 06 十二月 2022 14:00:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 38 ------------
src/main/resources/application.yml | 111 ++++++++++++++++++------------------
2 files changed, 56 insertions(+), 93 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 d2a362f..86e9aab 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1956,7 +1956,6 @@
}
}
-
public synchronized void autoEmptyOut() {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
Integer autoOutSite = 12;
@@ -1996,41 +1995,4 @@
}
}
- public synchronized void autoEmptyIn() {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- Integer autoInSite = 12;
- StaProtocol staProtocol = devpThread.getStation().get(autoInSite);
- if (staProtocol == null) {
- return;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing() //鑷姩
- && staProtocol.isLoading() //鏈夌墿
- && staProtocol.isInEnable() //鍙叆淇″彿
- && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990) //宸ヤ綔鍙蜂负0鎴栬�呭伐浣滃彿鏄�9991~9999锛堣緭閫佹満鐣欑敤锛�
- ) {
-
- try {
- LocTypeDto locTypeDto = new LocTypeDto((short) 1, (short) 1, (short) 1);
-
-
- String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/auto/emptyIn/v1")
- .setJson(JSON.toJSONString(locTypeDto))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- log.info((String) jsonObject.get("msg"));
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/auto/emptyIn/v1", JSON.toJSONString(locTypeDto), response);
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
- }
- }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 85b7913..e41b989 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -60,26 +60,12 @@
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
- bay: 1
+ bay: 2
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 112
- row: 2
- bay: 55
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
row: 2
bay: 55
lev: 1
@@ -90,13 +76,6 @@
row: 2
bay: 55
lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 200
- row: 2
- bay: 55
- lev: 4
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[3]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -104,10 +83,31 @@
row: 2
bay: 55
lev: 7
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 102
+ row: 2
+ bay: 2
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 112
+ row: 2
+ bay: 55
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 2
+ bay: 55
+ lev: 4
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[3]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 300
+ staNo: 302
row: 2
bay: 55
lev: 7
@@ -126,26 +126,12 @@
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 106
row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
- bay: 1
+ bay: 2
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 116
- row: 7
- bay: 55
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
row: 7
bay: 55
lev: 1
@@ -156,24 +142,38 @@
row: 7
bay: 55
lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 7
- bay: 55
- lev: 4
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�4
crnInStn[3]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 305
row: 7
bay: 55
lev: 7
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 106
+ row: 7
+ bay: 2
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 116
+ row: 7
+ bay: 55
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 205
+ row: 7
+ bay: 55
+ lev: 4
# 鍫嗗灈鏈哄嚭搴撶珯鐐�3
crnOutStn[3]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 303
+ staNo: 305
row: 7
bay: 55
lev: 7
@@ -191,30 +191,30 @@
# 鍏ュ簱鍙�2
inSta[1]:
staNo: 111
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[1].id}
# 鍏ュ簱鍙�3
inSta[2]:
staNo: 104
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[2].id}
# 鍏ュ簱鍙�4
inSta[3]:
staNo: 114
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[3].id}
# 鍏ュ簱鍙�5
inSta[4]:
- staNo: 200
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 201
+ barcode: ${wcs-slave.barcode[].id}
# 鍏ュ簱鍙�6
inSta[5]:
- staNo: 203
+ staNo: 204
barcode: ${wcs-slave.barcode[0].id}
# 鍏ュ簱鍙�7
inSta[6]:
- staNo: 300
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
# 鍏ュ簱鍙�8
inSta[7]:
- staNo: 303
+ staNo: 304
barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
@@ -240,6 +240,7 @@
# 绌烘澘鍏ュ簱鍙�8
emptyInSta[7]:
staNo: 303
+
# 鍑哄簱鍙�1
outSta[0]:
staNo: 100
--
Gitblit v1.9.1