From 7c7a75e9506f6b2bb3cb6718abf909e8acb6da3c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 14 九月 2024 14:09:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
src/main/resources/application.yml | 6 +++---
src/main/java/com/zy/asrs/utils/SteAndJarUtil.java | 4 ++--
3 files changed, 8 insertions(+), 8 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 3e6cddc..58306c8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4015,7 +4015,7 @@
} else {
staProtocol = staProtocol.clone();
}
- if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==607 && staProtocol.getWorkNo()==0
+ if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==0 && staProtocol.getWorkNo()==0
&& staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isInEnable()){
String barcode = staProtocol.getBarcode();
if (!Cools.isEmpty(barcode)) {
@@ -4027,7 +4027,7 @@
continue;
}
try {
- BasDevp basDevp = basDevpService.selectById(staProtocol.getStaNo());
+ BasDevp basDevp = basDevpService.selectById(emptyInSta.getStaNo());
if (basDevp.getReportSign()==0){
WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
if (!Cools.isEmpty(wrkMast)){
@@ -8567,7 +8567,7 @@
return;
}
if (staProtocol607.getWorkNo()==0 && staProtocol607.isLoading() && staProtocol607.isAutoing()
- && staProtocol607.getStaNo() == 607 && staProtocol607.isInEnable()){
+ && staProtocol607.getStaNo() == 0 && staProtocol607.isInEnable()){
WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
if (!Cools.isEmpty(wrkMast)){
staProtocol607.setWorkNo(wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
index 87a3ea6..68d186f 100644
--- a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
+++ b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
@@ -73,11 +73,11 @@
case 1:
case 2:
case 5:
- return 2;
+ return 5;
case 3:
case 4:
case 6:
- return 4;
+ return 6;
}
return 0;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d2ad40e..7b0aade 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -752,11 +752,11 @@
ip: 10.10.10.222
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 281,292
+ staArr: 281
# LED4 瀵嗙偧鍖�
led[3]:
- id: 1
+ id: 4
ip: 10.10.10.223
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 453
\ No newline at end of file
+ staArr: 460
\ No newline at end of file
--
Gitblit v1.9.1