更改大部分页面,更改各个扫码逻辑

This commit is contained in:
bnala committed 2025-03-24 23:35:51 +08:00
1 parent 2bd24f5316
commit 1670395816
34 files changed
+2420 -1425

No files matched your search

+1
View File
@@ -12,6 +12,7 @@ namespace WindowsFormsApp1.server
public static ILogNet logNet = new LogNetDateTime("C:\\Log\\Logs", GenerateMode.ByEveryDay);
public static ILogNet PlclogNet = new LogNetDateTime("C:\\Log\\PlcLogs", GenerateMode.ByEveryDay);
public static ILogNet ApilogNet = new LogNetDateTime("C:\\Log\\Apilogs", GenerateMode.ByEveryHour);
public static ILogNet QMlogNet = new LogNetDateTime("C:\\Log\\QMlogs", GenerateMode.ByEveryHour);
public static HslCommunication.BasicFramework.SoftNumericalOrder softNumericalOrder = new HslCommunication.BasicFramework.SoftNumericalOrder("", "yyyyMMdd", 4, @"\numericalOrder.txt");
public LogExecute()
+106 -1
View File
@@ -19,7 +19,7 @@ namespace WindowsFormsApp1.server
private SiemensS7Net siemensS7Net;
private string ip;
private int timeout;
private static bool ConnectB = false;
private bool ConnectB = false;
public SiemensHelp(string ip,int timeout)
{
this.ip = ip;
@@ -580,5 +580,110 @@ namespace WindowsFormsApp1.server
}
}
#endregion
#region 读取压力
public BllResult<List<float>> ReadAddress(List<t_pressurecurve> address)
{
var ulist = address.GroupBy(a => a.dbaddress).ToList();
foreach (var u in ulist)
{
var readresult = ReadOneDB(u.ToList());
if (!readresult.Success)
{
return BllResult<List<float>>.Error(readresult.Msg);
}
}
List<float> list = new List<float>();
foreach (var add in address.OrderBy(a => a.addressoffset))
{
list.Add(float.Parse(add.value));
}
return BllResult<List<float>>.Sucess(list, "成功");
}
private BllResult ReadOneDB(List<t_pressurecurve> address)
{
address = address.OrderBy(a => a.addressoffset).ToList();
OperateResult<byte[]> read;
if (address.Count == 1)
{
string startaddress = address[0].dbaddress + "." + address[0].addressoffset.ToString();
read = siemensS7Net.Read(startaddress, Convert.ToUInt16(address[0].addresstypelegth));
}
else
{
double admax = address.Select(a => a.addressoffset).Max();
double admin = address.Select(a => a.addressoffset).Min();
ushort length = (ushort)(Math.Floor(admax - admin) + address.Last().addresstypelegth);
string startaddress = address[0].dbaddress + "." + admin.ToString();
read = siemensS7Net.Read(startaddress, length);
}
if (read.IsSuccess)
{
if (TransforWCSDataToAddressData(address, read).Success)
{
return BllResult.Sucess(address, "成功");
}
else
{
return BllResult.Error(address, "成功");
}
}
else
{
return BllResult.Error(read.Message);
}
}
private BllResult TransforWCSDataToAddressData(List<t_pressurecurve> address, OperateResult<byte[]> read)
{
try
{
//按偏移量排序
address = address.OrderBy(a => a.addressoffset).ToList();
int startindex = address[0].addressoffset;
for (int i = 0; i < address.Count; i++)
{
int index = address[i].addressoffset - startindex;
switch (address[i].addresstype)
{
case "byte":
address[i].value = ByteTransform.TransByte(read.Content, index).ToString();
break;
case "real":
address[i].value = ByteTransform.TransSingle(read.Content, index).ToString();
break;
case "lword":
address[i].value = Convert.ToString(ByteTransform.TransInt64(read.Content, index), 16); ;
break;
case "int":
address[i].value = ByteTransform.TransInt16(read.Content, index).ToString();
break;
case "uint":
address[i].value = ByteTransform.TransInt16(read.Content, index).ToString();
break;
case "dint":
address[i].value = Convert.ToString(ByteTransform.TransInt32(read.Content, index), 10);
break;
case "string":
address[i].value = Encoding.ASCII.GetString(read.Content, index, address[i].addresstypelegth);
break;
default:
return BllResult.Error("找不到未知的数据类型");
}
}
return BllResult.Sucess(address);
}
catch (Exception ex)
{
return BllResult.Error($"转换WCS数据失败{ex.Message}");
}
}
#endregion
}
}