From f055f21676aa745087ecc0a21f4ade980d98e8bc Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期五, 21 六月 2024 09:09:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 d595267..4145a99 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2035,10 +2035,13 @@
*/
public synchronized void crnStnToLoc1Big(CrnSlave slave, CrnProtocol crnProtocol, Integer crnStation) {
List<WrkMast> wrkMasts = wrkMastMapper.selectPakInStep12(slave.getId());
+ Integer crnStation1 = crnStation;//璁板綍
for(WrkMast wrkMast : wrkMasts){
if (wrkMast == null) {
continue;
}
+
+ crnStation=crnStation1;//鍒锋柊
CrnSlave.CrnStn crnStn = null;
for (CrnSlave.CrnStn crnStn1 : slave.getCrnInStn()){
@@ -2102,6 +2105,10 @@
}
}else {
break;
+ }
+
+ if (locMast.getBay1()==81){
+ crnStation=2;
}
@@ -2925,10 +2932,13 @@
*/
public synchronized void locToCrnStn1Big(CrnSlave slave, CrnProtocol crnProtocol, Integer crnStation) {
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
+ Integer crnStation1 = crnStation;
for (WrkMast wrkMast : wrkMasts) {
if (wrkMast == null) {
continue;
}
+
+ crnStation = crnStation1;
CrnSlave.CrnStn crnStn = null;
for (CrnSlave.CrnStn crnStn1 : slave.getCrnOutStn()){
@@ -3010,6 +3020,10 @@
break;
}
+ if (sourceSta.getBay1().shortValue()==81){
+ crnStation = 2;
+ }
+
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
--
Gitblit v1.9.1