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

View/ProductionPlanningEdit.xaml.cs

@@ -85,7 +85,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 comboBoxDyelot.IsEnabled = true;
                 SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
                 SQLiteHelpers.Open();  //打开数据库
-                DataTable DatDyelot = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Machine='" + comboBoxMachine.Text + "' order by Dyelot desc", null).Tables[0];  //读取计划表写入缓存                                                                                                                                                                       
+                DataTable DatDyelot = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Machine='" + comboBoxMachine.Text + "' and State='101' order by Dyelot desc", null).Tables[0];  //读取计划表写入缓存                                                                                                                                                                       
                 SQLiteHelpers.Close();  //关闭连接
                 comboBoxDyelot.ItemsSource = DatDyelot.AsEnumerable().Select(rowdata => rowdata.Field<string>("Dyelot")).ToList();//转换代码 
             }