From 0031e41fb8dd0367c9d6237deda6ca7091523f68 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期日, 30 三月 2025 09:08:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/CommonService.java | 427 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 301 insertions(+), 126 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 47d85bf..c848525 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -127,7 +127,7 @@ RowLastno rowLastno = rowLastnoService.selectById(whsType); RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId()); /** - * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡 + * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞︽贩杞� 5: AGV 6锛氬洓鍚戣溅涓嶆贩杞� 0: 鏈煡 */ switch (rowLastnoType.getType()){ case 1: @@ -142,6 +142,8 @@ return getLocNoRun4(whsType,staDescId,sourceStaNo,matnr,batch,grade,4,locTypeDto,0,mixture); case 5: return getLocNoRun5(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0); + case 6: + return getLocNoRun6(whsType,staDescId,sourceStaNo,matnr,batch,grade,4,locTypeDto,0,mixture); default: log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo); break; @@ -360,7 +362,7 @@ } // 鏇存柊搴撲綅鎺掑彿 if (Cools.isEmpty(locMast)){ - rowLastno.setCurrentRow(curRow); + rowLastno.setCurrentRow((curRow-13)); rowLastnoService.updateById(rowLastno); } } @@ -370,17 +372,12 @@ // 1.鎸夎鍒欐煡鎵惧簱浣� if (Cools.isEmpty(locMast) && crnNo != 0) { List<LocMast> locMasts = null; - if (Utils.isNorth(sourceStaNo)){ - locMasts = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("row1", nearRow) - .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()) - .orderBy("lev1",true).orderBy("bay1",false)); - }else { + locMasts = locMastService.selectList(new EntityWrapper<LocMast>() .eq("row1", nearRow) .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()) .orderBy("lev1",true).orderBy("bay1",true)); - } + for (LocMast locMast1 : locMasts) { if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) { @@ -418,13 +415,13 @@ locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>() .eq("loc_no", shallowLoc).eq("loc_sts", "F").eq("whs_type",rowLastnoType.getType().longValue())); if (!Cools.isEmpty(locMast2)) { - locMast = locMast2; + locMast = locMast1; break; } else { locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>() .eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type",rowLastnoType.getType().longValue())); if (!Cools.isEmpty(locMast2)) { - locMast = locMast2; + locMast = locMast1; break; } } @@ -472,6 +469,9 @@ } public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times,boolean mixture) { + if (mixture){ + throw new CoolException("娣疯浇绂佹鍏ュ簱"); + } if (Cools.isEmpty(matnr)) { //鐗╂枡鍙� matnr = ""; } @@ -534,66 +534,6 @@ throw new CoolException("鏃犲彲鐢ㄥ簱浣�"); } - - // 鐩镐技宸ヤ綔妗f --- 鍚屽ぉ鍚岃鏍肩墿鏂� - if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) { - //鏌ヨ鐩镐技宸ヤ綔妗f - List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo); - int nearbay = 0; //鐩镐技宸ヤ綔妗f 鐩爣搴撲綅鍒� - int nearlev = 0; //鐩镐技宸ヤ綔妗f 鐩爣搴撲綅灞� - for (WrkMast wrkMast:wrkMasts){ - LocMast locMastWrk = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo())); - List<LocMast> locMasts = new ArrayList<>(); - if (locMastWrk.getBay1() >=1 && locMastWrk.getBay1()<=2){ - locMasts = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("gro1", locMastWrk.getGro1()) - .eq("crn_no", 7) - .eq("loc_type1",locTypeDto.getLocType1()) - .orderBy("bay1", true)); - }else if (locMastWrk.getBay1() >=4 && locMastWrk.getBay1()<=12){ - locMasts = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("gro1", locMastWrk.getGro1()) - .eq("crn_no", 7) - .eq("loc_type1",locTypeDto.getLocType1()) - .orderBy("bay1", false)); - }else { - locMasts = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("gro1", locMastWrk.getGro1()) - .eq("crn_no", 7) - .eq("loc_type1",locTypeDto.getLocType1()) - .orderBy("bay1", true)); - } - if (Cools.isEmpty(locMasts)) { - continue; - } - for (LocMast locMastGro1 : locMasts) { - if (mixture){ //娣锋枡鍙厑璁告斁 7 12 14 - if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){ - continue; - } - }else { //涓嶆贩鏂欎笉鍏佽鏀� 7 12 14 - if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){ - continue; - } - } - - if (locMastGro1.getBay1() == 2){ //wcs闂闄愬埗 - continue; - } - if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) { - break; - } - if (locMastGro1.getLocSts().equals("O")){ - locMast = locMastGro1; - break; - } - } - - - } - - } - Wrapper<StaDesc> wrapper = null; StaDesc staDesc = null; BasDevp staNo = null; @@ -628,12 +568,64 @@ // 1.鎸夎鍒欐煡鎵惧簱浣� if (Cools.isEmpty(locMast) && crnNo != 0) { - List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("bay1", nearRow) - .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()) - .eq("crn_no",7) - .eq("loc_type1",locTypeDto.getLocType1()) - .orderBy("lev1",true).orderBy("row1",false));//鏈�娴呭簱浣� + List<LocMast> locMasts = new ArrayList<>(); + int floor = 0; + if (locTypeDto.getLev1() == null){ + if (locTypeDto.getLocType1() == 1){ + int F1count = locMastService.selectCount(new EntityWrapper<LocMast>() + .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()) + .eq("crn_no", 7) + .eq("loc_type1", locTypeDto.getLocType1()) + .eq("lev1", 1)); + if (F1count <= 10) { + int F2count = locMastService.selectCount(new EntityWrapper<LocMast>() + .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()) + .eq("crn_no", 7) + .eq("loc_type1", locTypeDto.getLocType1()) + .eq("lev1", 2)); + if (F2count <= 10) { + throw new CoolException("搴撲綅涓嶈冻"); + }else { + floor = 2; + } + }else { + floor = 1; + } + + }else if (locTypeDto.getLocType1() == 2){ + int F3count = locMastService.selectCount(new EntityWrapper<LocMast>() + .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()) + .eq("crn_no", 7) + .eq("loc_type1", locTypeDto.getLocType1()) + .eq("lev1", 3)); + if (F3count <= 10) { + throw new CoolException("搴撲綅涓嶈冻"); + } + floor = 3; + }else { + throw new CoolException("搴撲綅楂樺害鏁版嵁寮傚父"); + } + } + + if (locTypeDto.getLev1() != null){ + locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("bay1", nearRow) + .in("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()) + .eq("crn_no",7) + .eq("loc_type1",locTypeDto.getLocType1()) + .eq("lev1",locTypeDto.getLev1()).orderBy("row1",false));//鏈�娴呭簱浣� + }else { + if (floor == 0){ + throw new CoolException("搴撲綅宸叉弧"); + } + locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("bay1", nearRow) + .in("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()) + .eq("crn_no",7) + .eq("loc_type1",locTypeDto.getLocType1()) + .eq("lev1",floor).orderBy("row1",false));//鏈�娴呭簱浣� + } + for (LocMast locMast1 : locMasts) { if (locMast != null){ @@ -642,56 +634,33 @@ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) { continue; } - if (Utils.BooleanWhsTypeStaIoType(rowLastno)){ - //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 -// LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); -// if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) { -// locMast = locMast2; -// break; -// } - List<LocMast> locMasts1 = null; - if (curRow < nearRow){ - locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("gro1", locMast1.getGro1()) - .eq("crn_no",7) - .eq("loc_type1",locTypeDto.getLocType1()) - .orderBy("bay1",true)); - if(locMast1.getBay1()>= 4 && locMast1.getBay1()<=12){ - locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("gro1", locMast1.getGro1()) - .eq("crn_no",7) - .eq("loc_type1",locTypeDto.getLocType1()) - .orderBy("bay1",false)); - } - }else { - locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("gro1", locMast1.getGro1()) - .eq("crn_no",7) - .eq("loc_type1",locTypeDto.getLocType1()) - .orderBy("bay1",false)); - } - if (Cools.isEmpty(locMasts1)) { - continue; - } - for (LocMast locMastGro1 : locMasts1) { - if (locMastGro1.getLocSts().equals("F")){ - LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo())); - if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)){ - break; - } - } - if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) { - break; - } - if (locMastGro1.getLocSts().equals("O")){ - locMast = locMastGro1; - break; - } - } - - - + List<LocMast> locMasts1 = null; + if (nearRow == 2 || nearRow ==7 || nearRow == 12){ + locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("gro1", locMast1.getGro1()) + .eq("crn_no",7) + .eq("loc_type1",locTypeDto.getLocType1()) + .orderBy("bay1",true)); + }else { + locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("gro1", locMast1.getGro1()) + .eq("crn_no",7) + .eq("loc_type1",locTypeDto.getLocType1()) + .orderBy("bay1",false)); } + if (Cools.isEmpty(locMasts1)) { + continue; + } + for (LocMast locMastGro1 : locMasts1) { + if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) { + break; + } + if (locMastGro1.getLocSts().equals("O")){ + locMast = locMastGro1; + break; + } + } + } } @@ -842,6 +811,212 @@ return startupDto; } + public StartupDto getLocNoRun6(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times,boolean mixture) { + if (Cools.isEmpty(matnr)) { //鐗╂枡鍙� + matnr = ""; + } + if (Cools.isEmpty(batch)) { //鎵规 + batch = ""; + } + if (Cools.isEmpty(grade)) { //澶囩敤 + grade = ""; + } + + // 鍒濆鍖栧弬鏁� + int crnNo = 0; //鍫嗗灈鏈哄彿 + int nearRow = 0; //鏈�娴呭簱浣嶆帓 + int curRow = 0; //鏈�娣卞簱浣嶆帓 + int rowCount = 0; //杞杞 + LocMast locMast = null; // 鐩爣搴撲綅 + + StartupDto startupDto = new StartupDto(); + RowLastno rowLastno = rowLastnoService.selectById(whsType); + if (Cools.isEmpty(rowLastno)) { + throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�===>搴撲綅瑙勫垯鏈煡"); + } + RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId()); + if (Cools.isEmpty(rowLastnoType)) { + throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�===銆嬪簱浣嶈鍒欑被鍨嬫湭鐭�"); + } + int sRow = rowLastno.getsRow(); + int eRow = rowLastno.geteRow(); + int crnNumber = rowLastno.getCrnQty(); + + // ===============>>>> 寮�濮嬫墽琛� + curRow = rowLastno.getCurrentRow(); + + if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){ + crnNumber = moveCrnNo; + } + + //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿 + for (int i = times; i < crnNumber*2; i++) { + int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber,whsType); + rowCount = locNecessaryParameters[0]; + curRow = locNecessaryParameters[1]; + crnNo = locNecessaryParameters[2]; + nearRow = locNecessaryParameters[3]; + List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("crn_no", crnNo).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())); + if (locMasts.size()<=5){ + times++; + continue; + } + break; + + } + if (crnNo == 0) { + throw new CoolException("鏃犲彲鐢ㄥ簱浣�"); + } + + + // 鐩镐技宸ヤ綔妗f --- 鍚屽ぉ鍚岃鏍肩墿鏂� + if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) { + //鏌ヨ鐩镐技宸ヤ綔妗f + List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo); + int nearbay = 0; //鐩镐技宸ヤ綔妗f 鐩爣搴撲綅鍒� + int nearlev = 0; //鐩镐技宸ヤ綔妗f 鐩爣搴撲綅灞� + for (WrkMast wrkMast:wrkMasts){ + LocMast locMastWrk = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo())); + List<LocMast> locMasts = new ArrayList<>(); + if (locMastWrk.getBay1() >=5 && locMastWrk.getBay1()<=6){ + locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("gro1", locMastWrk.getGro1()) + .eq("crn_no", 7) + .eq("loc_type1",locTypeDto.getLocType1()) + .orderBy("bay1", true)); + }else { + locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("gro1", locMastWrk.getGro1()) + .eq("crn_no", 7) + .eq("loc_type1",locTypeDto.getLocType1()) + .orderBy("bay1", false)); + } + if (Cools.isEmpty(locMasts)) { + continue; + } + for (LocMast locMastGro1 : locMasts) { + if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) { + break; + } + if (locMastGro1.getLocSts().equals("O")){ + locMast = locMastGro1; + break; + } + } + + + } + + } + + Wrapper<StaDesc> wrapper = null; + StaDesc staDesc = null; + BasDevp staNo = null; + + if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) { + // 鑾峰彇鐩爣绔� + wrapper = new EntityWrapper<StaDesc>() + .eq("type_no", staDescId) + .eq("stn_no", sourceStaNo) + .eq("crn_no", crnNo); + staDesc = staDescService.selectOne(wrapper); + if (Cools.isEmpty(staDesc)) { + log.error("鍏ュ簱璺緞涓嶅瓨鍦�:type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo); + crnNo = 0; + }else { + staNo = basDevpService.selectById(staDesc.getCrnStn()); + if (!staNo.getAutoing().equals("Y")) { + log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�"); + crnNo = 0; + } + startupDto.setStaNo(staNo.getDevNo()); + } + } + + // 鏇存柊搴撲綅鎺掑彿 + if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && Cools.isEmpty(locMast)) { + rowLastno.setCurrentRow(curRow); + rowLastnoService.updateById(rowLastno); + } + + // 寮�濮嬫煡鎵惧簱浣� ==============================>> + + // 1.鎸夎鍒欐煡鎵惧簱浣� + if (Cools.isEmpty(locMast) && crnNo != 0) { + List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("bay1", nearRow) + .in("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()) + .eq("crn_no",7) + .eq("loc_type1",locTypeDto.getLocType1()) + .orderBy("lev1",true).orderBy("row1",false));//鏈�娴呭簱浣� + + for (LocMast locMast1 : locMasts) { + if (locMast != null){ + break; + } + if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) { + continue; + } + if (Utils.BooleanWhsTypeStaIoType(rowLastno)){ + List<LocMast> locMasts1 = null; + if (nearRow == 6){ + locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("gro1", locMast1.getGro1()) + .eq("crn_no",7) + .eq("loc_type1",locTypeDto.getLocType1()) + .orderBy("bay1",true)); + }else { + locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("gro1", locMast1.getGro1()) + .eq("crn_no",7) + .eq("loc_type1",locTypeDto.getLocType1()) + .orderBy("bay1",false)); + } + if (Cools.isEmpty(locMasts1)) { + continue; + } + for (LocMast locMastGro1 : locMasts1) { + if (locMastGro1.getLocSts().equals("F")){ + LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo())); + if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)){ + break; + } + } + if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) { + break; + } + if (locMastGro1.getLocSts().equals("O")){ + locMast = locMastGro1; + break; + } + } + } + } + } + + // 閫掑綊鏌ヨ + if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) { + // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊 + if (times < rowCount*2) { + times = times + 1; + return getLocNoRun6(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times,mixture); + } + log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times); + throw new CoolException("娌℃湁绌哄簱浣�"); + } + String locNo = locMast.getLocNo(); + + // 鐢熸垚宸ヤ綔鍙� + int workNo = getWorkNo(0); + // 杩斿洖dto + startupDto.setWorkNo(workNo); + startupDto.setCrnNo(crnNo); + startupDto.setSourceStaNo(sourceStaNo); + startupDto.setLocNo(locNo); + return startupDto; + } + public static String zerofill(String msg, Integer count) { if (msg.length() == count) { return msg; -- Gitblit v1.9.1