From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/common/service/CommonService.java | 759 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 454 insertions(+), 305 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index aaba5de..6b0a0a8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,24 +1,22 @@
package com.zy.common.service;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
/**
* 璐ф灦鏍稿績鍔熻兘
@@ -35,6 +33,18 @@
public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
add(18);add(19);add(20);
add(21);add(22);add(23);add(24);add(25);add(26);add(27);add(28);add(29);add(30);
+ }};
+
+ public static final List<String> HARD_LOC_NO = new ArrayList<String>() {{
+ add("0200104");add("0200704");add("0201404");add("0202004");
+ add("0600201");add("0600202");add("0600203");add("0600204");
+ add("0600301");add("0600302");add("0600303");add("0600304");
+ add("0600701");add("0600702");
+ add("0601401");add("0601402");
+ add("0602001");add("0602002");
+ add("2000704");add("2001404");add("2002004");
+ add("1600701");add("1601401");add("1602001");
+ add("1600702");add("1601402");add("1602002");
}};
@Autowired
@@ -100,97 +110,211 @@
return workNo;
}
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
- LocTypeDto oldLocType = locTypeDto.clone();
- return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, Integer matTypeIn) {
+ return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,new ArrayList<>());
}
-
- /**
- * 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
- * @param sourceStaNo 婧愮珯
- * @param matNos 鐗╂枡鍙烽泦鍚�
- * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
- */
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
- StartupDto startupDto = new StartupDto();
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param matNos 鐗╂枡鍙烽泦鍚�
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, Integer matTypeIn,List<LocMast> locMastList) {
int start;
int end;
- Integer theCrnNo = null;
+ Integer matType = null;//鐗╂枡绫诲瀷
+ Integer crnNo = 0;
+ //鏍规嵁鍏ュ簱绔欙紝鍐冲畾鎼滅储鎸囧畾鍫嗗灈鏈�
+ ArrayList<Integer> crnNos = new ArrayList<>();
+ //鏍规嵁鍏ュ簱绔欙紝鎵惧埌搴撲綅缁勬渶鍐呬晶鎺�
+ ArrayList<Integer> rows = new ArrayList<>();
switch (sourceStaNo) {
- case 103:
+ case 103://103鍏ュ簱绔�
+ case 113://103鍏ュ簱绔�
whsType = 1;
start = 1;
end = 14;
-// if (null != wrkMastService.selectPakoutOfStaNo(104)) {
-// start = 8;
-// theCrnNo = 2;
-// }
+
+ //103绔欏垎閰�1锛�2鍫嗗灈鏈�
+ crnNos.add(1);
+ crnNos.add(2);
+
+ //鍒嗛厤1锛�7锛�8锛�14鎺�
+ rows.add(1);
+ rows.add(7);
+ rows.add(8);
+ rows.add(14);
+ crnNo = 1;
break;
- case 203:
+ case 203://203鍏ュ簱绔�
+ case 213://203鍏ュ簱绔�
whsType = 2;
start = 8;
end = 21;
-// if (null != wrkMastService.selectPakoutOfStaNo(204)) {
-// end = 14;
-// theCrnNo = 2;
-// }
+
+ //203绔欏垎閰�2锛�3鍫嗗灈鏈�
+ crnNos.add(2);
+ crnNos.add(3);
+
+ //鍒嗛厤8锛�14锛�15锛�21鎺�
+ rows.add(8);
+ rows.add(14);
+ rows.add(15);
+ rows.add(21);
+ crnNo = 3;
break;
default:
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- int curRow = rowLastno.getCurrentRow(); // 褰撳墠鍒�
- int sRow = rowLastno.getsRow(); // 璧峰鍒�
- int eRow = rowLastno.geteRow(); // 缁堟鍒�
- int crn_qty = rowLastno.getCrnQty(); // 鍫嗗灈鏈烘暟閲忥紙宸烽亾鏁伴噺锛�
- int rowCount = eRow - sRow + 1; // 搴撴帓鎬绘暟
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
// 鐩爣搴撲綅
LocMast locMast = null;
- boolean inoutEveryday = false;
+ boolean sign = false;
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ locMast = getLocNoStep1(staDescId, locTypeDto, start, end);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ sign=true;
+ }
+
+ //3鍙峰彲浠ュ叆搴撳墠蹇呴』鎵撳紑鎺у埗
if (!Cools.isEmpty(matNos)) {
for (String matNo : matNos) {
Mat mat = matService.selectByMatnr(matNo);
- if (mat.getInoutEveryday() != null && mat.getInoutEveryday()) {
- inoutEveryday = true;
- break;
+ if (matType == null) {
+ matType = mat.getMatType();
+ }
+ if (!matType.equals(mat.getMatType())) {
+ throw new CoolException("娣锋斁鐗╂枡绫诲瀷涓嶄竴鑷�");
}
}
+ if (!Cools.isEmpty(matTypeIn)) {
+ if (!matTypeIn.equals(0)) {
+ matType = matTypeIn;
+ }
+ }
+
+// if (matNos.size() > 1 && matType == 1) {
+// //鐗╂枡涓哄崟鍝佺被鍨嬶紝涓旂墿鏂欑绫昏秴杩�1(瀹為檯涓洪珮棰戞贩鏀�)锛屽垯绂佹鍏ュ簱
+// throw new CoolException("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�");
+// }
}
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
- List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
- for (String locNo : locNos) {
- List<String> groupLoc = Utils.getGroupLoc(locNo);
- LocMast locMast0 = locMastService.findOutMost(groupLoc);
- if (null != locMast0) {
- // 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
- // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
- }
+ if (!sign && matType != null) {
+ if (matType == 1) {//鍗曞搧绫诲瀷鍏ュ簱
+ locMast = getLocNoStep2(locTypeDto, matNos, rows, crnNos,locMastList);
+ if (locMast != null) {
+ locMastList.add(locMast);
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", locMast.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,locMastList);
+ }
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ sign=true;
+ } else {
+ //鍗曞搧娌℃湁鎵惧埌搴撲綅锛屾壘楂橀娣锋斁鍖哄煙搴撲綅
+ locMast = getLocNoStep3(locTypeDto, crnNos,locMastList);
+ if (locMast != null) {
+ locMastList.add(locMast);
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", locMast.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,locMastList);
}
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ sign=true;
}
}
+ } else if (matType == 2) {//楂橀绫诲瀷鍏ユ渶澶栦晶搴撲綅
+ locMast = getLocNoStep3(locTypeDto, crnNos,locMastList);
+ if (locMast == null) {
+ //楂橀娌℃湁鎵惧埌搴撲綅锛屾壘浣庨娣锋斁鍖哄煙搴撲綅
+ locMast = getLocNoStep4(locTypeDto, crnNos,locMastList);
+ }
+ if (locMast != null) {
+ locMastList.add(locMast);
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", locMast.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,locMastList);
+ }
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ sign=true;
+ }
+ } else if (matType == 3) {//浣庨娣锋斁绫诲瀷
+ locMast = getLocNoStep4(locTypeDto, crnNos,locMastList);
+ if (locMast != null) {
+ locMastList.add(locMast);
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", locMast.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,locMastList);
+ }
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ sign=true;
+ }
}
}
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+
+
+// if (!sign){
+// //----------------2023.06.02鍏煎浠ｇ爜锛屽悗鏈熷簱浣嶈鍒欑鍚堣姹傚悗鍙垹闄�------------------------
+// //濡傛灉浠ヤ笂閮芥壘涓嶅埌搴撲綅锛屽垯寮哄埗鎼滅储2鍫嗗灈鏈虹┖搴撲綅杩涜鍏ュ簱锛屼繚闅�3鍙峰爢鍨涙満搴撲綅閮芥槸绗﹀悎瑕佹眰鐨�
+// EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+// wrapper.eq("loc_type1", locTypeDto.getLocType1());
+// wrapper.in("crn_no", "2");
+// wrapper.eq("loc_sts", "O");
+// List<LocMast> locMasts = locMastService.selectList(wrapper);
+// for (LocMast mast : locMasts) {
+// //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+// if (Utils.checkInsideLocIsDFX(mast.getLocNo())) {
+// //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+// continue;
+// }
+// if(sourceStaNo==103 && mast.getRow1()>14) continue;
+// if(sourceStaNo==103 && mast.getRow1()<8) continue;
+// if(sourceStaNo==203 && mast.getRow1()<15) continue;
+// //鎵惧埌搴撲綅锛岃繑鍥瀌to
+// locMast=mast;
+// sign = true;
+// }
+// }
+
+ if (sign){
+ return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+ if (!locMastList.isEmpty()){
+ return getLocNoFinalStep(staDescId, sourceStaNo, locMastList.get(0));//杩斿洖dto
+ }
+ //----------------2023.06.02鍏煎浠ｇ爜end---------------------
+
+ throw new CoolException("800妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ private LocMast getLocNoStep1(Integer staDescId, LocTypeDto locTypeDto,int start,int end) {
+ LocMast locMast = null;
if (staDescId == 10) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "D").ge("row1", start).le("row1", end));
@@ -204,8 +328,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
- crnNo = locMast0.getCrnNo();
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
break;
}
@@ -216,282 +339,308 @@
}
}
- // 搴撳尯閿佸畾
- if (Cools.isEmpty(locMast)) {
- LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null, start, end);
- if (!Cools.isEmpty(locRule)) {
- List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1()
- , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
- for (LocMast one : locMasts) {
- List<String> groupLoc = Utils.getGroupLoc(one.getLocNo());
- LocMast locMast0 = locMastService.findOutMost(groupLoc);
- if (null != locMast0) {
+ return locMast;
+ }
+
+ //鍗曞搧绫诲瀷鍏ュ簱
+ private LocMast getLocNoStep2(LocTypeDto locTypeDto, List<String> matNos, List<Integer> rows, List<Integer> crnNos,List<LocMast> locMastList) {
+ LocMast locMast = null;
+ //鍏堟壘宸ヤ綔妗�
+
+ List<WrkMast> wrkMasts = wrkMastService.selectSameWrkMast(matNos.get(0));
+ for (WrkMast wrkMast : wrkMasts) {
+ List<String> groupLoc = Utils.getGroupLoc(wrkMast.getLocNo());
+ //闅忔満鍙敤鍫嗗灈鏈哄彿
+ Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
+ Collections.shuffle(crnNos);
+ loc:
+ for (Integer crnNo : crnNos) {
+ List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, crnNo);
+ for (LocMast locMast0 : locMasts) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丼
+ if (Utils.checkInsideLocIsDFXS(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆丼銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
+
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
+ if (!locMastList.contains(locMast0)){
+ locMast = locMast0;
+ break loc;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
+
+ //鎵惧唴渚х┖搴撲綅(闈炴渶澶栦晶搴撲綅)
+ if (locMast == null) {
+ List<String> locNos = locDetlService.getSameDetl(matNos.get(0));
+ loc:
+ for (String locNo : locNos) {
+ List<String> groupLoc = Utils.getGroupLoc(locNo);
+ List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, null);
+ for (LocMast locMast0 : locMasts) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
+
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
+ if (!locMastList.contains(locMast0)){
+ locMast = locMast0;
+ break loc;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ //鏈壘鍒板贩閬擄紝鎵句竴鏉℃柊鐨勭┖宸烽亾
+ if (locMast == null) {
+ //闅忔満鍙敤鍫嗗灈鏈哄彿
+ Boolean flag = false;
+ Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
+ Collections.shuffle(crnNos);
+ for (Integer crnNo : crnNos) {
+ List<LocMast> locMasts = locMastService.findInEmptyLocMast(locTypeDto.getLocType1(), rows, crnNo);//鎵句竴鏉℃柊鐨勭┖宸烽亾
+ for (LocMast locMast0 : locMasts) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ if (!Utils.checkOutsideLocIsDFX(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
+
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
+ if (!locMastList.contains(locMast0)){
+ locMast = locMast0;
+ flag = true;
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (!flag) {
+ List<LocMast> locMastsNew = locMastService.findInEmptyLocMastNew(locTypeDto.getLocType1(), HARD_LOC_NO, crnNo);//鎵句竴鏉℃柊鐨勭┖宸烽亾
+ for (LocMast locMast0 : locMastsNew) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
// 娴呭簱浣嶇鍚堝昂瀵告娴�
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
+ if (!locMastList.contains(locMast0)){
+ locMast = locMast0;
+ flag = true;
+ break;
+ }
}
}
}
}
}
- }
- }
-
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- int currentRow = 1;
- if (null == locMast) {
- Shelves shelves = new Shelves(rowCount, crn_qty);
- for (int i = 0; i < shelves.group; i ++) {
- if (i > 0) {
- curRow = currentRow;
- }
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- currentRow = curRow;
- int crnNo1 = shelves.get(curRow);
- if (whsType == 1) {
- switch (curRow) {
- case 1:
- curRow = 1;
- if (null != theCrnNo) {
- curRow = 8;
- crnNo1 = crnNo1 + 1;
- }
- break;
- case 2:
- curRow = 7;
- if (null != theCrnNo) {
- curRow = 14;
- crnNo1 = crnNo1 + 1;
- }
- break;
- case 3:
- curRow = 8;
- break;
- case 4:
- curRow = 14;
- break;
- default:
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- } else {
- switch (curRow) {
- case 1:
- curRow = 8;
- break;
- case 2:
- curRow = 14;
- break;
- case 3:
- curRow = 15;
- if (null != theCrnNo) {
- curRow = 8;
- crnNo1 = crnNo1 - 1;
- }
- break;
- case 4:
- curRow = 21;
- if (null != theCrnNo) {
- curRow = 14;
- crnNo1 = crnNo1 - 1;
- }
- break;
- default:
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- crnNo1 = crnNo1 + 1;
- }
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
+ if (flag) {
break;
}
}
}
- if (crnNo == 0) {
- throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
+ return locMast;
+ }
+
+ //楂橀绫诲瀷鍏ユ渶澶栦晶搴撲綅
+ private LocMast getLocNoStep3(LocTypeDto locTypeDto, List<Integer> crnNos,List<LocMast> locMastList) {
+ LocMast locMast = null;
+
+ //闅忔満鍙敤鍫嗗灈鏈哄彿
+ Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
+ if (randomCrnNo == null) {
+ return locMast;
}
+ ArrayList<Integer> randomCrnNos = new ArrayList<>();
+ randomCrnNos.add(randomCrnNo);
+
+ //鎵炬渶澶栦晶绌哄簱浣�
+ List<LocMast> locMasts = locMastService.findOutMast(locTypeDto.getLocType1(), randomCrnNos);
+ for (LocMast locMast0 : locMasts) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丱
+ if (Utils.checkInsideLocIsDFXO(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆丱銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
+
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
+ if (!locMastList.contains(locMast0)){
+ locMast = locMast0;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ //鍓旈櫎褰撳墠闅忔満鍫嗗灈鏈哄厓绱犲皾璇曢噸鏂版煡鎵�
+ if (locMast == null) {
+ ArrayList<Integer> crns = new ArrayList<>();
+ for (int crnNo : crnNos) {
+ if (randomCrnNo == crnNo) {
+ continue;
+ }
+ crns.add(crnNo);
+ }
+ if (!crns.isEmpty()) {
+ return getLocNoStep3(locTypeDto, crns,locMastList);
+ }
+ }
+
+ return locMast;
+ }
+
+ //浣庨绫诲瀷锛岀洿鎺ユ壘娣锋斁鍖哄煙
+ private LocMast getLocNoStep4(LocTypeDto locTypeDto, List<Integer> crnNos,List<LocMast> locMastList) {
+ LocMast locMast = null;
+
+ //闅忔満鍙敤鍫嗗灈鏈哄彿
+ Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
+
+ List<LocMast> locMasts = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1(), randomCrnNo);
+ for (LocMast locMast0 : locMasts) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
+
+ //妫�娴嬪綋鍓嶅簱浣嶅渚у簱浣嶆槸鍚︿负O(绌哄簱浣�)
+ boolean flag = false;
+ List<String> outerLoc = Utils.getGroupOuterLoc(locMast0.getLocNo());
+ if (outerLoc.size() > 0) {
+ List<LocMast> outerLocMast = locMastService.selectByLocNos(outerLoc);
+ for (LocMast mast : outerLocMast) {
+ if (!mast.getLocSts().equals("O")) {
+ //涓嶆槸绌哄簱浣嶏紝鎵句笅涓�涓�
+ flag = true;
+ break;
+ }
+ }
+ }
+ if (flag) {
+ continue;
+ }
+
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ Integer outermostRow = Utils.getOutermostRow(locMast0.getLocNo(), true);
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", outermostRow).eq("bay1", locMast0.getBay1()).eq("lev1", locMast0.getLev1()));
+ if (!locMast1.getLocSts().equals("O") && !locMast0.getRow1().equals(outermostRow)){
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount0(locMast0, 5)) {
+ if (!locMastList.contains(locMast0)){
+ locMast = locMast0;
+ break;
+ }
+ }
+ }else {
+ if (!locMastList.contains(locMast0)){
+ locMast = locMast0;
+ break;
+ }
+ }
+
+ }
+ }
+ }
+
+ //鍓旈櫎褰撳墠闅忔満鍫嗗灈鏈哄厓绱犲皾璇曢噸鏂版煡鎵�
+ if (locMast == null) {
+ ArrayList<Integer> crns = new ArrayList<>();
+ for (int crnNo : crnNos) {
+ if (randomCrnNo == crnNo) {
+ continue;
+ }
+ crns.add(crnNo);
+ }
+ if (!crns.isEmpty()) {
+ return getLocNoStep4(locTypeDto, crns,locMastList);
+ }
+ }
+
+ return locMast;
+ }
+
+ //杩斿洖dto
+ private StartupDto getLocNoFinalStep(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", staDescId)
.eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
+ .eq("crn_no", locMast.getCrnNo());
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
- log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, crnNo);
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, locMast.getCrnNo());
+ if (sourceStaNo==103 && locMast.getCrnNo()==3){
+ throw new CoolException("璇锋斁鍒�203鍏ュ簱鍙�--1000");
+ }else if (sourceStaNo==203 && locMast.getCrnNo()==1){
+ throw new CoolException("璇锋斁鍒�103鍏ュ簱鍙�--1000");
+ }else if (sourceStaNo==113 && locMast.getCrnNo()==3){
+ throw new CoolException("璇锋斁鍒�213鍏ュ簱鍙�--1000");
+ }else if (sourceStaNo==213 && locMast.getCrnNo()==1){
+ throw new CoolException("璇锋斁鍒�113鍏ュ簱鍙�--1000");
+ }else {
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
}
// 妫�娴嬬洰鏍囩珯
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
}
- // 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(currentRow);
- rowLastnoService.updateById(rowLastno);
-
- // 寮�濮嬫煡鎵惧簱浣� ==============================>>
-
- // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
- // 楂樹綆棰戠鎺с�佸簱浣嶇粍鍏ㄩ儴涓篛
- if (locMast == null) {
- List<Integer> rows = Utils.getGroupLoc(curRow);
- List<LocMast> locMasts = locMastService.queryFreeLocMast0(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday);
- if (!Cools.isEmpty(locMasts)) {
- Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
- for (LocMast one : locMasts) {
- if (one.getRow1().equals(innermostRow)) {
- locMast = one;
- break;
- }
- }
- }
-
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast, 10)) { locMast = null; }
- }
-
- // 2.1 楂樹綆棰戠鎺с�佸簱浣嶇粍鏃犻渶鍏ㄩ儴涓篛锛屾壘鍒板簱浣嶅搴旀繁搴撲綅涓嶈兘涓篜 R
- if (Cools.isEmpty(locMast)) {
- int sign = curRow;
- while (sign != 0 && Cools.isEmpty(locMast)) {
- List<LocMast> locMasts = locMastService.queryFreeLocMastEnd1(sign, locTypeDto.getLocType1(), inoutEveryday);
- for (LocMast loc : locMasts) {
- // 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
- boolean success = true;
- // 娴呭簱浣�
- List<String> outerLocList = Utils.getGroupOuterLoc(loc.getLocNo());
- for (String outerLocNo : outerLocList) {
- LocMast outerLoc = locMastService.selectById(outerLocNo);
- if (Cools.isEmpty(outerLoc)) {
- continue;
- }
- if (!outerLoc.getLocSts().equals("O")) {
- success = false; break;
- }
- }
- // 娣卞簱浣嶅垽鏂�
- List<String> insideLocList = Utils.getGroupInsideLoc(loc.getLocNo());
- for (String insideLocNo : insideLocList) {
- LocMast insideLoc = locMastService.selectById(insideLocNo);
- if (Cools.isEmpty(insideLoc)) {
- continue;
- }
- if (insideLoc.getLocSts().equals("R")
- || insideLoc.getLocSts().equals("P")
- || insideLoc.getLocSts().equals("Q")
- || insideLoc.getLocSts().equals("S")) {
- success = false; break;
- }
- }
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(loc, 10)) {
- success = false;
- }
- if (success) {
- locMast = loc;
- break;
- }
- }
- sign = getCurRow(sign);
- }
- }
-
- // 2.鏃犲簱浣嶆椂锛屾棤瑙嗗尯鍩熼攣瀹氾紝閲嶆柊鏌ユ壘搴撲綅
- if (Cools.isEmpty(locMast)) {
- int sign = curRow;
- while (sign != 0 && Cools.isEmpty(locMast)) {
- List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
- for (LocMast loc : locMasts) {
- // 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
- boolean success = true;
- // 娴呭簱浣�
- List<String> outerLocList = Utils.getGroupOuterLoc(loc.getLocNo());
- for (String outerLocNo : outerLocList) {
- LocMast outerLoc = locMastService.selectById(outerLocNo);
- if (Cools.isEmpty(outerLoc)) {
- continue;
- }
- if (!outerLoc.getLocSts().equals("O")) {
- success = false; break;
- }
- }
- // 娣卞簱浣�
- List<String> insideLocList = Utils.getGroupInsideLoc(loc.getLocNo());
- for (String insideLocNo : insideLocList) {
- LocMast insideLoc = locMastService.selectById(insideLocNo);
- if (Cools.isEmpty(insideLoc)) {
- continue;
- }
- if (insideLoc.getLocSts().equals("R")
- || insideLoc.getLocSts().equals("P")
- || insideLoc.getLocSts().equals("Q")
- || insideLoc.getLocSts().equals("S")) {
- success = false; break;
- }
- }
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(loc, 10)) {
- success = false;
- }
- if (success) {
- locMast = loc;
- break;
- }
- }
- sign = getCurRow(sign);
- }
- }
-
- //2023-4-13 ADD锛� 鎵惧埌鐨勫簱浣嶃�佷互鍙婂叾娴呭簱浣嶏紝濡傛灉鍦ㄥ伐浣滄。鏈夌Щ搴撲换鍔★紝鍒欒烦杩�
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("io_type", 11));
- for (WrkMast wrkMast : wrkMasts){
- if (wrkMast.getSourceLocNo().equals(locMast.getLocNo())){
- locMast = null;
- break;
- }
- List<String> outerLocList = Utils.getGroupOuterLoc(locMast.getLocNo());
- for (String outerLocNo : outerLocList) {
- if (locMast.getLocNo().equals(outerLocNo)){
- locMast = null;
- break;
- }
- }
- }
-
- // 3.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
- if (Cools.isEmpty(locMast)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
- times = times + 1;
- return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
- } else {
- times = 0;
- }
- // 璐х墿妫�绱綆搴撲綅浠撳け璐ワ紝鍏煎楂樺簱浣嶄粨鍚庣户缁墽琛�
- if (locTypeDto.getLocType1() == 1) {
- locTypeDto.setLocType1((short) 2);
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
- }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
String locNo = locMast.getLocNo();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+
// 杩斿洖dto
+ StartupDto startupDto = new StartupDto();
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
+ startupDto.setCrnNo(locMast.getCrnNo());
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
--
Gitblit v1.9.1