From 076611c29cfbe624a5ee4d21c454785bc5c79021 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 18 五月 2024 08:13:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/AgvCommonService.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index b362b5b..d8e1dff 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -31,6 +31,8 @@
private MatService matService;
@Autowired
private LocRuleService locRuleService;
+ @Autowired
+ AgvBasDevpService agvBasDevpService;
public int getWorkNo(Integer wrkMk) {
AgvWrkLastno wrkLastno = agvWrkLastnoService.selectById(wrkMk);
@@ -71,7 +73,7 @@
* 妫�绱㈠簱浣嶅彿
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public AgvLocMast getLocNo(int type) {
+ public AgvLocMast getLocNo(int type, int floor) {
// 鐩爣搴撲綅
AgvLocMast locMast = null;
// if(Cools.isEmpty(agvWaitPakinList)){
@@ -110,7 +112,7 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
- locMast = getLocNoRule(type);
+ locMast = getLocNoRule(type,floor);
if (locMast != null) {
return locMast;
}
@@ -227,11 +229,37 @@
}
//闅忔満鍙栦竴涓揣浣�
- private AgvLocMast getLocNoRule(int type){
+ private AgvLocMast getLocNoRule(int type,int floor){
return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
.eq("loc_sts","O")
+ .eq("floor",floor)
.eq("loc_type1",type));
}
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ public AgvBasDevp getDevpNo(int type, int floor) {
+ // 鐩爣搴撲綅
+ AgvBasDevp basDevp = null;
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+ basDevp = getDevpNoRule(type,floor);
+ if (basDevp != null) {
+ return basDevp;
+ }
+
+ //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
+ throw new CoolException("璇ユゼ灞傛病鏈夌┖搴撲綅");
+ }
+
+ //闅忔満鍙栦竴涓揣浣�
+ private AgvBasDevp getDevpNoRule(int type,int floor){
+ return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>()
+ .eq("loc_sts","O")
+ .eq("floor",floor)
+ .eq("loc_type1",type)
+ .like("dev_no","DB"));
+ }
}
--
Gitblit v1.9.1