From e72f4946b1696a570022d6ae715fa07656ab89f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 九月 2023 13:07:43 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/common/service/AgvCommonService.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 579de34..1f21122 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -27,6 +27,8 @@
private AgvLocRuleService agvLocRuleService;
@Autowired
private AgvLocMastService agvLocMastService;
+ @Autowired
+ private MatService matService;
public int getWorkNo(Integer wrkMk) {
AgvWrkLastno wrkLastno = agvWrkLastnoService.selectById(wrkMk);
@@ -85,6 +87,15 @@
//鎵惧埌搴撲綅锛岃繑鍥瀌to
//return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
}
+
+ //鏍规嵁鐗╂枡棰戠巼鎼滅储搴撲綅锛岄鐜囬珮鍒欐悳绱㈢缂撳瓨璐ф灦鏈�杩戝簱浣嶏紝棰戠巼浣庡垯鎼滅储鏈�杩滃簱浣�
+ Mat mat = matService.selectByMatnr(agvWaitPakinList.get(0).getMatnr());
+ if(true){
+
+ }else {
+
+ }
+
//
// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
// locMast = getLocNoStep4(staDescId, locTypeDto);
@@ -141,12 +152,45 @@
/*
闈犺繎鎽嗘斁瑙勫垯
*/
-
private AgvLocMast getLocByProximityRule(){
//to do
return null;
}
+ /*
+ 鏍规嵁鐗╂枡棰戠巼鏌ユ壘
+ */
+ private AgvLocMast getLocByFre(int fre, int floor){
+ if(floor == 1){
+ if(fre == 1){
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("bay1",false));
+ }else{
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("bay1"));
+ }
+ }
+ if(floor == 3){
+ if(fre == 1){
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("row1",false));
+ }else{
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("row1"));
+ }
+ }
+
+ throw new CoolException("鎼滅储搴撲綅鏃讹紝妤煎眰鍑洪敊銆�");
+ }
+
//闅忔満鍙栦竴涓揣浣�
private AgvLocMast getLocNoRule(int floor){
return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
--
Gitblit v1.9.1