From bf8d30e9c4de90148ac2bd64d5f9f239a60901ca Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 16 一月 2021 10:19:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 2 +-
src/main/resources/application.yml | 29 ++++++++++++++++++++---------
3 files changed, 22 insertions(+), 11 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 96240c5..03c2e1b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -873,7 +873,7 @@
}
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
- && staProtocol.isEmptyMk() && staProtocol.getWorkNo() == 0 && staProtocol.isPakMk()) {
+ && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999) && staProtocol.isPakMk()) {
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
StartupDto startupDto = commonService.getLocNo(1, 10, emptyInSta.getStaNo(), null, locTypeDto, 0);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index c98c438..38fc00d 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -152,7 +152,7 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").gt("row1", sRow).lt("row1", eRow));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 61d34df..7de841f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -126,17 +126,33 @@
slot: 1
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 1
+ staNo: 205
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 202
barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 1
+ staNo: 205
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 205
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 2
+ staNo: 200
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 203
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 103
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 3
+ staNo: 127
+ # 鎷ｆ枡鍏ュ簱鍙�
+ pickSta[1]:
+ staNo: 128
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
@@ -146,11 +162,6 @@
barcode[1]:
id: 2
ip: 192.168.6.151
- port: 51236
- # 鍙拌溅
- car[0]:
- id: 1
- ip: 192.168.10.150
port: 51236
# LED1
led[0]:
--
Gitblit v1.9.1