From 86e5cfe90f800ba197c466fdd659c65873a813e1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 23 十一月 2023 17:04:08 +0800
Subject: [PATCH] #堆垛机出入库

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  165 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 132 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6f43d73..1c4f054 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,11 +8,13 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.TaskStatusType;
 import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.CommandInfoService;
-import com.zy.asrs.service.DeviceErrorService;
+import com.zy.asrs.entity.CommandInfoLog;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.service.*;
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
@@ -44,9 +46,28 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
-    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);add(110);add(111);add(112);
-        add(201);add(202);add(203);add(204);add(205);add(206);add(207);add(208);add(209);add(210);add(211);add(212);
+    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
+        add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);add(110);add(111);
+        add(112);add(113);add(114);add(115);add(116);add(117);add(118);add(119);add(120);add(121);add(122);add(123);
+    }};
+    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+        add(200);add(201);add(202);add(203);
+        add(204);add(205);add(206);add(207);
+        add(208);add(209);add(210);add(211);
+        add(212);add(213);add(214);add(215);
+        add(216);add(217);add(218);add(219);
+        add(220);add(221);add(222);add(223);
+        add(224);add(225);add(226);add(227);
+        add(228);add(229);add(230);add(231);
+        add(232);add(233);add(234);add(235);
+    }};
+    public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
+        add(300);add(301);add(302);add(303);
+        add(304);add(305);add(306);add(307);
+    }};
+    public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
+        add(400);add(401);add(402);add(403);
+        add(404);add(405);add(406);add(407);
     }};
 
     /**
@@ -64,6 +85,20 @@
      */
     public IoModeType ioModeOf2F = IoModeType.NONE;
 //    public IoModeType ioMode = IoModeType.NONE;
+    private ArrayList<Integer> getStaNo() {
+        switch (slave.getId()) {
+            case 1:
+                return staNos1;
+            case 2:
+                return staNos2;
+            case 3:
+                return staNos3;
+            case 4:
+                return staNos4;
+            default:
+                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+        }
+    }
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -102,6 +137,33 @@
         }
     }
 
+    /**
+     * 鍒濆鍖栫珯鐐圭姸鎬�
+     */
+    private void initSite() {
+        ArrayList<Integer> staNos = getStaNo();
+        // 绔欑偣缂栧彿
+        for (Integer siteId : staNos) {
+            StaProtocol staProtocol = station.get(siteId);
+            if (null == staProtocol) {
+                staProtocol = new StaProtocol();
+                staProtocol.setSiteId(siteId);
+                station.put(siteId, staProtocol);
+            }
+            staProtocol.setWorkNo((short) 0);    // ID
+            staProtocol.setAutoing(false);      // 鑷姩
+            staProtocol.setLoading(false);      // 鏈夌墿
+            staProtocol.setInEnable(false);     // 鍙叆
+            staProtocol.setOutEnable(false);    // 鍙嚭
+            staProtocol.setEmptyMk(false);      // 绌烘澘淇″彿
+            staProtocol.setStaNo((short) 0);     // 鐩爣绔�
+
+            if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                staProtocol.setPakMk(true);
+            }
+        }
+    }
+
     @Override
     public boolean connect() {
         boolean result = false;
@@ -116,8 +178,9 @@
         } else {
             OutputQueue.DEVP.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("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-            deviceErrorService.addDeviceError("devp", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触");
+//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+//            deviceErrorService.addDeviceError("devp", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触");
+            initSite();
         }
         siemensS7Net.ConnectClose();
         return result;
@@ -129,6 +192,7 @@
     private void read() throws InterruptedException {
 //        // 鏇存柊鍏ュ嚭搴撴ā寮�
 //        updateIoMode();
+        ArrayList<Integer> staNos = getStaNo();
         int staNoSize = staNos.size();
         OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
         if (result.IsSuccess) {
@@ -147,7 +211,7 @@
         }
 
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize*2));
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
         if (result1.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -182,23 +246,23 @@
 //
 //            }
 
-        //RGV鍙拌溅浣嶇疆
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)4);
-        if (result3.IsSuccess) {
-            for (int i = 0; i < 2; i++) {
-                Integer siteId = i==0 ? 112 : 212; // 绔欑偣缂栧彿
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2)));
-//                String aa = staProtocol.getNearbySta();
-//                System.out.println(siteId + "===>>" + staProtocol.getNearbySta());
-            }
-        }
+//        //RGV鍙拌溅浣嶇疆
+//        Thread.sleep(200);
+//        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.0",(short)4);
+//        if (result3.IsSuccess) {
+//            for (int i = 0; i < 2; i++) {
+//                Integer siteId = i==0 ? 1 : 2; // 绔欑偣缂栧彿
+//                StaProtocol staProtocol = station.get(siteId);
+//                if (null == staProtocol) {
+//                    staProtocol = new StaProtocol();
+//                    staProtocol.setSiteId(siteId);
+//                    station.put(siteId, staProtocol);
+//                }
+//                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2)));
+////                String aa = staProtocol.getNearbySta();
+////                System.out.println(siteId + "===>>" + staProtocol.getNearbySta());
+//            }
+//        }
 
 //        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
 //        if (result2.IsSuccess) {
@@ -244,20 +308,34 @@
         if (null == staProtocol) {
             return;
         }
+        ArrayList<Integer> staNos = getStaNo();
+
         int index = staNos.indexOf(staProtocol.getSiteId());
         short[] array = new short[2];
         array[0] = staProtocol.getWorkNo();
         array[1] = staProtocol.getStaNo();
 //        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
 
+        //鏇存柊鍛戒护鏃ュ織
+        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
         CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
-        CommandInfo commandInfo = new CommandInfo();
-        commandInfo.setWrkNo(staProtocol.getWorkNo().intValue());
-        commandInfo.setCommandStatus(1);
-        commandInfo.setStartTime(new Date());
-        commandInfo.setDevice("devp");
-        commandInfo.setCommand(JSON.toJSONString(staProtocol));
-        commandInfoService.insert(commandInfo);
+        CommandInfo commandInfo = commandInfoService.selectById(staProtocol.getCommandId());
+        CommandInfoLog commandInfoLog = new CommandInfoLog();
+        if (commandInfo != null) {
+            commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+            commandInfoLog.setId(null);
+        }else {
+            Date now = new Date();
+            commandInfoLog.setCommand(JSON.toJSONString(staProtocol));
+            commandInfoLog.setCommandStatus(3);
+            commandInfoLog.setStartTime(now);
+            commandInfoLog.setExecuteTime(now);
+            commandInfoLog.setCompleteTime(now);
+            commandInfoLog.setDevice(SlaveType.Devp.toString());
+            commandInfoLog.setWrkNo(9999);
+            commandInfoLog.setTaskNo("9999");
+            commandInfoLog.setCommandDesc("鎵嬪姩鍛戒护");
+        }
 
         OperateResult writeResult;
         //浠诲姟涓嬪彂娆℃暟
@@ -266,6 +344,10 @@
         boolean writeFlag = false;
         while(writeCount < 5){
             writeResult = siemensS7Net.Write("DB100." + index*4, array);    // 宸ヤ綔鍙枫�佺洰鏍囩珯
+            //鏇存柊鎸囦护鏃ュ織
+            commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
+            commandInfoLogService.insert(commandInfoLog);
+
             if(writeResult.IsSuccess){
                 Thread.sleep(200);
                 OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*4, (short)4);
@@ -288,12 +370,20 @@
                     OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
                             slave.getId(), JSON.toJSON(staProtocol), writeCount));
                     log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
+                    //鏇存柊鎸囦护鏃ュ織
+                    commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
+                    commandInfoLogService.insert(commandInfoLog);
                 }
             } else {
                 writeCount++;
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
                         slave.getId(), JSON.toJSON(staProtocol),writeCount));
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
+                //鏇存柊鎸囦护鏃ュ織
+                commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
+                commandInfoLogService.insert(commandInfoLog);
             }
             Thread.sleep(200);
         }
@@ -319,6 +409,14 @@
             staProtocol = station.get(siteId);
             if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
                 staProtocol.setPakMk(true);
+            }
+
+            //鏇存柊浠诲姟姝ュ簭
+            TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+            TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
+            if (taskWrk != null) {
+                taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
+                taskWrkService.updateById(taskWrk);
             }
         }
 
@@ -402,6 +500,7 @@
     }
 
     public static void main(String[] args) {
+        ArrayList<Integer> staNos = staNos1;
         System.out.println(staNos.indexOf(129));
         System.out.println(staNos.size());
         for (int i = 0; i<staNos.size(); i++) {

--
Gitblit v1.9.1