Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

UserClass/AsyncSerialPortClient.cs

@@ -270,8 +270,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                 return EasyTask.CompletedTask; ;
             };
             await portclient.SetupAsync(new TouchSocketConfig()
-                .SetMaxBufferSize(1024 * 1024 * 100)
-                .SetMinBufferSize(1024 * 1024 * 10)
+                .SetMaxBufferSize(1024 * 1024 * 10)
                  .SetSerialPortOption(new SerialPortOption()
                  {
                      BaudRate = BAUD,//波特率
@@ -417,6 +416,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
         {
             try
             {
+              var t=  CRCcheck16.ToCRC16(command);
                 _responseEvent.Reset();
                 serialPortClients.Send(command); // 发送指令
                                                  // 等待500毫秒或直到收到响应

ViewModel/MainWindowViewModel.cs

@@ -229,11 +229,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             DataTable WorkOrderstepdata = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='111' or State='112') AND EndTime >'" +
                 DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd  HH:mm:ss") + "'", null).Tables[0];  //读取表写入缓存           
             for (int k = 0; k < WorkOrderstepdata.Rows.Count; k++)
-            {//网络
+            {
                 string WorkOrderdata_m = WorkOrderstepdata.Select()[k].Field<object>("Machines").ToString();
                 //string m= WorkOrderstepdata.Rows[k].Field<string>("Machines");
                 if (Convert.ToBoolean(Selet_Machines(Machines, "Type", "Name='" + WorkOrderdata_m + "'")))
-                {
+                {//网络
                     //string WorkOrderdata_m = WorkOrderstepdata.Select()[k].Field<object>("Machines").ToString();
                     DataTable dataTable = SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='" +
                         WorkOrderstepdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null).Tables[0];
@@ -248,7 +248,43 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 }
                 else
                 {//串口
-
+                    DataTable dataTable = SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='" +
+                        WorkOrderstepdata.Select()[k].Field<object>("WorkOrder").ToString() + "' AND ReDye ='"+                      
+                        WorkOrderstepdata.Select()[k].Field<object>("ReDye").ToString() + "' AND Mode<> '201'", null).Tables[0];
+                    
+                    int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderdata_m + "'").ToString());
+                    if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT1")
+                    {
+                        stringQueueSerial_1.Enqueue(new QueueSerial
+                        {
+                            ID = index,
+                            DAT = "SC811" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + dataTable.Rows[0].ToJsonString()
+                        });
+                    }
+                    else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT2")
+                    {
+                        stringQueueSerial_2.Enqueue(new QueueSerial
+                        {
+                            ID = index,
+                            DAT = "SC811" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + dataTable.Rows[0].ToJsonString()
+                        });
+                    }
+                    else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT3")
+                    {
+                        stringQueueSerial_3.Enqueue(new QueueSerial
+                        {
+                            ID = index,
+                            DAT = "SC811" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + dataTable.Rows[0].ToJsonString()
+                        });
+                    }
+                    else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT4")
+                    {
+                        stringQueueSerial_4.Enqueue(new QueueSerial
+                        {
+                            ID = index,
+                            DAT = "SC811" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + dataTable.Rows[0].ToJsonString()
+                        });
+                    }
                 }
             }
             /*下传工单总览*/