From 7fc050e4bcf6e1eec5ed40605dc19e92352a427c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期四, 22 十二月 2022 13:10:40 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 211 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 838f9b4..403ae30 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -42,10 +42,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -667,6 +664,8 @@ } // 搴撲綅绉昏浆 // this.locToLoc(crn, crnProtocol); + // 婕旂ず + this.steMoveDemo(crn, crnProtocol); } } } @@ -1407,6 +1406,34 @@ LocMast locMast = locMastService.selectById(locNo); int lev = locMast.getLev1(); int bay = locMast.getBay1(); + int levAbs = Math.abs(lev - steProtocol.getLev()); + int bayAbs = Math.abs(bay - steProtocol.getBay()); + if (val == 0) { + val = levAbs + bayAbs; + result = steThread; + } else { + if ((levAbs + bayAbs) < val) { + val = levAbs + bayAbs; + result = steThread; + } + } + } + return result; + } + + public SteThread queryIdleCar(CrnProtocol crnProtocol) { + List<BasSte> basStes = basSteService.selectList(new EntityWrapper<>()); + int val = 0; + SteThread result = null; + for (BasSte basSte : basStes) { + // 鑾峰彇绌挎杞︿俊鎭� + SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, basSte.getSteNo()); + SteProtocol steProtocol = steThread.getSteProtocol(); + if (steProtocol == null) { continue; } + if (!steProtocol.isIdle()) { continue; } + if (steProtocol.getRow() == 1) { continue;} + int lev = crnProtocol.getLevel(); + int bay = crnProtocol.getBay(); int levAbs = Math.abs(lev - steProtocol.getLev()); int bayAbs = Math.abs(bay - steProtocol.getBay()); if (val == 0) { @@ -3229,5 +3256,185 @@ } } + public List<String> crn2DemoLocs = new ArrayList<String>(); public String crn2LastLoc = ""; + public synchronized void demo() { + if (Cools.isEmpty(crn2DemoLocs)) { + crn2DemoLocs = locMastService.getDemoNextLoc(2); + } + for (CrnSlave crn : slaveProperties.getCrn()) { + if (!crn.getDemo()) { + continue; + } + // 蹇呴』涓烘紨绀虹姸鎬� + CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); + CrnProtocol crnProtocol = crnThread.getCrnProtocol(); + if (crnProtocol == null) { + continue; + } + + // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛� + if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) { + + // filter + if (wrkChargeService.selectCount(new EntityWrapper<WrkCharge>() + .eq("crn_no", crn.getId()).between("wrk_sts", 31, 36)) > 0) { + continue; + } + + SteThread steThread = queryIdleCar(crnProtocol); + if (Cools.isEmpty(steThread)) { + log.warn("娌℃湁绌洪棽鐨勫皬杞﹁繘琛屾紨绀哄姛鑳�"); + continue; + } + int steNo = steThread.getSlave().getId(); + SteProtocol steProtocol = steThread.getSteProtocol(); + BasSte basSte = basSteService.selectById(steNo); + if (Cools.isEmpty(steProtocol, basSte)) { continue; } + + // 鍙湁褰撶┛姊溅绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛� + if (steProtocol.isIdle()) { + + String locNo = null; + Iterator<String> iterator = crn2DemoLocs.iterator(); + while (iterator.hasNext()) { + String next = iterator.next(); + String lastLoc = crn2LastLoc; + if (!Cools.isEmpty(lastLoc)) { + if (!lastLoc.substring(2, 7).equals(next.substring(2, 7)) + || !Utils.getGroupRow(lastLoc, true).equals(Utils.getGroupRow(next, true))) { + locNo = next; + iterator.remove(); + break; + } else { + iterator.remove(); + } + } else { + locNo = next; + iterator.remove(); + break; + } + + } + if (!Cools.isEmpty(locNo)) { + crn2LastLoc = locNo; + } + + log.info("{}鍙峰爢鍨涙満瀵箋}搴撲綅杩涜婕旂ず", crn.getId(), locNo); + + String sourceLocNo = Utils.getLocNo(steProtocol.getRow(), steProtocol.getBay(), steProtocol.getLev()); + + WrkCharge wrkCharge = new WrkCharge(); + wrkCharge.setCrnNo(crn.getId()); + wrkCharge.setSteNo(steNo); + wrkCharge.setWrkNo(commonService.getChargeWorkNo(5)); + wrkCharge.setWrkSts(31L); // 31.鐢熸垚婕旂ずID + wrkCharge.setIoPri((double) 10); + wrkCharge.setSourceLocNo(sourceLocNo); + wrkCharge.setLocNo(locNo); + wrkCharge.setMemo("demo"); + if (!wrkChargeService.insert(wrkCharge)) { + log.error("鐢熸垚婕旂ず浠诲姟澶辫触锛屽爢鍨涙満鍙凤細{}锛屽皬杞︼細{}锛屾簮搴撲綅锛歿}锛岀洰鏍囧簱浣嶏細{}", crn.getId(), steNo, sourceLocNo, locNo); + } + } + } + } + } + + /** + * 婕旂ず鍙栬揣 + */ + private void steMoveDemo(CrnSlave slave, CrnProtocol crnProtocol) { + // 鑾峰彇宸ヤ綔妗d俊鎭� + WrkCharge wrkCharge = wrkChargeService.selectOne(new EntityWrapper<WrkCharge>().eq("crn_no", slave.getId()) + .in("wrk_sts", 31, 33, 35)); + if (null == wrkCharge) { + return; + } + SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo()); + SteProtocol steProtocol = steThread.getSteProtocol(); + if (null == steProtocol) { return; } + if (steProtocol.isIdle()) { + // 31.鐢熸垚婕旂ずID + if (wrkCharge.getWrkSts() == 31L) { + this.letCarBeReady(wrkCharge, steProtocol.getSteNo().intValue()); + wrkCharge.setWrkSts(32L); + wrkCharge.setModiTime(new Date()); + if (!wrkChargeService.updateById(wrkCharge)) { + log.error("淇敼婕旂ず浠诲姟{}宸ヤ綔妗� 31.鐢熸垚婕旂ずID ==>> 32.灏忚溅璧拌 澶辫触!", wrkCharge.getWrkNo()); + } + // 33.灏忚溅寰呮惉 + } else if (wrkCharge.getWrkSts() == 33L) { + if (steProtocol.isLoading()) { + return; + } + LocMast locMast = locMastService.selectById(wrkCharge.getLocNo()); + // 鍫嗗灈鏈哄懡浠や笅鍙戝尯 -------------------------------------------------------------------------- + CrnCommand crnCommand = new CrnCommand(); + crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 宸ヤ綔鍙� + crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� + crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆 + crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue()); // 婧愬簱浣嶆帓 + crnCommand.setSourcePosY(steProtocol.getBay()); // 婧愬簱浣嶅垪 + crnCommand.setSourcePosZ(steProtocol.getLev()); // 婧愬簱浣嶅眰 + crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo()).shortValue()); // 鐩爣搴撲綅鎺� + crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒� + crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞� + if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) { + log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand)); + } else { + // 淇敼绌挎杞﹁繍琛屼腑鎺掑垪灞� + steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo()), locMast.getBay1(), locMast.getLev1()); + // 淇敼宸ヤ綔妗g姸鎬� 33.灏忚溅寰呮惉 => 34.鍚婅溅鎼繍 + Date now = new Date(); + wrkCharge.setWrkSts(34L); + wrkCharge.setCrnStrTime(now); + wrkCharge.setModiTime(now); + if (!wrkChargeService.updateById(wrkCharge)) { + log.error("淇敼婕旂ず浠诲姟{}宸ヤ綔妗� 33.灏忚溅寰呮惉 => 34.鍚婅溅鎼繍 澶辫触!", wrkCharge.getWrkNo()); + } + } + // 35.灏忚溅灏辩华 + } else if (wrkCharge.getWrkSts() == 35L) { + + int steNo = steProtocol.getSteNo().intValue(); + if (!basSteService.updatePakMk(steNo, "Y")) { + log.error("淇敼绌挎杞︿綔涓氱姸鎬� 澶辫触锛侊紒锛岀┛姊溅={}", steNo); + return; + } + + // 鍛戒护涓嬪彂鍖� -------------------------------------------------------------------------- + SteCommand steCommand = new SteCommand(); + steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙� + steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙� + SteTaskModeType originByLoc = SteTaskModeType.findOriginByLoc(steProtocol.getRow()); + if (originByLoc.equals(SteTaskModeType.GO_ORIGIN)) { + originByLoc = SteTaskModeType.BACK_ORIGIN; + } else if (originByLoc.equals(SteTaskModeType.BACK_ORIGIN)) { + originByLoc = SteTaskModeType.GO_ORIGIN; + } else { + return; + } + steCommand.setTaskMode(originByLoc); + + steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue()); + steCommand.setBay(steProtocol.getBay()); + steCommand.setLev(steProtocol.getLev()); + + if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) { + log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand)); + } else { + // 淇敼宸ヤ綔妗g姸鎬� 35.灏忚溅灏辩华 => 36.灏忚溅璧拌 + wrkCharge.setWrkSts(36L); + wrkCharge.setModiTime(new Date()); + if (!wrkChargeService.updateById(wrkCharge)) { + log.error("淇敼婕旂ず浠诲姟{}宸ヤ綔妗� 35.灏忚溅灏辩华 => 36.灏忚溅璧拌 澶辫触!", wrkCharge.getWrkNo()); + } + } + } + } + + } + } -- Gitblit v1.9.1