From 94ebec210cd402267366c2241a7be3ef4601f67e Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期日, 19 五月 2024 15:28:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 24 ++++++++++++++++--------
src/main/resources/application.yml | 20 ++++++++++----------
2 files changed, 26 insertions(+), 18 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 2008ae6..8d43987 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2152,17 +2152,19 @@
// && staProtocol.isEmptyMk()
&& staProtocol.getWorkNo() == 0
) {
- WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(sta.getStaNo());
+ Integer staNo = sta.getStaNo();
+ switch (staProtocol.getSiteId()){
+ case 4007:
+ staNo = 4002;break;
+ case 4016:
+ staNo = 4011;break;
+ }
+ WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(staNo);
if (null != pakoutEmpty) {
return;
}
- switch (staProtocol.getSiteId()){
- case 4007:
- sta.setStaNo(4002);break;
- case 4016:
- sta.setStaNo(4011);break;
- }
- List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("stn_no", sta.getStaNo()));
+
+ List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("stn_no", staNo));
for (StaDesc staDesc: staDescs){
BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", staDesc.getCrnNo()));
if (!basCrnp.getCrnSts().equals(3) || basCrnp.getCrnErr() != 0){
@@ -2567,6 +2569,9 @@
} else if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && (staProtocol.getWorkNo()>=9900 || staProtocol.getWorkNo()==0)) {
+ if (rgvSlave.getId() != 2 ){
+ continue;
+ }
workNo1 = workNo++;
souSta1 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getSourceStaNo());
if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 1){
@@ -2627,6 +2632,9 @@
devpThread.setPakMk(inStn.getSourceStaNo(),false);
break;
} else if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && (staProtocol.getWorkNo()>=9900 || staProtocol.getWorkNo()==0)) {
+ if (rgvSlave.getId() != 2 ){
+ continue;
+ }
workNo2 = workNo++;
souSta2 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getSourceStaNo());
if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 1){
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1e609c4..01e505b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,7 +34,7 @@
enable: false
wms:
- url: localhost:8080/mdqdwms
+ url: localhost:8088/mdqdwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -47,7 +47,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.200
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
@@ -85,7 +85,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.201
+ ip: 10.10.10.110
port: 102
rack: 0
slot: 0
@@ -147,7 +147,7 @@
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.111
+ ip: 10.10.10.1
port: 102
rack: 0
slot: 0
@@ -249,7 +249,7 @@
port: 102
rack: 0
slot: 0
- emptyInSta[0]:
+ autoEmptyOut[0]:
staNo: 4007
# 杈撻�佺嚎5
devp[4]:
@@ -258,7 +258,7 @@
port: 102
rack: 0
slot: 0
- emptyInSta[0]:
+ autoEmptyOut[0]:
staNo: 4016
# 杈撻�佺嚎5
devp[5]:
@@ -279,13 +279,13 @@
staNo: 3006
barcode: ${wcs-slave.barcode[3].id}
backSta: 3007
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[4].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 3011
barcode: ${wcs-slave.barcode[4].id}
backSta: 3012
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[5].id}
# # RGV1
rgv[0]:
@@ -433,12 +433,12 @@
id: 5
ip: 10.10.10.206
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[6].id}
staArr: 3007
# LED6
led[5]:
id: 6
ip: 10.10.10.206
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[6].id}
staArr: 3012
\ No newline at end of file
--
Gitblit v1.9.1