From 8003a29d3f510adfa971ea6ebd23af1ccd7316c1 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 05 三月 2024 15:37:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 8 --------
src/main/java/com/zy/common/service/AgvCommonService.java | 8 ++++----
src/main/java/com/zy/asrs/controller/AgvMapController.java | 2 +-
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index 12caa0b..b1f74bf 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -65,7 +65,7 @@
int y = row;
////1妤�
//if(floor == 1){
- x = generateMap1Row(row);
+ // x = generateMap1Row(row);
// y = generateMap1Bay(bay);
//}
////3妤�
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 8d5d43a..0134534 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -159,14 +159,6 @@
if(code == 0){
for(AgvWrkMast agvWrkMast : agvWrkMastList){
- //涓嬪彂瀹瑰櫒杈惧埌閫氱煡 锛堣緭閫佺嚎锛�
- if("Y".equals(agvWrkMast.getMk())){
- int containerArrivedCode = agvWrkMastService.containerArrived(agvWrkMast);
- if(containerArrivedCode != 0){
- log.error("瀹瑰櫒鍒拌揪鎸囦护涓嬪彂澶辫触");
- continue;
- }
- }
//202.RCS鍙栬揣涓�
agvWrkMast.setWrkSts(202L);
agvWrkMastService.updateById(agvWrkMast);
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 8684a32..dcf9a62 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -75,11 +75,11 @@
// 鐩爣搴撲綅
AgvLocMast locMast = null;
if(Cools.isEmpty(agvWaitPakinList)){
- return getLocNoRule(floor);
+ return getLocNoRule(floor); // 1. 闅忔満搴撲綅
}
//搴撲綅瑙勫垯
- locMast = getLocByLocRule(agvWaitPakinList.get(0),floor);
+ locMast = getLocByLocRule(agvWaitPakinList.get(0),floor); // 2. 鎸夊簱浣嶈鍒欐悳绱�
if(!Cools.isEmpty(locMast)){
return locMast;
}
@@ -157,7 +157,7 @@
搴撲綅瑙勫垯鏌ユ壘
*/
private AgvLocMast getLocByLocCodeRule(AgvWaitPakin agvWaitPakin, int floor) {
- if(Cools.isEmpty(agvWaitPakin.getBrand())){
+ /*if(Cools.isEmpty(agvWaitPakin.getBrand())){
return null;
}
@@ -179,7 +179,7 @@
if(!Cools.isEmpty(agvLocMast)){
return agvLocMast;
}
- }
+ }*/
return null;
}
--
Gitblit v1.9.1