sc/SunlightCentralizedControlManagement
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

添加485串口线路指令

Browse Source
This commit is contained in:
sc authored and sc committed 2025-10-10 00:56:14 +08:00
2 parents 17a5d6b718 34d3e6c292
commit 927c38853d
3 files changed
+146 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UserClass/AsyncSerialPortClient.cs
+98 -7
View File
@@ -2,6 +2,7 @@
using ScottPlot.Plottables; using ScottPlot.Plottables;
using SunlightCentralizedControlManagement_SCCM_.View; using SunlightCentralizedControlManagement_SCCM_.View;
using SunlightCentralizedControlManagement_SCCM_.ViewModel; using SunlightCentralizedControlManagement_SCCM_.ViewModel;
using SunlightCentralizedControlManagement_SCCM_.WindowsView;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
@@ -17,6 +18,7 @@ using TouchSocket.SerialPorts;
using TouchSocket.Sockets; using TouchSocket.Sockets;
using static SkiaSharp.HarfBuzz.SKShaper; using static SkiaSharp.HarfBuzz.SKShaper;
using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper; using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
using static SunlightCentralizedControlManagement_SCCM_.ViewModel.MainWindowViewModel;
using static System.Net.Mime.MediaTypeNames; using static System.Net.Mime.MediaTypeNames;
namespace SunlightCentralizedControlManagement_SCCM_.UserClass namespace SunlightCentralizedControlManagement_SCCM_.UserClass
@@ -95,7 +97,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
DAT = DAT.Substring(DAT.IndexOf("]") + 1);
Dictionary<string, object> _dat; Dictionary<string, object> _dat;
_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT); _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } }, MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
@@ -110,7 +111,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
DAT = DAT.Substring(DAT.IndexOf("]") + 1);
Dictionary<string, object> _dat; Dictionary<string, object> _dat;
_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT); _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
MainWindowViewModel.SQLiteHelpers.Update("WorkorderSteps", new Dictionary<string, object> { { "Mode", 1 } }, MainWindowViewModel.SQLiteHelpers.Update("WorkorderSteps", new Dictionary<string, object> { { "Mode", 1 } },
@@ -131,7 +131,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
DAT = DAT.Substring(DAT.IndexOf("]") + 1);
Dictionary<string, object> _dat; Dictionary<string, object> _dat;
_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT); _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 101 } }, MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 101 } },
@@ -143,9 +142,80 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
Dictionary<string, object> _dat;
_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
DataTable dataTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder='" +
_dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "' AND Step = '"+ _dat.GetValue("Step") + "'", null).Tables[0];
foreach (DataRow sourceRow in dataTable.Rows)
{
lock (MainWindowViewModel.Dyelot_CALL.Rows.SyncRoot)
{
// 创建新行（基于目标表结构）
DataRow newRow = MainWindowViewModel.Dyelot_CALL.NewRow();
// 复制源表中存在的列数据
foreach (DataColumn column in dataTable.Columns)
{
if (MainWindowViewModel.Dyelot_CALL.Columns.Contains(column.ColumnName))
{
newRow[column.ColumnName] = sourceRow[column.ColumnName];
}
}
MainWindowViewModel.Dyelot_CALL.Rows.Add(newRow);
Dictionary<string, object> Product_ = new Dictionary<string, object>();//缓存函数
Product_.Add("State", 202);
Product_.Add("Dyelot", newRow.Field<string>("Dyelot"));
Product_.Add("Step", newRow.Field<int>("Step"));
newRow.BeginEdit();
newRow["State"] = 202;
newRow.EndEdit();
MainWindowViewModel.SQLiteHelpers.InsertData("DyelotHistory", MainWindowViewModel.SQLiteHelpers.ToDictionary(newRow));// 执行插入
int index = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Machines where Serial='PORT1' AND Station ='" +
Station + "' ", null).Tables[0].Rows[0].Field<int>("ID");
string dat_ = "SC828[" + Station + "]" + Product_.ToJsonString();
bool exists = stringQueueSerial_1.Any(item => item.ID == index && item.DAT == dat_);
if (!exists)
{
stringQueueSerial_1.Enqueue(new QueueSerial
{
ID = index,
DAT = dat_
});
}
}
}
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
}//获取呼叫领料单 }//获取呼叫领料单
else if (SYSAPI == "SC822")
{
try
{
DAT = DAT.Substring(DAT.IndexOf("]") + 1);
DataTable dataTable = JsonConvert.DeserializeObject<DataTable>(DAT).Copy();//反序列化
System.Windows.Application.Current.Dispatcher.Invoke(() =>
{
UserWorkOrder userWorkOrder = new UserWorkOrder();
userWorkOrder.WorkOrderTable = dataTable;
userWorkOrder.Show();
});
}
catch (Exception)
{
System.Windows.Application.Current.Dispatcher.Invoke(() =>
{
UserInf userInf = new UserInf();
userInf.Inf_DAT = "没有等待中的工艺";
userInf.Show();
userInf.Activate();
});
// LogGing.LogGingDATA("[ERR='" + ex + "']=Exception");
MainWindowViewModel.ERR_c++;
}
}//可用工单
else if (SYSAPI == "SC830") else if (SYSAPI == "SC830")
{ {
try try
@@ -205,9 +275,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
Dictionary<string, object> _dat;
_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
MainWindowViewModel.dt_TP = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * WorkorderSteps Dyelot where WorkOrder='" +
_dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null).Tables[0];
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
} }//当前步骤信息
else if (SYSAPI == "SC832") else if (SYSAPI == "SC832")
{ {
try try
@@ -220,6 +294,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
Dictionary<string, object> _dat;
_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
MonitorView.Product_DAT = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder='" +
_dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null).Tables[0];
MonitorView.Product_bool = true;
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
}//当前领料单信息 }//当前领料单信息
@@ -227,6 +306,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
}//数字开关表 }//数字开关表
@@ -234,6 +314,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
}//寄存器表 }//寄存器表
@@ -242,6 +323,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
try try
{ {
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
}//缓存表 }//缓存表
@@ -273,7 +355,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 109 } },
"WorkOrder ='" + DAT + "'", null);
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
}//发布失败 }//发布失败
@@ -281,13 +364,21 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
{ {
try try
{ {
MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 119 } },
"WorkOrder ='" + DAT + "'", null);
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
}//细节错误 }//细节错误
else if (SYSAPI == "SC921")
{
try
{
}
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
}//错误
else if (SYSAPI == "SC980") else if (SYSAPI == "SC980")
{ {
MessageBox.Show(DAT, "SCCM", MessageBoxButton.OK, MessageBoxImage.Question);
} }
} }
} }
UserClass/AsyncTcpClient.cs
+2 -2
View File
@@ -331,7 +331,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
MainWindowViewModel.dt_TP = JsonConvert.DeserializeObject<DataTable>(DAT);//反序列化 MainWindowViewModel.dt_TP = JsonConvert.DeserializeObject<DataTable>(DAT);//反序列化
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
} }//步骤信息
else if (SYSAPI == "SC832") else if (SYSAPI == "SC832")
{ {
try try
@@ -403,7 +403,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
MachinesView.LOG_dataTable = JsonConvert.DeserializeObject<DataTable>(DAT);//反序列化 MachinesView.LOG_dataTable = JsonConvert.DeserializeObject<DataTable>(DAT);//反序列化
} }
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
} }//信息
else if (SYSAPI == "SC910") else if (SYSAPI == "SC910")
{ {
try try
ViewModel/MainWindowViewModel.cs
+46 -10
View File
@@ -1114,15 +1114,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
} }
else else
{//串口 {//串口
int index = Convert.ToInt16(MachinesRow["ID"]);
string dat_ = "SC827[" + MachinesRow["Station"] + "]";
if (MachinesRow["Serial"].ToString() == "PORT1") if (MachinesRow["Serial"].ToString() == "PORT1")
{
bool exists = stringQueueSerial_1.Any(item => item.ID == index && item.DAT == dat_);
if (!exists)
{ {
stringQueueSerial_1.Enqueue(new QueueSerial stringQueueSerial_1.Enqueue(new QueueSerial
{ {
ID = Convert.ToInt16(MachinesRow["ID"]), ID = index,
DAT = "SC827[" + MachinesRow["Station"] + "]" DAT = dat_
}); });
} }
}
else if (MachinesRow["Serial"].ToString() == "PORT2") else if (MachinesRow["Serial"].ToString() == "PORT2")
{
bool exists = stringQueueSerial_2.Any(item => item.ID == index && item.DAT == dat_);
if (!exists)
{ {
stringQueueSerial_2.Enqueue(new QueueSerial stringQueueSerial_2.Enqueue(new QueueSerial
{ {
@@ -1130,7 +1139,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
DAT = "SC827[" + MachinesRow["Station"] + "]" DAT = "SC827[" + MachinesRow["Station"] + "]"
}); });
} }
}
else if (MachinesRow["Serial"].ToString() == "PORT3") else if (MachinesRow["Serial"].ToString() == "PORT3")
{
bool exists = stringQueueSerial_3.Any(item => item.ID == index && item.DAT == dat_);
if (!exists)
{ {
stringQueueSerial_3.Enqueue(new QueueSerial stringQueueSerial_3.Enqueue(new QueueSerial
{ {
@@ -1138,7 +1151,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
DAT = "SC827[" + MachinesRow["Station"] + "]" DAT = "SC827[" + MachinesRow["Station"] + "]"
}); });
} }
}
else if (MachinesRow["Serial"].ToString() == "PORT4") else if (MachinesRow["Serial"].ToString() == "PORT4")
{
bool exists = stringQueueSerial_4.Any(item => item.ID == index && item.DAT == dat_);
if (!exists)
{ {
stringQueueSerial_4.Enqueue(new QueueSerial stringQueueSerial_4.Enqueue(new QueueSerial
{ {
@@ -1149,6 +1166,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
} }
} }
} }
}
catch (Exception EX) { LogGing.ERRDATA(EX); } catch (Exception EX) { LogGing.ERRDATA(EX); }
/**染机呼叫完成**/ /**染机呼叫完成**/
try try
@@ -1175,39 +1193,57 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
} }
else else
{//串口 {//串口
int index = Convert.ToInt16(MachinesRow["ID"]);
string dat_ = "SC828[" + MachinesRow["Station"] + "]" + Product_.ToJsonString();
if (MachinesRow["Serial"].ToString() == "PORT1") if (MachinesRow["Serial"].ToString() == "PORT1")
{
bool exists = stringQueueSerial_1.Any(item => item.ID == index && item.DAT == dat_);
if (!exists)
{ {
stringQueueSerial_1.Enqueue(new QueueSerial stringQueueSerial_1.Enqueue(new QueueSerial
{ {
ID = Convert.ToInt16(MachinesRow["ID"]), ID = index,
DAT = "SC828[" + MachinesRow["Station"] + "]" + Product_.ToJsonString() DAT = dat_
}); });
} }
}
else if (MachinesRow["Serial"].ToString() == "PORT2") else if (MachinesRow["Serial"].ToString() == "PORT2")
{
bool exists = stringQueueSerial_2.Any(item => item.ID == index && item.DAT == dat_);
if (!exists)
{ {
stringQueueSerial_2.Enqueue(new QueueSerial stringQueueSerial_2.Enqueue(new QueueSerial
{ {
ID = Convert.ToInt16(MachinesRow["ID"]), ID = index,
DAT = "SC828[" + MachinesRow["Station"] + "]" + Product_.ToJsonString() DAT = dat_
}); });
} }
}
else if (MachinesRow["Serial"].ToString() == "PORT3") else if (MachinesRow["Serial"].ToString() == "PORT3")
{
bool exists = stringQueueSerial_3.Any(item => item.ID == index && item.DAT == dat_);
if (!exists)
{ {
stringQueueSerial_3.Enqueue(new QueueSerial stringQueueSerial_3.Enqueue(new QueueSerial
{ {
ID = Convert.ToInt16(MachinesRow["ID"]), ID = index,
DAT = "SC828[" + MachinesRow["Station"] + "]" + Product_.ToJsonString() DAT = dat_
}); });
} }
}
else if (MachinesRow["Serial"].ToString() == "PORT4") else if (MachinesRow["Serial"].ToString() == "PORT4")
{
bool exists = stringQueueSerial_4.Any(item => item.ID == index && item.DAT == dat_);
if (!exists)
{ {
stringQueueSerial_4.Enqueue(new QueueSerial stringQueueSerial_4.Enqueue(new QueueSerial
{ {
ID = Convert.ToInt16(MachinesRow["ID"]), ID = index,
DAT = "SC828[" + MachinesRow["Station"] + "]" + Product_.ToJsonString() DAT = dat_
}); });
} }
} }
}
if (row["State"].ToString() == "309") if (row["State"].ToString() == "309")
{ {