From 1b230d7961b2d5068298f0cba13287cabd2fd649 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 17 七月 2024 18:47:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 307 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 288 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b7887ae..4b0dd11 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -202,15 +202,8 @@
}
List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
- for (LocMast locMast0 : locMasts) {
- LocMast locMast1 = locMastService.findInnerLoc(locMast0.getLocNo());//妫�娴嬪悓搴撲綅缁勬繁搴撲綅鏄惁鏈夌┖闂插簱浣�
- if (locMast1 != null) {
- //棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast1, 10)) {
- return locMast1;
- }
- }
- }
+ locMast = locFilter(locMasts, matNos,locTypeDto);
+
}
if (locRules.get(0).getKeepGo() == 0) {
@@ -250,17 +243,8 @@
if (locRule == null) {
continue;
}
-
List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
- for (LocMast locMast0 : locMasts) {
- LocMast locMast1 = locMastService.findInnerLoc(locMast0.getLocNo());//妫�娴嬪悓搴撲綅缁勬繁搴撲綅鏄惁鏈夌┖闂插簱浣�
- if (locMast1 != null) {
- //棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast1, 10)) {
- return locMast1;
- }
- }
- }
+ locMast = locFilter(locMasts, matNos,locTypeDto);
}
// if (locRules.get(0).getKeepGo() == 0) {
@@ -421,6 +405,73 @@
return locMast;
}
+ /*
+ 搴撳瓨瑙勫垯鎼滅储鍒扮殑搴撲綅纭
+ */
+ private LocMast locFilter(List<LocMast> locMasts,List<String> matNos,LocTypeDto locTypeDto){
+ for (LocMast locMast0 : locMasts) {
+ if(!VersionUtils.checkLocType(locMast0,locTypeDto)){
+ continue;
+ }
+ //鍗曞搧鐗╂枡
+ if (matNos.size() == 1) {
+ //濡傛灉涓嶆槸娣辨祬锛屽垯鐩存帴杩斿洖褰撳墠搴撲綅
+ if(Cools.isEmpty(Utils.getGroupDeepLoc(locMast0.getLocNo()))){
+ return locMast0;
+ }else{
+ List<String> groupInnerLoc = Utils.getGroupInnerLoc(locMast0.getLocNo());
+ //濡傛灉鏄繁娴呭簱浣嶏紝浣嗘槸鍐呮祴鏃犲簱浣嶇殑鎯呭喌涓嬶紝鍒欑洿鎺ヨ繑鍥炲綋鍓嶅簱浣�
+ if (Cools.isEmpty(groupInnerLoc)) {
+ return locMast0;
+ }else {
+ //鑾峰彇鏈�娣辩殑搴撲綅
+ String loc = groupInnerLoc.get(groupInnerLoc.size() - 1);
+ LocMast locMast1 = locMastService.selectByLoc(loc);
+ //濡傛灉鏈�娣辨祴搴撲綅涓虹┖搴撲綅锛屽垯鐩存帴杩斿洖鏈�娣卞簱浣�
+ if("O".equals(locMast1.getLocSts())){
+ return locMast1;
+ }else {
+ //濡傛灉鏈�娣卞簱浣嶇姸鎬佷笉涓篎鎴栬�匫锛屽垯璺冲嚭褰撳墠鐨勬繁娴呭簱浣嶆煡鎵�
+ if(!"F".equals(locMast1.getLocSts())){
+ continue;
+ }
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(loc);
+ //濡傛灉褰撳墠娣卞簱浣嶇墿鏂欎笌鍏ュ簱鐗╂枡涓嶇浉绗︼紝鍒欒烦鍑哄綋鍓嶆繁娴呭簱浣嶆煡鎵�
+ if(!Cools.eq(locDetls.get(0).getMatnr(),matNos.get(0))){
+ continue;
+ }
+ //浠庨噷寰�澶栦緷娆￠亶鍘嗚缁勬繁娴呭簱浣�
+ for (int i=groupInnerLoc.size()-1; i>=0 ;i--){
+ LocMast locMast2 = locMastService.selectByLoc(groupInnerLoc.get(i));
+ if("O".equals(locMast2.getLocSts())){
+ //濡傛灉娣卞簱浣嶄腑鍚湁0鐘舵�佺殑搴撲綅锛屽垯鐩存帴杩斿洖璇ュ簱浣�
+ return locMast2;
+ }else if("F".equals(locMast2.getLocSts())){
+ //濡傛灉瀵逛簬locaMast0鏈�杩戠殑涓�涓簱浣嶄篃涓篎鐘舵�侊紝鍒欒繑鍥瀕ocaMastO
+ if(i==0){
+ return locMast0;
+ }else {
+ //濡傛灉璇ョ粍娣辨祬搴撲綅涓惈鏈夋棦涓嶄负F涔熶笉涓篛鐨勫簱浣嶏紝鍒欒烦鍑哄綋鍓嶆繁娴呭簱浣嶆煡鎵�
+ continue;
+ }
+ }else {
+ break;
+ }
+ }
+ }
+
+ }
+ }
+ }else {
+ if(Cools.isEmpty(Utils.getGroupDeepLoc(locMast0.getLocNo()))){
+ return locMast0;
+ }
+ }
+
+ }
+ return null;
+ }
+
//杩斿洖dto
private StartupDto getLocNoStep6(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
StartupDto startupDto = new StartupDto();
@@ -452,4 +503,222 @@
return startupDto;
}
+ /**
+ * 鍥涘悜搴撹幏鍙栧簱浣�
+ */
+ public StartupDto getShuttleLocNo(Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto) {
+ RowLastno rowLastno = rowLastnoService.selectOne(new EntityWrapper<RowLastno>().eq("whs_type", 1));
+ //璧峰灞�
+ Integer startLev = rowLastno.getCurrentRow();
+ return getShuttleLocNo(staDescId, sourceStaNo, matNos, locTypeDto, startLev, 0);
+ }
+
+ public StartupDto getShuttleLocNo(Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int startLev, int times) {
+ RowLastno rowLastno = rowLastnoService.selectOne(new EntityWrapper<RowLastno>().eq("whs_type", 1));
+ //璧峰灞�
+ Integer currentLev = rowLastno.getCurrentRow();
+ if (times > 0 && startLev == currentLev) {
+ if (locTypeDto.getLocType1() == 1) {
+ locTypeDto.setLocType1((short) 2);
+ return getShuttleLocNo(staDescId, sourceStaNo, matNos, locTypeDto, startLev, 0);
+ } else if (locTypeDto.getLocType1() == 2) {
+ locTypeDto.setLocType1((short) 3);
+ return getShuttleLocNo(staDescId, sourceStaNo, matNos, locTypeDto, startLev, 0);
+ }
+ throw new CoolException("鏈壘鍒板彲鐢ㄥ簱浣�");
+ }
+ rowLastno.setCurrentRow(currentLev >= rowLastno.geteRow() ? rowLastno.getsRow() : currentLev + 1);//鏇存柊妤煎眰
+ rowLastnoService.updateById(rowLastno);
+
+ // 鐩爣搴撲綅
+ LocMast locMast = null;
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ locMast = getShuttleEmptyLocNo(staDescId, locTypeDto, currentLev);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getShuttleLocStartupDto(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+
+ //鍗曞搧鐗╂枡 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+ locMast = getShuttleSingleLocNo(matNos, locTypeDto, currentLev);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getShuttleLocStartupDto(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+ locMast = getShuttleMixedLocNo(matNos, locTypeDto, currentLev);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getShuttleLocStartupDto(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+
+ return getShuttleLocNo(staDescId, sourceStaNo, matNos, locTypeDto, startLev, times + 1);
+ }
+
+ //鎼滅储绌烘墭鐩樺簱浣�
+ private LocMast getShuttleEmptyLocNo(Integer staDescId, LocTypeDto locTypeDto, int lev) {
+ LocMast locMast = null;
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ if (staDescId == 10) {
+ //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣�
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 10));
+ for (WrkMast wrkMast : wrkMasts) {
+ LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
+ if (null != locMast0) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+ locMast = locMast0;
+ break;
+ }
+ }
+ }
+ if (Cools.isEmpty(locMast)) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O").eq("lev1", lev).orderBy("row1,bay1,lev1"));
+ if (!locMasts.isEmpty()) {
+ for (LocMast loc : locMasts) {
+ LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
+ if (null != locMast0) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+ locMast = locMast0;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return locMast;
+ }
+
+ //娣锋斁鐗╂枡
+ private LocMast getShuttleMixedLocNo(List<String> matNos, LocTypeDto locTypeDto, Integer lev) {
+ LocMast locMast = null;
+ if (matNos.size() > 1) {
+ List<LocMast> locMasts = locMastService.selectAreaEmptyByLev(locTypeDto.getLocType1(), 1, lev);//鎼滅储娣锋斁搴撲綅
+ //娣锋斁鍖哄煙鐩存帴鍙栫涓�涓嵆鍙�
+ for (LocMast mast : locMasts) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.checkLocType(mast, locTypeDto)) {
+ locMast = mast;
+ break;
+ }
+ }
+ }
+ return locMast;
+ }
+
+ //鍗曞搧鐗╂枡 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+ private LocMast getShuttleSingleLocNo(List<String> matNos, LocTypeDto locTypeDto, int lev) {
+ LocMast locMast = null;
+ if (matNos.size() == 1) {
+ String matNo = matNos.get(0);//鐗╂枡鍙�
+ //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣�
+ List<WrkMast> wrkMasts = wrkMastService.selectSameLevMatnrs(matNo, lev);
+ for (WrkMast wrkMast : wrkMasts) {
+ LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
+ if (null != locMast0) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+ locMast = locMast0;
+ }
+ }
+ }
+ if (Cools.isEmpty(locMast)) {
+ //鍐嶅垽鏂簱瀛樻槑缁嗘。锛屾枡鍙风浉鍚岀殑鏄庣粏搴撲綅
+ List<String> locNos = locDetlService.getSameLevDetl(matNo, lev);
+ for (String locNo : locNos) {
+ LocMast locMast0 = locMastService.findInnerLoc(locNo);
+ if (null != locMast0) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+ locMast = locMast0;
+ break;
+ }
+ }
+ }
+ }
+ if (Cools.isEmpty(locMast)) {
+ //鎵炬柊搴撲綅
+ List<LocMast> locMasts = locMastService.selectAreaEmptyByLev(locTypeDto.getLocType1(), 2, lev);//鎼滅储鍗曞搧搴撲綅
+ for (LocMast mast : locMasts) {
+ List<String> groupLoc = Utils.getGroupLoc(mast.getLocNo());
+ if (!locMastService.checkAllLocEmpty(groupLoc)) {
+ continue;
+ }
+
+ LocMast tmp = null;
+ for (String loc : groupLoc) {
+ LocMast locMast1 = locMastService.selectByLoc(loc);
+ if (locMast1 == null) {
+ continue;
+ }
+
+ if (!locMast1.getLocSts().equals("O")) {
+ continue;
+ }
+
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.checkLocType(locMast1, locTypeDto)) {
+ tmp = locMast1;
+ break;
+ }
+ }
+ if (!Cools.isEmpty(tmp)) {
+ locMast = tmp;
+ break;
+ }
+ }
+ }
+ if (Cools.isEmpty(locMast)) {
+ //鍗曞搧鎵句笉鍒板簱浣嶏紝鍏佽灏濊瘯浠庢贩鏀惧尯鍩熶腑杩涜鎼滅储
+ List<LocMast> locMasts2 = locMastService.selectAreaEmptyByLev(locTypeDto.getLocType1(), 1, lev);//鎼滅储娣锋斁搴撲綅
+ //娣锋斁鍖哄煙鐩存帴鍙栫涓�涓嵆鍙�
+ for (LocMast mast : locMasts2) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.checkLocType(mast, locTypeDto)) {
+ locMast = mast;
+ break;
+ }
+ }
+ }
+ }
+ return locMast;
+ }
+
+ //杩斿洖dto
+ private StartupDto getShuttleLocStartupDto(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
+ StartupDto startupDto = new StartupDto();
+ String locNo = locMast.getLocNo();
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no",Utils.stnNoToLiftNo(sourceStaNo));//鍊熺敤鍫嗗灈鏈哄彿瀛楁鍏呭綋鎻愬崌鏈哄彿
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+
+ // 妫�娴嬬洰鏍囩珯
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+ }
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setStaNo(staNo.getDevNo());
+ startupDto.setLocNo(locMast.getLocNo());
+ return startupDto;
+ }
+
}
--
Gitblit v1.9.1