From 980855d829cf30c7260aeb3bb0ebe867d9c068e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 27 二月 2024 14:07:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 10 +++++-----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1 +
2 files changed, 6 insertions(+), 5 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 bad524d..3aec3d9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2345,6 +2345,7 @@
wrkMastSta.setWrkSts(1);
try{
wrkMastStaMapper.updateById(wrkMastSta);
+ return;
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触");
}
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index b7af940..e769506 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -31,7 +31,7 @@
// 姝ｅ簭
public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE = new ArrayList<Integer>() {{
- add(161);add(157);add(153);add(149);add(124);add(119);add(113);add(999);;add(112);add(107);add(106);add(101);add(100);
+ add(161);add(157);add(153);add(149);add(124);add(119);add(113);add(999);add(112);add(107);add(106);add(101);add(100);
}};
// 鍙嶅簭
public static final List<Integer> TRACK_POSITION_REVERSE_SEQUENCE = new ArrayList<Integer>() {{
@@ -110,10 +110,10 @@
* 鑾峰彇鏈�杩滅珯鐐�
* */
public static Integer RouteIndexFarMas(Integer a,Integer b,Integer c,Integer d){
- int ia = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(a);
- int ib = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(b);
- int ic = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(c);
- int id = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(d);
+ int ia = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(a); //褰撳墠浣嶇疆
+ int ib = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(b); //鍦板浘寮�濮嬩綅缃�
+ int ic = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(c); //鍦板浘缁撴潫浣嶇疆
+ int id = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(d); //閿佺粨鏉熶綅缃�
if (id==0){
if (ia>ib){
if (ia>ic){
--
Gitblit v1.9.1