Merge branch 'master' of http://192.168.0.12:13000/sc/SunlightCentralizedControlManagement

View/DyeingPlanView.xaml.cs

@@ -179,24 +179,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             Dictionary<string, object> WorkOrder_DAT = new Dictionary<string, object>();//缓存函数
             for (int x = 0; x < dat.Rows.Count; x++)
             {
+                WorkOrder_DAT = MainWindowViewModel.SQLiteHelpers.ToDictionary(dat.Rows[x]);
                 WorkOrder_DAT.Add("WorkOrder", WorkOrder_);
                 WorkOrder_DAT.Add("Dyelot", Dyelot_);
-                WorkOrder_DAT.Add("ProgramID", dat.Rows[x]["ProgramID"]);
-                WorkOrder_DAT.Add("Program", dat.Rows[x]["Program"]);
-                WorkOrder_DAT.Add("Step", dat.Rows[x]["Step"]);
-                WorkOrder_DAT.Add("StepID", dat.Rows[x]["StepID"]);
-                WorkOrder_DAT.Add("StepName", dat.Rows[x]["StepName"]);
-                WorkOrder_DAT.Add("ParameterName", dat.Rows[x]["ParameterName"]);
-                WorkOrder_DAT.Add("Parameter1", dat.Rows[x]["Parameter1"]);
-                WorkOrder_DAT.Add("Parameter2", dat.Rows[x]["Parameter2"]);
-                WorkOrder_DAT.Add("Parameter3", dat.Rows[x]["Parameter3"]);
-                WorkOrder_DAT.Add("Parameter4", dat.Rows[x]["Parameter4"]);
-                WorkOrder_DAT.Add("Parameter5", dat.Rows[x]["Parameter5"]);
-                WorkOrder_DAT.Add("Parameter6", dat.Rows[x]["Parameter6"]);
-                WorkOrder_DAT.Add("Parameter7", dat.Rows[x]["Parameter7"]);
-                WorkOrder_DAT.Add("Parameter8", dat.Rows[x]["Parameter8"]);
-                WorkOrder_DAT.Add("Parameter9", dat.Rows[x]["Parameter9"]);
-                WorkOrder_DAT.Add("Parameter10", dat.Rows[x]["Parameter10"]);
                 MainWindowViewModel.SQLiteHelpers.InsertData("WorkorderSteps", WorkOrder_DAT);//行插入                                                                             
                 WorkOrder_DAT.Clear();
             }

View/ProductionPlanningView.xaml.cs

@@ -280,7 +280,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
             DispatcherTimer timer1s = new DispatcherTimer//初始化循环，每1秒调用一次Tick
             {
-                Interval = TimeSpan.FromSeconds(1)//秒
+                Interval = TimeSpan.FromSeconds(5)//秒
             };
             timer1s.Tick += Tick_Event_1S;
             timer1s.Start();
@@ -288,11 +288,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         public static bool UI;
         void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
         {
-            if (UI) 
-            {
+          //  if (UI) 
+           // {
                 GanttChartNEW();
-                UI= false;
-            }
+           //     UI= false;
+          //  }
         }
     }
 }

ViewModel/MainWindowViewModel.cs

@@ -375,7 +375,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 }
             }
             /*下传工单设置*/
-            DataTable WorkOrderset_ = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where State='113' AND EndTime >'" + 
+            DataTable WorkOrderset_ = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='113'or State='114') AND EndTime >'" + 
                 DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd  HH:mm:ss") + "'", null).Tables[0];  //读取表写入缓存           
             for (int k = 0; k < WorkOrderset_.Rows.Count; k++)
             {
@@ -398,8 +398,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                         });
                     }
 
-                    SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 110 } },
-                        "WorkOrder ='" + WorkOrderdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
+                    SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 114 } },
+                        "WorkOrder ='" + WorkOrderset_.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
                 }
                 else
                 {//串口