From d0b3abf74ac5f94f5373922172ed79fbfc24e6be Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期二, 17 六月 2025 17:28:53 +0800
Subject: [PATCH] 电梯流程开发

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs
index 7842918..a7854c1 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs
@@ -23,7 +23,7 @@
     {
         private static bool debug = true;
         private static S7.Net.Plc plc = null;
-     
+
         static S7Helper()
         {
             Init();
@@ -79,7 +79,7 @@
             catch (Exception ex)
             {
                 // Console.WriteLine($"plc{plc.IP}杩炴帴澶辫触锛宔rr={ex.Message}");
-                LogHelper.Error($"Link Error plc{plc.IP}杩炴帴澶辫触锛宔rr={ex.Message}",ex);
+                LogHelper.Error($"Link Error plc{plc.IP}杩炴帴澶辫触锛宔rr={ex.Message}", ex);
                 //Init();
             }
 
@@ -87,7 +87,7 @@
         //https://www.ad.siemens.com.cn/productportal/Prods/S7-1200_PLC_EASY_PLUS/SmartSMS/060.html
         //https://www.ad.siemens.com.cn/productportal/Prods/S7-1200_PLC_EASY_PLUS/07-Program/02-basic/01-Data_Type/09-String.html
 
-        private static object _lockdpj=new object();
+        private static object _lockdpj = new object();
 
         /// <summary>
         /// 鍚堣偉浣抽�璇诲彇鍙犵洏鏈�@@ -95,9 +95,10 @@
         /// <param name="startByte">鍋忕Щ閲忓湴鍧�vb2001</param>
         ///  /// <param name="varType">鍊肩被鍨�/param>
         /// <returns></returns>
-        public static int ReadDpj(int startByte, S7.Net.VarType varType)
+        public static int ReadDpj(string ip, int startByte, S7.Net.VarType varType)
         {
-            string ip = "10.68.9.15"; short port = 102;
+            // string ip = "10.68.9.15"; 
+            short port = 102;
             lock (_lockdpj)
             {
                 try
@@ -125,11 +126,12 @@
                 }
                 catch (Exception ex)
                 {
-                    LogHelper.Error($"ReadDpj Error:{ex}", ex);
+                    LogHelper.Info($"鍙犵洏鏈�{ip}閾炬帴澶辫触");
+                    LogHelper.Error($"ReadDpj ip:{ip},startByte:{startByte} Error:{ex}", ex);
                     throw;
                 }
             }
-          
+
 
 
         }
@@ -139,10 +141,11 @@
         /// <param name="startByte">鍋忕Щ閲忓湴鍧�/param>
         /// <param name="value">鍐欏叆鍊�byte绫诲瀷鍙兘0 1</param>
         /// <returns></returns>
-        public static bool WriteDpj(int startByte, byte value)
+        public static bool WriteDpj(string ip, int startByte, byte value)
         {
             bool result = false;
-            string ip = "10.68.9.15"; short port = 102;
+            // string ip = "10.68.9.15"; 
+            short port = 102;
             lock (_lockdpj)
             {
                 try
@@ -151,7 +154,7 @@
 
                     LogHelper.Info($"閾炬帴鍙犵洏鏈猴紝ip锛歿ip}锛岀鍙o細{port}");
                     S7Helper.Link(plc);
-                   // plc.Write($"VB{startByte}", value);
+                    // plc.Write($"VB{startByte}", value);
                     Thread.Sleep(300);
                     plc.Write(
                        dataType: DataType.DataBlock,
@@ -169,18 +172,21 @@
                     }
                     else
                     {
+                       // Task.Run(() => WriteDpj(ip, startByte, value));
                         LogHelper.Info($"鍙犵洏鏈哄啓鍏ュけ璐ワ紝鍥炶鍊硷細{fdvalue}");
                     }
 
-                        return result;
+                    return result;
                 }
                 catch (Exception ex)
                 {
-                    LogHelper.Info($"WriteDpj Error{ex}");
-                    throw;
+                   // Task.Run(() => WriteDpj(ip, startByte, value));
+                    LogHelper.Info($"鍙犵洏鏈�{ip}閾炬帴澶辫触");
+                    LogHelper.Error($"WriteDpj ip:{ip},startByte:{startByte} Error:{ex}", ex);
+                   return false;
                 }
             }
-           
+
 
 
             // S7-200 Smart鐨刅鍖轰篃鏄犲皠涓篋B1

--
Gitblit v1.9.1