From 1da55d544dffc8d8b2e88efb4532776e71b0b11c Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 15 九月 2023 16:39:09 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java index f21a838..917c4cd 100644 --- a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java +++ b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java @@ -188,6 +188,17 @@ return false; } + Integer staNo = null; + if (Utils.getLev(locNo) == shuttleProtocol.getPoint().getZ()) { + //鐩爣搴撲綅鍜屽皬杞﹀簱浣嶅浜庝笉鍚屼竴妤煎眰锛岄渶瑕侀�氳繃鎻愬崌鏈鸿皟搴� + //鑾峰彇绌挎杞︽渶杩戜笖绌洪棽鐨勬彁鍗囨満杈撻�佺珯鐐� + BasDevp liftSta = this.getRecentLiftSta(shuttleNo); + if (liftSta == null) { + return false;//娌℃湁鍙敤涓旂┖闂茬殑杈撻�佺珯鐐� + } + staNo = liftSta.getDevNo(); + } + // 鑾峰彇宸ヤ綔鍙� int workNo = commonService.getWorkNo(0); // 淇濆瓨宸ヤ綔妗� @@ -200,6 +211,7 @@ wrkMast.setShuttleNo(shuttleNo);//绌挎杞﹀彿 wrkMast.setSourceLocNo(shuttleProtocol.getCurrentLocNo()); // 婧愬簱浣� => 灏忚溅褰撳墠搴撲綅鍙� wrkMast.setLocNo(locNo); // 鐩爣搴撲綅 + wrkMast.setStaNo(staNo);//鐩爣绔� wrkMast.setPicking("N"); // 鎷f枡 wrkMast.setExitMk("N"); // 閫�鍑� wrkMast.setLinkMis("N"); -- Gitblit v1.9.1