From 2d3d006620bb15a2350c516f050058e5f84c7bf8 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 21 五月 2024 17:03:44 +0800
Subject: [PATCH] 添加人工一键下料功能,人工一键切换托盘功能,优化任务等级
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs"
index 8922db1..4b6f78a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs"
@@ -14,9 +14,12 @@
private readonly object _lockWrite = new object();
public SiemensS7Net siemensPLCClient { get; set; }
- public SiemensPLCClient()
+ public SiemensPLCClient(string model)
{
- siemensPLCClient = new SiemensS7Net(SiemensPLCS.S1200);
+ if (model == "S300")
+ siemensPLCClient = new SiemensS7Net(SiemensPLCS.S300);
+ else
+ siemensPLCClient = new SiemensS7Net(SiemensPLCS.S1500);
base.siemensPLCClient = this.siemensPLCClient;
}
@@ -48,6 +51,7 @@
siemensPLCClient.Port = Port;
siemensPLCClient.Slot = (byte)Slot;
siemensPLCClient.ConnectTimeOut = 1000 * 3;//瓒呮椂鏃堕棿
+ siemensPLCClient.ReceiveTimeOut = 1000 * 3;
siemensPLCClient.ConnectClose();
var coonRes = siemensPLCClient.ConnectServer();
IsConnected = coonRes.IsSuccess;
@@ -189,7 +193,7 @@
else if (typeof(DataType) == typeof(string))//瀛楃涓�
{
var str = GetContent(siemensPLCClient.ReadString(item.dbAddress, (ushort)item.dataLen), item).ToString();
- str = str.Replace("\0", "")?.Replace("\\", "")?.Replace("\u0014", "")?.Replace("?\u0006", "");
+ str = str.Replace("\0", "")?.Replace("\\", "")?.Replace("\u0014", "")?.Replace("?\u0006", "")?.Replace("\n", "")?.Replace("?", "")?.Trim();
return (DataType)(str as object);
}
else
@@ -253,6 +257,7 @@
if (!result.IsSuccess)
{
+ IsConnected = false;
WriteLog.Write_Log(PLCName, $"{PLCName}_Write", $"{dbAddress}鍐欏叆澶辫触," + result.Message);
throw new Exception($"{dbAddress}鍐欏叆澶辫触," + result.Message);
}
@@ -322,6 +327,7 @@
if (!result.IsSuccess)
{
+ IsConnected = false;
WriteLog.Write_Log(PLCName, $"{PLCName}_Write", $"{orderName}鍐欏叆澶辫触," + result.Message, item);
throw new Exception($"{PLCName},{orderName}鍐欏叆澶辫触," + result.Message);
}
--
Gitblit v1.9.3