From 5d48d59ca16cdca92c55195144f8e280914cfc05 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 12 十二月 2023 09:56:01 +0800 Subject: [PATCH] #找库位V2 --- src/main/resources/mapper/LocMastMapper.xml | 2 src/main/java/com/zy/common/web/WcsController.java | 137 +++++++++++++++++++--- src/main/java/com/zy/common/service/CommonService.java | 164 +++++++++++++++++++++++++++ 3 files changed, 283 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 2718933..e18606e 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -503,4 +503,168 @@ return startupDto; } + /** + * 鍥涘悜搴撹幏鍙栧簱浣� + */ + public StartupDto getShuttleLocNo(Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto) { + // 鐩爣搴撲綅 + LocMast locMast = null; + + // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 + locMast = getShuttleEmptyLocNo(staDescId, locTypeDto); + if (locMast != null) { + //鎵惧埌搴撲綅锛岃繑鍥瀌to + return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto + } + + //鍗曞搧鐗╂枡 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂� + locMast = getShuttleSingleLocNo(matNos, locTypeDto); + if (locMast != null) { + //鎵惧埌搴撲綅锛岃繑鍥瀌to + return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto + } + + // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂� + locMast = getShuttleMixedLocNo(matNos, locTypeDto); + if (locMast != null) { + //鎵惧埌搴撲綅锛岃繑鍥瀌to + return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto + } + + throw new CoolException("鏈壘鍒板彲鐢ㄥ簱浣�"); + } + + //鎼滅储绌烘墭鐩樺簱浣� + private LocMast getShuttleEmptyLocNo(Integer staDescId, LocTypeDto locTypeDto) { + 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").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) { + LocMast locMast = null; + if (matNos.size() > 1) { + List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), 1);//鎼滅储娣锋斁搴撲綅 + //娣锋斁鍖哄煙鐩存帴鍙栫涓�涓嵆鍙� + for (LocMast mast : locMasts) { + // 娴呭簱浣嶇鍚堝昂瀵告娴� + if (VersionUtils.checkLocType(mast, locTypeDto)) { + locMast = mast; + break; + } + } + } + return locMast; + } + + //鍗曞搧鐗╂枡 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂� + private LocMast getShuttleSingleLocNo(List<String> matNos, LocTypeDto locTypeDto) { + LocMast locMast = null; + if (matNos.size() == 1) { + String matNo = matNos.get(0);//鐗╂枡鍙� + //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣� + List<WrkMast> wrkMasts = wrkMastService.selectSameMatnrs(matNo); + 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.getSameDetl(matNo); + 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.selectAreaEmpty(locTypeDto.getLocType1(), 2);//鎼滅储鍗曞搧搴撲綅 + 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.selectAreaEmpty(locTypeDto.getLocType1(), 1);//鎼滅储娣锋斁搴撲綅 + //娣锋斁鍖哄煙鐩存帴鍙栫涓�涓嵆鍙� + for (LocMast mast : locMasts2) { + // 娴呭簱浣嶇鍚堝昂瀵告娴� + if (VersionUtils.checkLocType(mast, locTypeDto)) { + locMast = mast; + break; + } + } + } + } + return locMast; + } + } diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index b6d078f..10d690a 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -58,6 +58,72 @@ // @Autowired // private ErpService erpService; + @PostMapping("/pakin/loc/v2") + @ResponseBody + public synchronized R getLocNoV2(@RequestBody SearchLocParam param) { + if (Cools.isEmpty(param.getIoType())) { + return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�"); + } + if (Cools.isEmpty(param.getSourceStaNo())) { + return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖"); + } + List<WaitPakin> waitPakins = null; + ArrayList<Mat> mats = new ArrayList<>(); + if (param.getIoType() == 1) { + if (Cools.isEmpty(param.getBarcode())) { + return R.error("鏉$爜涓嶈兘涓虹┖"); + } + waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())); + + if (Cools.isEmpty(waitPakins)) { + WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode()); + if (wrkMast != null && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 104 || wrkMast.getIoType() == 107)) { + return R.parse(CodeRes.PICK_600); + } + return R.parse(CodeRes.NO_COMB_700); + } + + for (WaitPakin waitPakin : waitPakins) { + Mat mat = matService.selectByMatnr(waitPakin.getMatnr()); + mat.setWeight(waitPakin.getAnfme()); + mats.add(mat); + } + + int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode())); + int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())); + if (countLoc > 0 || countWrk > 0) { + return R.error("宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�"); + } + } + if (Cools.isEmpty(param.getLocType1())){ + return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�"); + } + + // 婧愮珯鐐圭姸鎬佹娴� + BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true); + LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo); + locTypeDto.setLocType1(param.getLocType1()); + + StartupDto dto = null; + switch (param.getIoType()) { + case 1://婊℃墭鐩樺叆搴� + dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins, 2); + break; + case 10://绌烘墭鐩樺叆搴� + dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 2); + break; + case 103:// 鎷f枡鍏ュ簱 + case 104:// 骞舵澘鍏ュ簱 + case 107:// 鐩樼偣鍏ュ簱 + dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto, 2); + break; + default: + break; + } + log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode()); + return R.ok().add(dto); + } + @PostMapping("/pakin/loc/v1") @ResponseBody public synchronized R getLocNo(@RequestBody SearchLocParam param) { @@ -134,17 +200,28 @@ return R.ok().add(dto); } + /** + * 鍏ㄦ澘鍏ュ簱 + */ + public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats, List<WaitPakin> waitPakins) { + return startupFullPutStore(devpNo, barcode, locTypeDto, mats, waitPakins, 1); + } /** * 鍏ㄦ澘鍏ュ簱 */ @Transactional - public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats, List<WaitPakin> waitPakins) { + public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats, List<WaitPakin> waitPakins, Integer version) { // 婧愮珯鐐圭姸鎬佹娴� BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true); // 妫�绱㈠簱浣� List<String> matnrList = mats.stream().map(Mat::getMatnr).distinct().collect(Collectors.toList()); - StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrList, locTypeDto,0); + StartupDto dto = null; + if (version == 2) { + dto = commonService.getShuttleLocNo( 1, devpNo, matnrList, locTypeDto); + }else { + dto = commonService.getLocNo(1, 1, devpNo, matnrList, locTypeDto, 0); + } int workNo = dto.getWorkNo(); Date now = new Date(); // 鐢熸垚宸ヤ綔妗� @@ -156,7 +233,8 @@ Double ioPri = wrkMastService.getIoPri(1, dto.getLocNo()); wrkMast.setIoPri(ioPri); // 浼樺厛绾� wrkMast.setCrnNo(dto.getCrnNo()); - wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true)?1:0);; + wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true) ? 1 : 0); + ; wrkMast.setSourceStaNo(dto.getSourceStaNo()); wrkMast.setStaNo(dto.getStaNo()); wrkMast.setLocNo(dto.getLocNo()); @@ -176,11 +254,11 @@ } waitPakins.forEach(waitPakin -> { Mat mat = matService.selectByMatnr(waitPakin.getMatnr()); - if(Cools.isEmpty(mat)){ + if (Cools.isEmpty(mat)) { throw new CoolException(waitPakin.getMatnr() + "璇ョ墿鏂欏彿鏃犳硶鏌ヨ锛岃鏌ョ湅鐗╂枡淇℃伅鏄惁瀛樺湪"); } WrkDetl wrkDetl = new WrkDetl(); - BeanUtils.copyProperties(waitPakin,wrkDetl); + BeanUtils.copyProperties(waitPakin, wrkDetl); wrkDetl.setZpallet(barcode); wrkDetl.setWrkNo(wrkMast.getWrkNo()); wrkDetl.setIoTime(wrkMast.getIoTime()); @@ -217,29 +295,39 @@ // 鏇存柊婧愮珯鐐逛俊鎭� sourceStaNo.setWrkNo(workNo); sourceStaNo.setModiTime(now); - if (!basDevpService.updateById(sourceStaNo)){ + if (!basDevpService.updateById(sourceStaNo)) { throw new CoolException("鏇存柊婧愮珯澶辫触"); } // 鏇存柊鐩爣搴撲綅鐘舵�� LocMast locMast = locMastService.selectById(dto.getLocNo()); - if (locMast.getLocSts().equals("O")){ + if (locMast.getLocSts().equals("O")) { locMast.setLocSts("S"); // S.鍏ュ簱棰勭害 locMast.setModiTime(now); - if (!locMastService.updateById(locMast)){ + if (!locMastService.updateById(locMast)) { throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�"); } } else { - throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤"); + throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤"); } return dto; } @Transactional public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) { + return emptyPlateIn(devpNo, locTypeDto, barcode, 1); + } + + @Transactional + public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, Integer version) { // 婧愮珯鐐圭姸鎬佹娴� BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true); // 妫�绱㈠簱浣� - StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0); + StartupDto dto = null; + if (version == 2) { + dto = commonService.getShuttleLocNo(10, devpNo, null, locTypeDto); + }else { + dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto, 0); + } int workNo = dto.getWorkNo(); // 鐢熸垚宸ヤ綔妗� WrkMast wrkMast = new WrkMast(); @@ -249,7 +337,8 @@ wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱 Double ioPri = wrkMastService.getIoPri(10, dto.getLocNo()); wrkMast.setIoPri(ioPri); // 浼樺厛绾� - wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true)?1:0);; + wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true) ? 1 : 0); + ; wrkMast.setCrnNo(dto.getCrnNo()); wrkMast.setSourceStaNo(dto.getSourceStaNo()); wrkMast.setStaNo(dto.getStaNo()); @@ -272,25 +361,30 @@ // 鏇存柊婧愮珯鐐逛俊鎭� sourceStaNo.setWrkNo(workNo); sourceStaNo.setModiTime(new Date()); - if (!basDevpService.updateById(sourceStaNo)){ + if (!basDevpService.updateById(sourceStaNo)) { throw new CoolException("鏇存柊婧愮珯澶辫触"); } // 鏇存柊鐩爣搴撲綅鐘舵�� LocMast locMast = locMastService.selectById(dto.getLocNo()); - if (locMast.getLocSts().equals("O")){ + if (locMast.getLocSts().equals("O")) { locMast.setLocSts("S"); // S.鍏ュ簱棰勭害 locMast.setModiTime(new Date()); - if (!locMastService.updateById(locMast)){ + if (!locMastService.updateById(locMast)) { throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�"); } } else { - throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤"); + throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤"); } return dto; } @Transactional public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto) { + return pickWrkPlateIn(wrkNo, ioType, devpNo, locTypeDto, 1); + } + + @Transactional + public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto, Integer version) { WrkMast wrkMast = wrkMastService.selectOfPick(wrkNo, ioType); if (Cools.isEmpty(wrkMast)) { log.error("{}浠诲姟銆恑oType = {}銆戝凡杩囨湡!!!", wrkNo, ioType); @@ -307,17 +401,22 @@ devpNo = 341; } } - StartupDto dto = commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔� + StartupDto dto = null; + if (version == 2) { + dto = commonService.getShuttleLocNo( ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔� + }else { + dto = commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto, 0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔� + } // 鏇存柊鐩爣搴撲綅鐘舵�� LocMast locMast = locMastService.selectById(dto.getLocNo()); - if (locMast.getLocSts().equals("O")){ + if (locMast.getLocSts().equals("O")) { locMast.setLocSts("S"); // S.鍏ュ簱棰勭害 locMast.setModiTime(new Date()); - if (!locMastService.updateById(locMast)){ + if (!locMastService.updateById(locMast)) { throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�"); } } else { - throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤"); + throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤"); } return dto; } diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml index 5d6b2cc..091887c 100644 --- a/src/main/resources/mapper/LocMastMapper.xml +++ b/src/main/resources/mapper/LocMastMapper.xml @@ -119,7 +119,7 @@ <if test="locType1 != null"> and loc_type1 = #{locType1} </if> - ORDER BY lev1,bay1,row1 + ORDER BY row1,bay1,lev1 </select> <select id="selectEmptyByLocNos" resultMap="BaseResultMap"> -- Gitblit v1.9.1