From 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 05 六月 2025 14:15:07 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/common/service/CommonService.java | 712 +++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 591 insertions(+), 121 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 1986fe9..6b0a0a8 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -2,24 +2,50 @@ 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.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.StartupDto; -import com.zy.common.model.enums.WorkNoType; +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.List; +import java.util.*; /** * 璐ф灦鏍稿績鍔熻兘 * Created by vincent on 2020/6/11 */ +@Slf4j @Service public class CommonService { + + public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{ + add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10); + add(11);add(12);add(13);add(14);add(15);add(16);add(17); + }}; + 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 private WrkMastService wrkMastService; @@ -37,10 +63,16 @@ private LocMastService locMastService; @Autowired private LocDetlService locDetlService; + @Autowired + private SlaveProperties slaveProperties; + @Autowired + private MatService matService; + @Autowired + private LocRuleService locRuleService; /** * 鐢熸垚宸ヤ綔鍙� - * @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷f枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999 + * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬 * @return workNo(宸ヤ綔鍙�) */ public int getWorkNo(Integer wrkMk) { @@ -48,25 +80,14 @@ if (Cools.isEmpty(wrkLastno)) { throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); } - - // 绫诲瀷 - switch (wrkMk) { - case 0: // 鍏ュ簱 1 - 3000 - break; - case 1: // 鎷f枡/骞舵澘/鐩樼偣 3001 - 6000 - break; - case 2: // 鍑哄簱 6001 -9000 - break; - case 3: // 鍏朵粬 9001 -9999 - break; - default: - break; - } - - int workNo = wrkLastno.getWrkNo(); + int workNo = 0; + // 鍏ュ嚭搴撶被鍨� + workNo = wrkLastno.getWrkNo(); int sNo = wrkLastno.getSNo(); int eNo = wrkLastno.getENo(); + workNo = workNo>=eNo ? sNo : workNo+1; + while (true) { WrkMast wrkMast = wrkMastService.selectById(workNo); if (null != wrkMast) { @@ -75,12 +96,10 @@ break; } } - // 淇敼搴忓彿璁板綍 if (workNo > 0){ wrkLastno.setWrkNo(workNo); wrkLastnoService.updateById(wrkLastno); } - // 妫�楠� if (workNo == 0) { throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳"); } else { @@ -91,114 +110,541 @@ return workNo; } - /** - * 妫�绱㈠簱浣嶅彿 - * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋� - * @param staDescId 璺緞ID - * @param sourceStaNo 婧愮珯 - * @param matNos 鐗╂枡鍙烽泦鍚� - * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿 - */ - public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) { - StartupDto startupDto = new StartupDto(); - // 鐢熸垚宸ヤ綔鍙� - int workNo = getWorkNo(WorkNoType.getWorkNoType(staDescId)); - startupDto.setWorkNo(workNo); + 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, Integer matTypeIn,List<LocMast> locMastList) { + int start; + int end; + Integer matType = null;//鐗╂枡绫诲瀷 + Integer crnNo = 0; + //鏍规嵁鍏ュ簱绔欙紝鍐冲畾鎼滅储鎸囧畾鍫嗗灈鏈� + ArrayList<Integer> crnNos = new ArrayList<>(); + //鏍规嵁鍏ュ簱绔欙紝鎵惧埌搴撲綅缁勬渶鍐呬晶鎺� + ArrayList<Integer> rows = new ArrayList<>(); + switch (sourceStaNo) { + case 103://103鍏ュ簱绔� + case 113://103鍏ュ簱绔� + whsType = 1; + start = 1; + end = 14; + + //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://203鍏ュ簱绔� + case 213://203鍏ュ簱绔� + whsType = 2; + start = 8; + end = 21; + + //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("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳"); + } RowLastno rowLastno = rowLastnoService.selectById(whsType); if (Cools.isEmpty(rowLastno)) { throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); } - if (whsType == 1 || whsType == 2){ - 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; + // 鐩爣搴撲綅 + LocMast locMast = null; - // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋� - if (null == locMast) { - // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙� todo:luxiaotao - if (curRow == sRow) { - curRow = eRow; - } else { - curRow = sRow; - } - crnNo = whsType; -// Shelves shelves = new Shelves(rowCount, crn_qty); -// curRow = shelves.start(curRow); -// if (curRow < 0) { -// throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳"); -// } -// for (List<Integer> node : shelves.nodes){ -// if (node.contains(curRow)) { -// crnNo = shelves.nodes.indexOf(node) + 1; -// break; -// } -// } - } + boolean sign = false; - basCrnpService.checkSiteStatus(crnNo); - // 鑾峰彇鐩爣绔� - Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() - .eq("type_no", staDescId) - .eq("stn_no", sourceStaNo) - .eq("crn_no", crnNo); - StaDesc staDesc = staDescService.selectOne(wrapper); - if (Cools.isEmpty(staDesc)) { - throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�"); - } - BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn()); - int inQty = staNo.getInQty()==null?0:staNo.getInQty(); - if (staNo.getAutoing().equals("Y") && inQty<2) { - // 鏌ユ壘搴撲綅 - if (locMast == null) { - locMast = locMastService.queryFreeLocMast(curRow); - } - if (Cools.isEmpty(locMast)) { - throw new CoolException("娌℃湁绌哄簱浣�"); - } - String locNo = locMast.getLocNo(); - - // 鏇存柊搴撲綅鎺掑彿 - rowLastno.setCurrentRow(curRow); - rowLastnoService.updateById(rowLastno); - - // 杩斿洖dto - startupDto.setCrnNo(crnNo); - startupDto.setSourceStaNo(sourceStaNo); - startupDto.setStaNo(staNo.getDevNo()); - startupDto.setLocNo(locNo); - } else { - throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�"); - } - } else { - throw new CoolException(rowLastno.getWhsType()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤"); + // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 + locMast = getLocNoStep1(staDescId, locTypeDto, start, end); + if (locMast != null) { + //鎵惧埌搴撲綅锛岃繑鍥瀌to + sign=true; } - return startupDto; + + //3鍙峰彲浠ュ叆搴撳墠蹇呴』鎵撳紑鎺у埗 + if (!Cools.isEmpty(matNos)) { + for (String matNo : matNos) { + Mat mat = matService.selectByMatnr(matNo); + 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 (!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鍏煎浠g爜锛屽悗鏈熷簱浣嶈鍒欑鍚堣姹傚悗鍙垹闄�------------------------ +// //濡傛灉浠ヤ笂閮芥壘涓嶅埌搴撲綅锛屽垯寮哄埗鎼滅储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鍏煎浠g爜end--------------------- + + throw new CoolException("800妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳"); } - public static void main(String[] args) { - System.out.println(Arith.remainder(1, 4)); - System.out.println("0200201".substring(0, 2)); - String locNo = "0800201"; - int row = Integer.parseInt(locNo.substring(0, 2)); - double remainder = Arith.remainder(row, 4); - int targetRow; - if (remainder == 1) { - // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣� - targetRow = row + 1; - } else if (remainder == 0) { - // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣� - targetRow = row - 1; - } else { - return; + // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 + 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)); + if (locMasts.size() > 0) { + for (LocMast loc : locMasts) { + List<String> groupLoc = Utils.getGroupLoc(loc.getLocNo()); + LocMast locMast0 = locMastService.findOutMost(groupLoc); + if (null != locMast0) { + // 娴呭簱浣嶇鍚堝昂瀵告娴� + if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) { + // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父 + if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { + // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� + if (locMastService.checkEmptyCount(locMast0, 5)) { + locMast = locMast0; + break; + } + } + } + } + } + } } - String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2); - System.out.println(zerofill); + + 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, 5)) { + if (!locMastList.contains(locMast0)){ + locMast = locMast0; + flag = true; + break; + } + } + } + } + } + } + if (flag) { + break; + } + } + } + + 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", locMast.getCrnNo()); + StaDesc staDesc = staDescService.selectOne(wrapper); + if (Cools.isEmpty(staDesc)) { + 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() + "涓嶅彲鐢�"); + } + + String locNo = locMast.getLocNo(); + + // 鐢熸垚宸ヤ綔鍙� + int workNo = getWorkNo(0); + + // 杩斿洖dto + StartupDto startupDto = new StartupDto(); + startupDto.setWorkNo(workNo); + startupDto.setCrnNo(locMast.getCrnNo()); + startupDto.setSourceStaNo(sourceStaNo); + startupDto.setStaNo(staNo.getDevNo()); + startupDto.setLocNo(locNo); + return startupDto; } public static String zerofill(String msg, Integer count) { @@ -215,4 +661,28 @@ } } -} \ No newline at end of file + public int getCurRow(int curRow){ + switch (curRow){ + case 1: + case 2: + case 8: + case 9: + case 10: + case 15: + case 16: + case 17: + return curRow+1; + case 5: + case 6: + case 7: + case 13: + case 14: + case 20: + case 21: + return curRow-1; + default: + return 0; + } + } + +} -- Gitblit v1.9.1