From 40d95599c1ac6ef89d465e031132d9c627a7f0bc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 19 十一月 2025 13:38:54 +0800
Subject: [PATCH] #增加出入库模式

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 5baf7d8..ee70d68 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -130,6 +130,8 @@
                     case 2:
                         write((LiftCommand) task.getData());
                         break;
+                    case 3:
+                        writeIoMode((Integer) task.getData());
                     default:
                         break;
                 }
@@ -231,6 +233,7 @@
             liftProtocol.setDeviceStatus(siemensS7Net.getByteTransform().TransInt16(result3.Content, 2));     // 璁惧鐘舵��
             liftProtocol.setTaskStatus(siemensS7Net.getByteTransform().TransInt16(result3.Content, 4));     // 瀹屾垚淇″彿
             liftProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result3.Content, 6));     // 宸ヤ綔鍙�
+            liftProtocol.setIoMode(siemensS7Net.getByteTransform().TransInt16(result3.Content, 10));     // 鍑哄叆搴撴ā寮�
         }
 
         //娓╂箍搴︿俊鎭弽棣�
@@ -293,7 +296,7 @@
     /**
      * 鍐欏叆鍛戒护
      */
-    private void write(LiftCommand liftCommand) throws InterruptedException {
+    private void write(LiftCommand liftCommand) {
         if (null == liftCommand) {
             return;
         }
@@ -314,6 +317,27 @@
     }
 
     /**
+     * 鍐欏叆鍛戒护
+     */
+    private void writeIoMode(Integer ioMode) {
+        if (null == ioMode) {
+            return;
+        }
+        short[] array = new short[1];
+        array[0] = ioMode.shortValue();
+
+        OperateResult write = siemensS7Net.Write("DB100.12", array);
+
+        if (!write.IsSuccess) {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ嚭鍏ュ簱妯″紡鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", DateUtils.convert(new Date()), slave.getId(), ioMode));
+            News.error("SiemensDevp"+" - 4"+" - 鍐欏叆鍑哄叆搴撴ā寮忔暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), ioMode);
+        } else {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 鍑哄叆搴撴ā寮忓懡浠や笅鍙� [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), ioMode));
+            News.info("SiemensDevp"+" - 5"+" - 鍑哄叆搴撴ā寮忓懡浠や笅鍙� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), ioMode);
+        }
+    }
+
+    /**
      * 璁剧疆鍏ュ簱鏍囪
      */
     @Override

--
Gitblit v1.9.1