From 23dad6ec6a8496feab15c2c95e8f9b6593c05ef7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 12 四月 2024 15:28:13 +0800
Subject: [PATCH] #SuperLoaded
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 184421c..fcef213 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1291,7 +1291,7 @@
continue;
}
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
- && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
+ && staDetl.getCanining() != null && staDetl.getCanining().equals("Y") && staDetl.getWrkNo().equals(wrkMast.getWrkNo())) {
flag = true;
}
if (!flag) {
@@ -3936,7 +3936,7 @@
continue;
}
if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
- if (basDevp.getEmptyMk().equals("Y")){
+ if (!basDevp.getEmptyMk().equals("Y")){
continue;
}
}
@@ -4397,6 +4397,7 @@
//鏇存柊褰撳墠灏忚溅閿�
try{
Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getNowRoute(), staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//鑾峰彇鏈�杩滅珯鐐�
+// Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(staEnd, staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//鑾峰彇鏈�杩滅珯鐐�
Integer fallMerge = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getRgvNo(), farCurrentStaNo); //鑾峰彇鍚堝苟骞叉秹椤�
basRgvMapCurrent.setLockEndRoute(fallMerge);
basRgvMapMapper.updateById(basRgvMapCurrent);
--
Gitblit v1.9.1