From 1e394e190309a5c0e29ed0c52d12283d30cdb60b Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期五, 26 七月 2024 16:59:40 +0800 Subject: [PATCH] # 优化寻找库位逻辑 --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 src/main/java/com/zy/common/service/CommonService.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 106 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 5369a27..1513336 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -1285,7 +1285,7 @@ locTypeDto.setLocType1((short)1); // 鏍规嵁婧愮珯鐐瑰鎵惧簱浣� - StartupDto dto = commonService.getLocNo(1, sourceStaNo, locTypeDto); + StartupDto dto = commonService.getLocNo(1, sourceStaNo, locTypeDto,0); int workNo = dto.getWorkNo(); Date now = new Date(); diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 3b812c3..a9da271 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -1007,7 +1007,7 @@ // 鏍规嵁婧愮珯鐐瑰鎵惧簱浣� // StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo(), null,null,null, locTypeDto); - StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto); + StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto,0); // 杩斿洖GWCS鐩爣淇℃伅 pushStaNoToGwcs(param.getPalletizingNo(),dto.getStaNo(),dto.getWorkNo()); diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 67550c8..a1548b8 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; +import com.core.common.Arith; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.*; @@ -10,6 +11,7 @@ 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; @@ -119,10 +121,105 @@ * 鍙屾繁鎵惧簱浣� */ @Transactional - public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo,LocTypeDto locTypeDto) { + public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo,LocTypeDto locTypeDto,int times) { - // 鐩爣搴撲綅 - LocMast locMast; + // 鍒濆鍖栧弬鏁� + int crnNo = 0; //鍫嗗灈鏈哄彿 + int nearRow = 0; //鏈�娴呭簱浣嶆帓 + int curRow = 0; //鏈�娣卞簱浣嶆帓 + LocMast locMast = null; // 鐩爣搴撲綅 + + StartupDto startupDto = new StartupDto(); + RowLastno rowLastno = rowLastnoService.selectById(1); + int sRow = rowLastno.getsRow(); + int eRow = rowLastno.geteRow(); + int crn_qty = rowLastno.getCrnQty(); + int rowCount = eRow - sRow + 1; + if (Cools.isEmpty(rowLastno)) { + throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); + } + // ===============>>>> 寮�濮嬫墽琛� + + curRow = rowLastno.getCurrentRow(); + + // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋� + if (Cools.isEmpty(locMast)) { + Shelves shelves = new Shelves(rowCount, crn_qty); + int divides = (int) Arith.divides(1, curRow - 1, 4); + curRow = (int) Arith.remainder(curRow, 4); + if (curRow == 0) { + curRow = 4; + } + for (int i = 0; i < shelves.group; i ++) { + curRow = shelves.start(curRow); + if (curRow < 0) { + throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳"); + } + Integer crnNo1 = shelves.get(curRow); + crnNo1 = crnNo1 + divides*1; + if (basCrnpService.checkSiteError(crnNo1, true)) { + crnNo = crnNo1; + curRow = curRow + divides*4; + break; + } + } + } + + if (crnNo == 0) { + throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満"); + } + + // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺� + if (locMast == null) { + if (Utils.isShallowLoc(slaveProperties, curRow)) { + Integer deepRow = Utils.getDeepRow(slaveProperties, curRow); + locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1()); + // todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭d箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛� + // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� + if (!locMastService.checkEmptyCount(locMast)) { + locMast = null; + } + } + if (Cools.isEmpty(locMast)) { + locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1()); + // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� + if (!locMastService.checkEmptyCount(locMast)) { + locMast = null; + } + // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X + if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) { + LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo())); + if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) { + locMast = null; + } + } + // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O + if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) { + LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo())); + if (!Cools.isEmpty(shallowLoc)) { + if (!shallowLoc.getLocSts().equals("O")) { + locMast = null; + } + } + + + } + } + } + // 鏇存柊搴撲綅鎺掑彿 + rowLastno.setCurrentRow(curRow); + rowLastnoService.updateById(rowLastno); + // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣� + if (Cools.isEmpty(locMast)) { + // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊 + if (times < rowCount) { + times = times + 1; + return getLocNo(staDescId, sourceStaNo, locTypeDto, times); + } + log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times); + throw new CoolException("娌℃湁绌哄簱浣�"); + } + // // 鎼滅储绌烘墭 // locMast = getLocNoStep4(staDescId, sourceStaNo); @@ -130,9 +227,11 @@ // //鎵惧埌搴撲綅锛岃繑鍥瀌to // return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto // } + if (locMast == null) { + //鎼滅储鏁翠釜绌哄簱浣嶇粍 + locMast = getLocNoStepSingle(locTypeDto); + } - //鎼滅储鏁翠釜绌哄簱浣嶇粍 - locMast = getLocNoStepSingle(locTypeDto); if (locMast != null) { //鎵惧埌搴撲綅锛岃繑鍥瀌to return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto -- Gitblit v1.9.1