From 3673ce1c7b25f861ae91d41ce3e5cbbb96811276 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:43 +0800
Subject: [PATCH] #入库
---
src/main/java/com/zy/common/service/AgvCommonService.java | 73 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index dcf9a62..8c7f9f1 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -71,46 +71,46 @@
* 妫�绱㈠簱浣嶅彿
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public AgvLocMast getLocNo(List<AgvWaitPakin> agvWaitPakinList, int floor) {
+ public AgvLocMast getLocNo(int type) {
// 鐩爣搴撲綅
AgvLocMast locMast = null;
- if(Cools.isEmpty(agvWaitPakinList)){
- return getLocNoRule(floor); // 1. 闅忔満搴撲綅
- }
+// if(Cools.isEmpty(agvWaitPakinList)){
+// return getLocNoRule(type); // 1. 闅忔満搴撲綅
+// }
- //搴撲綅瑙勫垯
- locMast = getLocByLocRule(agvWaitPakinList.get(0),floor); // 2. 鎸夊簱浣嶈鍒欐悳绱�
- if(!Cools.isEmpty(locMast)){
- return locMast;
- }
-
-
- //搴撲綅缂栫爜瑙勫垯
- locMast = getLocByLocCodeRule(agvWaitPakinList.get(0),floor);
- if(!Cools.isEmpty(locMast)){
- return locMast;
- }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
- locMast = getLocByProximityRule();
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- //return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- //鏍规嵁鐗╂枡棰戠巼鎼滅储搴撲綅锛岄鐜囬珮鍒欐悳绱㈢缂撳瓨璐ф灦鏈�杩戝簱浣嶏紝棰戠巼浣庡垯鎼滅储鏈�杩滃簱浣�
- Mat mat = matService.selectByMatnr(agvWaitPakinList.get(0).getMatnr());
- if(Cools.isEmpty(mat.getBeBatch())){
- mat.setBeBatch(0);
- }
- locMast = getLocByFre(mat.getBeBatch(), floor);
- if (locMast != null) {
- return locMast;
- }
+// //搴撲綅瑙勫垯
+// locMast = getLocByLocRule(agvWaitPakinList.get(0),floor); // 2. 鎸夊簱浣嶈鍒欐悳绱�
+// if(!Cools.isEmpty(locMast)){
+// return locMast;
+// }
+//
+//
+// //搴撲綅缂栫爜瑙勫垯
+// locMast = getLocByLocCodeRule(agvWaitPakinList.get(0),floor);
+// if(!Cools.isEmpty(locMast)){
+// return locMast;
+// }
+//
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+// locMast = getLocByProximityRule();
+// if (locMast != null) {
+// //鎵惧埌搴撲綅锛岃繑鍥瀌to
+// //return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+// }
+//
+// //鏍规嵁鐗╂枡棰戠巼鎼滅储搴撲綅锛岄鐜囬珮鍒欐悳绱㈢缂撳瓨璐ф灦鏈�杩戝簱浣嶏紝棰戠巼浣庡垯鎼滅储鏈�杩滃簱浣�
+// Mat mat = matService.selectByMatnr(agvWaitPakinList.get(0).getMatnr());
+// if(Cools.isEmpty(mat.getBeBatch())){
+// mat.setBeBatch(0);
+// }
+// locMast = getLocByFre(mat.getBeBatch(), floor);
+// if (locMast != null) {
+// return locMast;
+// }
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
- locMast = getLocNoRule(floor);
+ locMast = getLocNoRule(type);
if (locMast != null) {
return locMast;
}
@@ -227,11 +227,10 @@
}
//闅忔満鍙栦竴涓揣浣�
- private AgvLocMast getLocNoRule(int floor){
+ private AgvLocMast getLocNoRule(int type){
return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
- .eq("floor",floor)
.eq("loc_sts","O")
- .eq(false,"loc_type2",1));
+ .eq(false,"loc_type1",type));
}
--
Gitblit v1.9.1