From 265483cb46b5e951e3f6f9b6ed4ecdc94e6b371d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 16:29:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/common/service/AgvCommonService.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 605d373..426221c 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -111,14 +111,18 @@
// }
- // 寮�濮嬫煡鎵惧簱浣� ==============================>>
- locMast = getLocNoRule(type,floor);
- if (locMast != null) {
- return locMast;
+ try{
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+ locMast = getLocNoRule(type,floor);
+ if (locMast != null) {
+ return locMast;
+ }
+ }catch (Exception e){
+ throw new CoolException("妤煎眰鍙凤細"+floor+"锛涜妤煎眰娌℃湁绌哄簱浣�===>"+e.getMessage());
}
//鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
- throw new CoolException("璇ユゼ灞傛病鏈夌┖搴撲綅");
+ throw new CoolException("妤煎眰鍙凤細"+floor+"锛涜妤煎眰娌℃湁绌哄簱浣�");
}
/*
@@ -230,10 +234,21 @@
//闅忔満鍙栦竴涓揣浣�
private AgvLocMast getLocNoRule(int type,int floor){
- return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
- .eq("loc_sts","O")
- .eq("floor",floor)
- .eq("loc_type1",type));
+ try{
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>()
+ .eq("loc_sts", "O")
+ .eq("floor", floor)
+ .eq("loc_type1", type));
+ for (AgvLocMast agvLocMast : agvLocMasts){
+ AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
+ if (agvLocMast1.getLocSts().equals("O")){
+ return agvLocMast1;
+ }
+ }
+ throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�");
+ }catch (Exception e){
+ throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�");
+ }
}
/**
* 妫�绱㈠簱浣嶅彿
@@ -250,7 +265,7 @@
}
//鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
- throw new CoolException("璇ユゼ灞傛病鏈夌┖鎺ラ┏浣�");
+ throw new CoolException("妤煎眰鍙凤細"+floor+"锛涜妤煎眰娌℃湁绌烘帴椹充綅");
}
/**
@@ -268,7 +283,7 @@
}
//鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
- throw new CoolException("璇ユゼ灞傛病鏈夌┖鎺ラ┏浣�");
+ throw new CoolException("妤煎眰鍙凤細"+floor+"锛涜妤煎眰娌℃湁绌烘帴椹充綅");
}
//闅忔満鍙栦竴涓揣浣�
--
Gitblit v1.9.1