diff --git a/UserClass/AsyncSerialPortClient.cs b/UserClass/AsyncSerialPortClient.cs
index a6b7bb6..446ea41 100644
--- a/UserClass/AsyncSerialPortClient.cs
+++ b/UserClass/AsyncSerialPortClient.cs
@@ -100,8 +100,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                             {
                                 Dictionary<string, object> _dat;
                                 _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
+                                string te = _dat.GetValue("Work").ToString();
+                                int ty =Convert.ToInt16( _dat.GetValue("ReDye"));
                                 MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
-                                    "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null);
+                                    "WorkOrder ='" + te + "' AND ReDye ='" + ty + "'", null);
                             }
                             catch (Exception ex)
                             {
diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs
index e46fdb4..d6ea5be 100644
--- a/UserClass/AsyncTcpClient.cs
+++ b/UserClass/AsyncTcpClient.cs
@@ -160,10 +160,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     try
                     {
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
-                        Dictionary<string, object> _dat;
-                        _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
+
                         MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
-                            "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null);
+                            "WorkOrder ='" + DAT + "'", null);
+                   //     Dictionary<string, object> _dat;
+                //        _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
+                //        MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
+                //            "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null);
                     }
                     catch (Exception ex)
                     {
@@ -175,10 +178,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     try
                     {
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
-                        Dictionary<string, object> _dat;
-                        _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
-                        MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 113 } },
-                            "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='"+ _dat.GetValue("ReDye") + "'", null);
+
+                        MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
+                            "WorkOrder ='" + DAT + "'", null);
+               //         Dictionary<string, object> _dat;
+              //          _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
+             //           MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 113 } },
+             //               "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='"+ _dat.GetValue("ReDye") + "'", null);
                     }
                     catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
                 }
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index d6fdc3e..d2ce3e9 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -390,9 +390,14 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                             dt_temp.EndEdit();
                             dataTable.Rows.Add(dt_temp.ItemArray);
 
+                            Dictionary<string, object> dat_ = new Dictionary<string, object>();
+                            dat_.Add("Work", dt_temp["WorkOrder"].ToString());
+                            dat_.Add("Dye", dt_temp["DYELOT"].ToString());
+                            dat_.Add("STime", dt_temp["StartTime"].ToString());
+                            dat_.Add("Time", dt_temp["Time"].ToString());
+
                             int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderdata_m + "'").ToString());
-                            string dat = "SC810[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" +
-                                     DataTableToDictionary(dataTable).ToJsonString();
+                            string dat = "SC810[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString();
                             if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT1")
                             {     // 检查队列中是否已存在相同项
                                 bool exists = stringQueueSerial_1.Any(item => item.ID == index && item.DAT == dat);