From b63790fa580ea78777f16bff6bc79373d675dd10 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期四, 21 八月 2025 16:50:47 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 119 ----------------------------------------------------------- 1 files changed, 0 insertions(+), 119 deletions(-) diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java index a62c8e2..18ec992 100644 --- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java +++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java @@ -17,17 +17,13 @@ import com.zy.common.model.NavigateNode; import com.zy.common.model.enums.NavigationMapType; import com.zy.common.service.CommonService; -import com.zy.common.utils.ForkLiftUtils; import com.zy.common.utils.NavigateUtils; import com.zy.core.News; import com.zy.core.cache.SlaveConnection; import com.zy.core.enums.SlaveType; import com.zy.core.enums.WrkIoType; import com.zy.core.enums.WrkStsType; -import com.zy.core.model.ForkLiftSlave; -import com.zy.core.model.ShuttleSlave; import com.zy.core.model.protocol.*; -import com.zy.core.thread.ForkLiftThread; import com.zy.core.thread.ShuttleThread; import com.zy.system.entity.Config; import com.zy.system.service.ConfigService; @@ -251,27 +247,6 @@ } } - Integer sourceStaNo = null;//灏忚溅鎹㈠眰婧愮珯鐐� - Integer staNo = null;//灏忚溅鎹㈠眰鐩爣绔欑偣 - if (Utils.getLev(locNo) != Utils.getLev(shuttleProtocol.getCurrentLocNo())) { - //鐩爣搴撲綅鍜屽皬杞﹀簱浣嶅浜庝笉鍚屼竴妤煎眰锛岄渶瑕侀�氳繃鎻愬崌鏈鸿皟搴� - //鑾峰彇绌挎杞︽渶杩戜笖绌洪棽鐨勬彁鍗囨満杈撻�佺珯鐐� - ForkLiftStaProtocol liftSta = this.getRecentLiftSta(shuttleNo, Utils.getLev(locNo)); - if (liftSta == null) { - News.info("{}鍙峰皬杞︼紝{}鐩爣搴撲綅锛屾病鏈夊彲鐢ㄧ┖闂茶緭閫佺珯鐐�", shuttleNo, locNo); - return false;//娌℃湁鍙敤涓旂┖闂茬殑杈撻�佺珯鐐� - } - sourceStaNo = liftSta.getStaNo();//婧愮珯鐐� - - ForkLiftStaProtocol targetLiftSta = ForkLiftUtils.getLiftStaByLev(liftSta.getLiftNo(), Utils.getLev(locNo)); - if (targetLiftSta == null) { - News.info("{}鍙峰皬杞︼紝{}鐩爣搴撲綅锛屾病鏈夌洰鏍囩珯鐐�", shuttleNo, locNo); - return false;//娌℃湁鎵惧埌鐩爣绔欑偣 - } - //鐩爣绔欑偣 - staNo = targetLiftSta.getStaNo();//鐩爣绔� - } - // 鑾峰彇宸ヤ綔鍙� int workNo = commonService.getWorkNo(WrkIoType.SHUTTLE_MOVE.id); // 淇濆瓨宸ヤ綔妗� @@ -284,8 +259,6 @@ wrkMast.setShuttleNo(shuttleNo);//绌挎杞﹀彿 wrkMast.setSourceLocNo(shuttleProtocol.getCurrentLocNo()); // 婧愬簱浣� => 灏忚溅褰撳墠搴撲綅鍙� wrkMast.setLocNo(locNo); // 鐩爣搴撲綅 - wrkMast.setSourceStaNo(sourceStaNo);//婧愮珯 - wrkMast.setStaNo(staNo);//鐩爣绔� wrkMast.setAppeTime(now); wrkMast.setModiTime(now); boolean res = wrkMastService.insert(wrkMast); @@ -419,98 +392,6 @@ return levCount < Integer.parseInt(config.getValue()); - } - - /** - * 鑾峰彇绌挎杞︽渶杩戜笖绌洪棽鐨勬彁鍗囨満杈撻�佺珯鐐� - */ - public ForkLiftStaProtocol getRecentLiftSta(Integer shuttleNo, Integer targetLev) { - //鑾峰彇鍥涘悜绌挎杞︾嚎绋� - ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo); - if (shuttleThread == null) { - return null; - } - ShuttleProtocol shuttleProtocol = shuttleThread.getStatus(); - if (shuttleProtocol == null) { - return null; - } - - List<DeviceConfig> forkliftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>() - .eq("device_type", String.valueOf(SlaveType.ForkLift))); - - //鑾峰彇灏忚溅鍚屼竴妤煎眰鐨勭珯鐐� - ArrayList<ForkLiftStaProtocol> list = new ArrayList<>(); - int lev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//灏忚溅妤煎眰 - for (DeviceConfig device : forkliftList) { - ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, device.getDeviceNo()); - if (forkLiftThread == null) { - continue; - } - ForkLiftProtocol forkLiftProtocol = forkLiftThread.getStatus(); - if (forkLiftProtocol == null) { - continue; - } - if (!forkLiftThread.isIdle()) { - continue; - } - - ForkLiftStaProtocol forkLiftStaProtocol = ForkLiftUtils.getLiftStaByLev(device.getDeviceNo(), lev); - if (forkLiftStaProtocol == null) { - continue; - } - - //鍒ゆ柇褰撳墠灞傛槸鍚︽棤鎵樼洏 - if (forkLiftStaProtocol.getHasTray()) { - continue; - } - - if (forkLiftStaProtocol.getHasCar()) { - continue; - } - - //鍒ゆ柇鐩爣妤煎眰绔欑偣鏄惁鏃犳墭鐩� - ForkLiftStaProtocol targetLiftStaProtocol = ForkLiftUtils.getLiftStaByLev(device.getDeviceNo(), targetLev); - if (targetLiftStaProtocol == null) { - continue; - } - - if (targetLiftStaProtocol.getHasTray()) { - continue;//鏈夋墭鐩樿烦杩� - } - - if (targetLiftStaProtocol.getHasCar()) { - continue; - } - - list.add(forkLiftStaProtocol); - } - - if (list.isEmpty()) { - return null; - } - - String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅浣嶇疆 - Integer recentAllDistance = 9999999; - ForkLiftStaProtocol recentSta = null;//鏈�杩戠珯鐐� - //鎼滅储璺濈灏忚溅鏈�杩戠殑绔欑偣 - for (ForkLiftStaProtocol forkLiftStaProtocol : list) { - Integer staNo = forkLiftStaProtocol.getStaNo();//绔欑偣鍙� - String locNo = forkLiftStaProtocol.getLocNo();//绔欑偣搴撲綅鍙� - - //褰撳墠绌挎杞︾嚎绋嬪埌鐩爣鍦扮偣璺濈 - List<NavigateNode> currentShuttlePath = navigateUtils.calc(currentLocNo, locNo, NavigationMapType.getMapTypes(NavigationMapType.NORMAL), Utils.getShuttlePoints(shuttleNo, Utils.getLev(currentLocNo)), null);//浣跨敤姝e父閫氶亾鍦板浘 - if (currentShuttlePath == null) { - continue; - } - Integer currentAllDistance = navigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁$畻褰撳墠璺緞琛岃蛋鎬昏窛绂� - if (currentAllDistance < recentAllDistance) { - //濡傛灉褰撳墠妤煎眰鐨勮溅璺緞鏇村皬锛屽垯鏇存柊鏈�杩戠珯鐐� - recentSta = forkLiftStaProtocol; - recentAllDistance = currentAllDistance; - } - } - - return recentSta; } /** -- Gitblit v1.9.1