From 8193e394e54c37dd17d98638b5a2574bf999fc49 Mon Sep 17 00:00:00 2001 From: db <bindu_bean@163.com> Date: 星期二, 23 九月 2025 10:30:08 +0800 Subject: [PATCH] 初始化 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 21 --------------------- 1 files changed, 0 insertions(+), 21 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 f8594dc..5aea8c5 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -3226,13 +3226,6 @@ } if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) { - -// if ((crnProtocol.getCrnNo()==3 || crnProtocol.getCrnNo()==4) && crnProtocol.getBay()==0 && crnProtocol.getLevel() == 1) { -// continue; -// } -// if ((crnProtocol.getCrnNo()==1 || crnProtocol.getCrnNo()==2) && crnProtocol.getBay()==1 && crnProtocol.getLevel() == 1) { -// continue; -// } if (crnProtocol.getCrnNo()==1 && crnProtocol.getBay()==1 && crnProtocol.getLevel() == 1) { continue; } @@ -3259,19 +3252,6 @@ News.info("鍫嗗灈鏈烘棤浠诲姟鑷姩鍥炲叆搴撳彛寰呮満==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満"); // 鍛戒护涓嬪彂鍖� -------------------------------------------------------------------------- CrnCommand crnCommand = new CrnCommand(); -// if (crnProtocol.getCrnNo()==3 || crnProtocol.getCrnNo()==4){ -// crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� -// crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙� -// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� -// crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡: 鍫嗗灈鏈虹Щ鍔� -// crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓 -// crnCommand.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 -// crnCommand.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰 -// crnCommand.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺� -// crnCommand.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒� -// crnCommand.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞� -// crnCommand.setCommand((short) 1); -// }else { crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙� crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� @@ -3284,7 +3264,6 @@ crnCommand.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒� crnCommand.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞� crnCommand.setCommand((short) 1);//浠诲姟纭浣� -// } if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) { News.error("鍫嗗灈鏈虹Щ鍔ㄥ懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand)); } -- Gitblit v1.9.1