From f2830fa9a99dd5bb0bca1f540c5124004cd4516d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 20 二月 2024 15:15:05 +0800
Subject: [PATCH] bug修复 四项库作业数量重复
---
src/main/java/com/zy/common/service/AgvCommonService.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 1f21122..8684a32 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -29,6 +29,8 @@
private AgvLocMastService agvLocMastService;
@Autowired
private MatService matService;
+ @Autowired
+ private LocRuleService locRuleService;
public int getWorkNo(Integer wrkMk) {
AgvWrkLastno wrkLastno = agvWrkLastnoService.selectById(wrkMk);
@@ -72,13 +74,21 @@
public AgvLocMast getLocNo(List<AgvWaitPakin> agvWaitPakinList, int floor) {
// 鐩爣搴撲綅
AgvLocMast locMast = null;
+ if(Cools.isEmpty(agvWaitPakinList)){
+ return getLocNoRule(floor);
+ }
//搴撲綅瑙勫垯
- if(!Cools.isEmpty(agvWaitPakinList)){
- locMast = getLocByLocRule(agvWaitPakinList.get(0),floor);
- if(!Cools.isEmpty(locMast)){
- return locMast;
- }
+ locMast = getLocByLocRule(agvWaitPakinList.get(0),floor);
+ if(!Cools.isEmpty(locMast)){
+ return locMast;
+ }
+
+
+ //搴撲綅缂栫爜瑙勫垯
+ locMast = getLocByLocCodeRule(agvWaitPakinList.get(0),floor);
+ if(!Cools.isEmpty(locMast)){
+ return locMast;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
@@ -90,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) {
@@ -150,6 +154,37 @@
}
/*
+ 搴撲綅瑙勫垯鏌ユ壘
+ */
+ private AgvLocMast getLocByLocCodeRule(AgvWaitPakin agvWaitPakin, int floor) {
+ if(Cools.isEmpty(agvWaitPakin.getBrand())){
+ return null;
+ }
+
+ //搴撳尯
+ String other = "agv-" + floor;
+ List<LocRule> locRules = locRuleService.findCode(agvWaitPakin.getMatnr(), other);
+ if(Cools.isEmpty(locRules)){
+ return null;
+ }
+
+ for (LocRule agvLocRule : locRules) {
+ EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
+ wrapper.between("row1",agvLocRule.getRowBeg(),agvLocRule.getRowEnd())
+ .between("bay1",agvLocRule.getBayBeg(),agvLocRule.getBayEnd())
+ .between("lev1",agvLocRule.getLevBeg(),agvLocRule.getLevEnd())
+ .eq("floor",floor)
+ .eq("loc_sts","O");
+ AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
+ if(!Cools.isEmpty(agvLocMast)){
+ return agvLocMast;
+ }
+ }
+
+ return null;
+ }
+
+ /*
闈犺繎鎽嗘斁瑙勫垯
*/
private AgvLocMast getLocByProximityRule(){
--
Gitblit v1.9.1