From dcaa739b0c28e0ea4628a4d08e0683001ced273a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 10 十一月 2023 18:16:05 +0800
Subject: [PATCH] agv物料混载更改 新增根据物料频率查找库位
---
src/main/java/com/zy/common/service/AgvCommonService.java | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 9b2e5f1..8684a32 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -74,21 +74,21 @@
public AgvLocMast getLocNo(List<AgvWaitPakin> agvWaitPakinList, int floor) {
// 鐩爣搴撲綅
AgvLocMast locMast = null;
-
- //搴撲綅瑙勫垯
- if(!Cools.isEmpty(agvWaitPakinList)){
- locMast = getLocByLocRule(agvWaitPakinList.get(0),floor);
- if(!Cools.isEmpty(locMast)){
- return locMast;
- }
+ if(Cools.isEmpty(agvWaitPakinList)){
+ return getLocNoRule(floor);
}
+ //搴撲綅瑙勫垯
+ locMast = getLocByLocRule(agvWaitPakinList.get(0),floor);
+ if(!Cools.isEmpty(locMast)){
+ return locMast;
+ }
+
+
//搴撲綅缂栫爜瑙勫垯
- if(!Cools.isEmpty(agvWaitPakinList)){
- locMast = getLocByLocCodeRule(agvWaitPakinList.get(0),floor);
- if(!Cools.isEmpty(locMast)){
- return locMast;
- }
+ locMast = getLocByLocCodeRule(agvWaitPakinList.get(0),floor);
+ if(!Cools.isEmpty(locMast)){
+ return locMast;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
@@ -100,21 +100,15 @@
//鏍规嵁鐗╂枡棰戠巼鎼滅储搴撲綅锛岄鐜囬珮鍒欐悳绱㈢缂撳瓨璐ф灦鏈�杩戝簱浣嶏紝棰戠巼浣庡垯鎼滅储鏈�杩滃簱浣�
Mat mat = matService.selectByMatnr(agvWaitPakinList.get(0).getMatnr());
- if(true){
-
- }else {
-
+ if(Cools.isEmpty(mat.getBeBatch())){
+ mat.setBeBatch(0);
+ }
+ locMast = getLocByFre(mat.getBeBatch(), floor);
+ if (locMast != null) {
+ return locMast;
}
-//
-// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
-// locMast = getLocNoStep4(staDescId, locTypeDto);
-// if (locMast != null) {
-// //鎵惧埌搴撲綅锛岃繑鍥瀌to
-// return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
-// }
-//
-// // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
locMast = getLocNoRule(floor);
if (locMast != null) {
--
Gitblit v1.9.1