From fb956794ce68616b418372a7c780e6e068b5d038 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 30 七月 2024 18:40:31 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index 9587987..6308a61 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -8,11 +8,11 @@ import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.SpringUtils; -import com.zy.asrs.entity.BasCrnOpt; -import com.zy.asrs.entity.BasCrnp; -import com.zy.asrs.service.BasCrnOptService; -import com.zy.asrs.service.BasCrnpService; -import com.zy.common.utils.News; +import com.zy.entity.BasCrnOpt; +import com.zy.entity.BasCrnp; +import com.zy.service.BasCrnOptService; +import com.zy.service.BasCrnpService; +import com.zy.utils.News; import com.zy.core.CrnThread; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; @@ -280,13 +280,14 @@ array[9] = command.getCommand(); // array[10] = 0; //澶囩敤1 - boolean[] array2 = new boolean[1]; - array2[0] = command.isTraySize(); +// boolean[] array2 = new boolean[1]; +// array2[0] = command.isTraySize(); OperateResult result = siemensNet.Write("DB100.0", array); - OperateResult result2 = siemensNet.Write("DB100.22", array2); +// OperateResult result2 = siemensNet.Write("DB100.22", array2); News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array); - if(!result.IsSuccess || !result2.IsSuccess){ +// if(!result.IsSuccess || !result2.IsSuccess){ + if(!result.IsSuccess){ News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command)); MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command)); Thread.sleep(100); @@ -431,7 +432,7 @@ public static void main(String[] args) throws InterruptedException { CrnSlave slave = new CrnSlave(); slave.setId(1); - slave.setIp("192.168.6.9"); + slave.setIp("10.10.10.1"); slave.setRack(0); slave.setSlot(0); SiemensCrnThread crnThread = new SiemensCrnThread(slave); @@ -472,15 +473,15 @@ // // 3.搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂 pass // CrnCommand command = new CrnCommand(); // command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙� -// command.setTaskNo((short) 0); // 宸ヤ綔鍙� +// command.setTaskNo((short) 2); // 宸ヤ綔鍙� // command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� // command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆 // command.setSourcePosX((short)2); // 婧愬簱浣嶆帓 -// command.setSourcePosY((short)2); // 婧愬簱浣嶅垪 -// command.setSourcePosZ((short)3); // 婧愬簱浣嶅眰 -// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺� -// command.setDestinationPosY((short)4); // 鐩爣搴撲綅鍒� -// command.setDestinationPosZ((short)4); // 鐩爣搴撲綅灞� +// command.setSourcePosY((short)1); // 婧愬簱浣嶅垪 +// command.setSourcePosZ((short)1); // 婧愬簱浣嶅眰 +// command.setDestinationPosX((short)3); // 鐩爣搴撲綅鎺� +// command.setDestinationPosY((short)1); // 鐩爣搴撲綅鍒� +// command.setDestinationPosZ((short)1); // 鐩爣搴撲綅灞� // crnThread.write(command); // 4.绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂 -- Gitblit v1.9.1