From beefbed078b351ef097614c3b6961be78eeb7444 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 21 四月 2025 15:16:11 +0800
Subject: [PATCH] 12
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 ++++++++-------
src/main/resources/application.yml | 5 +++++
2 files changed, 13 insertions(+), 7 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 5d4deae..bbe1927 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -300,10 +300,6 @@
staProtocol = staProtocol.clone();
}
-// // 鍏ュ嚭搴撴ā寮忓垽鏂�
- if (inSta.getStaNo() == 203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) {
- continue;
- }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (!staProtocol.isLoading()) {
@@ -705,7 +701,11 @@
}
// 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14澶辫触
- wrkMast.setWrkSts(14L);
+ if(crnStn.getStaNo()==1035){
+ wrkMast.setWrkSts(107L);
+ }else {
+ wrkMast.setWrkSts(14L);
+ }
wrkMast.setCrnEndTime(new Date());
if (wrkMastMapper.updateById(wrkMast) != 0) {
// 澶嶄綅鍫嗗灈鏈�
@@ -1061,8 +1061,9 @@
if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
) {
if (slave.getId() == 1 || slave.getId() == 2) {
- if (staProtocol.isLoading() || staProtocol.getWorkNo() != 0 || !staProtocol.isOutEnable()) {
- continue;
+ if (staProtocol.isLoading() || staProtocol.getWorkNo() != 0 ) {
+ //if (staProtocol.isLoading() || staProtocol.getWorkNo() != 0 || !staProtocol.isOutEnable()) {
+ continue;
}
}
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 20f081e..dd1c3b5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -158,6 +158,9 @@
barcode: ${wcs-slave.barcode[0].id}
backSta: 1123
led: ${wcs-slave.led[3].id}
+ # 鍏ュ簱鍙�1
+ inSta[4]:
+ staNo: 1131
outSta[0]:
staNo: 1111
@@ -171,6 +174,8 @@
outSta[3]:
staNo: 1123
led: ${wcs-slave.led[3].id}
+ outSta[4]:
+ staNo: 1135
# 鏉＄爜鎵弿浠�1
--
Gitblit v1.9.1