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

UserClass/AsyncSerialPortClient.cs

@@ -135,7 +135,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                                 Dictionary<string, object> _dat;
                                 _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
                                 MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 101 } },
-                                          "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null);
+                                          "WorkOrder ='" + _dat.GetValue("Work") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null);
                             }
                             catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
                         }//回复的工单设置状态后就位101

ViewModel/MainWindowViewModel.cs

@@ -313,7 +313,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                                         ID = index,
                                         DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString()
                                     });
-                                } }
+                                }
+                            }
                             else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT3")
                             {     // 检查队列中是否已存在相同项
                                 bool exists = stringQueueSerial_3.Any(item => item.ID == index && item.DAT == dat);
@@ -336,13 +337,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                                         ID = index,
                                         DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString()
                                     });
-                                } }
                                 }
                             }
+                        }
+                    }
+                    if (WorkOrderstepdata.Select()[k].Field<object>("State").ToString() == "111")
+                    {
                         SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 112 } },
                             "WorkOrder ='" + WorkOrderstepdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
                     }
                 }
+            }
             /*下传工单总览*/
             DataTable WorkOrderdata = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='100' OR State='110') AND StartTime >'" +
                 DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd  HH:mm:ss") + "'", null).Tables[0];  //读取表写入缓存           
@@ -448,10 +453,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                             }
                         }
                     }
+                    if (WorkOrderdata.Select()[k].Field<object>("State").ToString() == "110")
+                    {
                         SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 110 } },
                             "WorkOrder ='" + WorkOrderdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
                     }
                 }
+            }
             /*下传工单设置*/
             DataTable WorkOrderset_ = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='113' OR State='114') AND StartTime >'" +
                 DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd  HH:mm:ss") + "'", null).Tables[0];  //读取表写入缓存           
@@ -540,10 +548,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                             }
                         }
                     }
+                    if (WorkOrderset_.Select()[k].Field<object>("State").ToString() == "113")
+                    {
                         SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 114 } },
                                 "WorkOrder ='" + WorkOrderset_.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
                     }
                 }
+            }
 
             //系统时间
             Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");