From d3be642a803be434990679926e6e206416a634bd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 19 八月 2020 09:53:30 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/CrnThread.java |  126 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 113 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index c16717e..06b844e 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -9,6 +9,7 @@
 import com.zy.core.ThreadHandler;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.CrnStatusType;
 import com.zy.core.enums.CrnTaskModeType;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.CrnSlave;
@@ -32,7 +33,6 @@
     private SiemensS7Net siemensNet;
     private CrnSlave slave;
     private CrnProtocol crnProtocol;
-
 
     public CrnThread(CrnSlave slave) {
         this.slave = slave;
@@ -90,7 +90,7 @@
     @Override
     public boolean connect() {
         boolean result = false;
-        siemensNet = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
+        siemensNet = new SiemensS7Net(SiemensPLCS.S300, slave.getIp());
         siemensNet.setRack(slave.getRack().byteValue());
         siemensNet.setSlot(slave.getSlot().byteValue());
         OperateResult connect = siemensNet.ConnectServer();
@@ -138,6 +138,16 @@
             crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
             crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
             crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
+
+            /**
+             *   褰撹鍒皊tatus == 90.浠诲姟瀹屾垚绛夊緟WCS纭 鏃�
+             *   涓嬪彂浠诲姟瀹屾垚鎸囦护
+             */
+            if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+                CrnCommand crnCommand = new CrnCommand();
+                crnCommand.setAckFinish((short)1);
+                write(crnCommand);
+            }
         } else {
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
             log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
@@ -165,9 +175,11 @@
         array[8] = command.getDestinationPosZ();
         OperateResult result = siemensNet.Write("DB8.0", array);
         if (result.IsSuccess) {
+            System.out.println(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-            readStatus();
+//            readStatus();
         } else {
+            System.out.println(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
             log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
         }
@@ -189,28 +201,116 @@
     /******************************************************************************************/
     /**************************************** 娴嬭瘯涓撶敤 *****************************************/
     /*****************************************************************************************/
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
         CrnSlave slave = new CrnSlave();
+        slave.setId(1);
         slave.setIp("192.168.6.9");
         slave.setRack(0);
         slave.setSlot(0);
         CrnThread crnThread = new CrnThread(slave);
+        crnThread.connect();
         crnThread.readStatus();
         System.out.println(JSON.toJSONString(crnThread.crnProtocol));
-//        // 鍐�
+        Thread.sleep(3000L);
+
+        // 1.鍏ュ簱 婧愬拰鐩爣閮藉彂
+//        CrnCommand command = new CrnCommand();
+//        command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+//        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+//        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+//        command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
+//        command.setSourcePosX((short) 1);     // 婧愬簱浣嶆帓
+//        command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
+//        command.setSourcePosZ((short) 1);     // 婧愬簱浣嶅眰
+//        command.setDestinationPosX((short) 2);     // 鐩爣搴撲綅鎺�
+//        command.setDestinationPosY((short) 3);     // 鐩爣搴撲綅鍒�
+//        command.setDestinationPosZ((short) 1);     // 鐩爣搴撲綅灞�
+//        crnThread.write(command);
+
+        // 2.鍑哄簱 婧愬拰鐩爣閮藉彂
+//        CrnCommand command = new CrnCommand();
+//        command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+//        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+//        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+//        command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
+//        command.setSourcePosX((short) 2);     // 婧愬簱浣嶆帓
+//        command.setSourcePosY((short) 4);     // 婧愬簱浣嶅垪
+//        command.setSourcePosZ((short) 3);     // 婧愬簱浣嶅眰
+//        command.setDestinationPosX((short) 1);     // 鐩爣搴撲綅鎺�
+//        command.setDestinationPosY((short) 0);     // 鐩爣搴撲綅鍒�
+//        command.setDestinationPosZ((short) 1);     // 鐩爣搴撲綅灞�
+//        crnThread.write(command);
+
+
+//        // 3.搴撲綅绉昏浆   婧愬拰鐩爣閮藉彂 pass
 //        CrnCommand command = new CrnCommand();
 //        command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
 //        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-//        command.setAckFinish((short) 1);  // 浠诲姟瀹屾垚纭浣�
-//        command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡:  搴撲綅绉昏浆
-//        command.setSourcePosX((short)0);     // 婧愬簱浣嶆帓
-//        command.setSourcePosY((short)0);     // 婧愬簱浣嶅垪
-//        command.setSourcePosZ((short)0);     // 婧愬簱浣嶅眰
-//        command.setDestinationPosX((short)0);     // 鐩爣搴撲綅鎺�
-//        command.setDestinationPosY((short)0);     // 鐩爣搴撲綅鍒�
-//        command.setDestinationPosZ((short)0);     // 鐩爣搴撲綅灞�
+//        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);     // 鐩爣搴撲綅灞�
 //        crnThread.write(command);
 
+        // 4.绔欎綅绉昏浆   婧愬拰鐩爣閮藉彂
+//        CrnCommand command = new CrnCommand();
+//        command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+//        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+//        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+//        command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡:  搴撲綅绉昏浆
+//        command.setSourcePosX((short)1);     // 婧愬簱浣嶆帓
+//        command.setSourcePosY((short)0);     // 婧愬簱浣嶅垪
+//        command.setSourcePosZ((short)1);     // 婧愬簱浣嶅眰
+//        command.setDestinationPosX((short)2);     // 鐩爣搴撲綅鎺�
+//        command.setDestinationPosY((short)0);     // 鐩爣搴撲綅鍒�
+//        command.setDestinationPosZ((short)1);     // 鐩爣搴撲綅灞�
+//        crnThread.write(command);
+
+//        // 5.鍥炲師鐐�  涓嶇敤鍙�   pass
+//        CrnCommand command = new CrnCommand();
+//        command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+//        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+//        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+//        command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
+//        command.setSourcePosX((short) 0);     // 婧愬簱浣嶆帓
+//        command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
+//        command.setSourcePosZ((short) 0);     // 婧愬簱浣嶅眰
+//        command.setDestinationPosX((short) 0);     // 鐩爣搴撲綅鎺�
+//        command.setDestinationPosY((short) 0);     // 鐩爣搴撲綅鍒�
+//        command.setDestinationPosZ((short) 0);     // 鐩爣搴撲綅灞�
+//        crnThread.write(command);
+
+//        // 7.鍧愭爣绉昏   鐩爣鍙�   pass
+//        CrnCommand command = new CrnCommand();
+//        command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+//        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+//        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+//        command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
+//        command.setSourcePosX((short) 0);     // 婧愬簱浣嶆帓
+//        command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
+//        command.setSourcePosZ((short) 0);     // 婧愬簱浣嶅眰
+//        command.setDestinationPosX((short) 2);     // 鐩爣搴撲綅鎺�
+//        command.setDestinationPosY((short) 1);     // 鐩爣搴撲綅鍒�
+//        command.setDestinationPosZ((short) 1);     // 鐩爣搴撲綅灞�
+//        crnThread.write(command);
+
+        // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
+//        if (crnThread.crnProtocol.getCrnError2().leftTakeNoneErr
+//                || crnThread.crnProtocol.getCrnError2().rightTakeNoneErr
+//                || crnThread.crnProtocol.getCrnError2().leftPutLoadErr
+//                || crnThread.crnProtocol.getCrnError2().rightPutLoadErr) {
+//            CrnCommand command = new CrnCommand();
+//            command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+//            command.setAckFinish((short) 1);  // 浠诲姟瀹屾垚纭浣�
+//            command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+//            Thread.sleep(3000L);
+//            crnThread.write(command);
+//        }
+
     }
 
 }

--
Gitblit v1.9.1