助剂手动输送页面

View/DispenseMachinesSet.xaml.cs

@@ -30,6 +30,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
     /// </summary>
     public partial class DispenseMachinesSet : UserControl
     {
+        int type_;
         public DispenseMachinesSet()
         {
             InitializeComponent();
@@ -82,6 +83,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 dr_new.Add("Groups", TextMachineGroup.Text);
                 dr_new.Add("IP", IP.Text);
                 dr_new.Add("PORT", PORT.Text);
+                dr_new.Add("type", type_);
                 dr_new.Add("State", "899"); 
                 dr_new.Add("User", User.Text);
                 dr_new.Add("Passsword", Password.Text);
@@ -188,41 +190,49 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     uri = new Uri("pack://application:,,,/LOGO/252-2t.png");
                     bitmapImage = new BitmapImage(uri);
                     IMAGE.Source = bitmapImage;
+                    type_ = 1;
                     break;
                 case "252-2T":
                     uri = new Uri("pack://application:,,,/LOGO/252-2t.png");
                     bitmapImage = new BitmapImage(uri);
                     IMAGE.Source = bitmapImage;
+                    type_ = 1;
                     break;
                 case "252RB":
                     uri = new Uri("pack://application:,,,/LOGO/252RB.png");
                     bitmapImage = new BitmapImage(uri);
                     IMAGE.Source = bitmapImage;
+                    type_ = 1;
                     break;
                 case "252RDRM":
                     uri = new Uri("pack://application:,,,/LOGO/252RMRD.png");
                     bitmapImage = new BitmapImage(uri);
                     IMAGE.Source = bitmapImage;
+                    type_ = 1;
                     break;
                 case "242W":
                     uri = new Uri("pack://application:,,,/LOGO/242w.png");
                     bitmapImage = new BitmapImage(uri);
                     IMAGE.Source = bitmapImage;
+                    type_ = 1;
                     break;
                 case "302":
                     uri = new Uri("pack://application:,,,/LOGO/302.png");
                     bitmapImage = new BitmapImage(uri);
                     IMAGE.Source = bitmapImage;
+                    type_ = 2;
                     break;
                 case "303":
                     uri = new Uri("pack://application:,,,/LOGO/303.png");
                     bitmapImage = new BitmapImage(uri);
                     IMAGE.Source = bitmapImage;
+                    type_ = 3;
                     break;
-                case "303PDW":
+                case "302PDW":
                     uri = new Uri("pack://application:,,,/LOGO/303pdw.png");
                     bitmapImage = new BitmapImage(uri);
                     IMAGE.Source = bitmapImage;
+                    type_ = 3;
                     break;
                 default:
                     break;

View/DispenseView.xaml.cs

@@ -63,6 +63,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 dispenseMacInfo[i].Margin = new Thickness(5, 5, 0, 5);
                 dispenseMacInfo[i].Width = 400;
                 dispenseMacInfo[i].Height = 600;
+                dispenseMacInfo[i].type_.Text= DispenseMac.AsEnumerable().Select(row => row.Field<int>("type")).ElementAt(i).ToString();
                 dispenseMacInfo[i].mac.Text = DispenseMac.AsEnumerable().Select(row => row.Field<string>("name")).ElementAt(i);
                 dispenseMacInfo[i].macg.Text = DispenseMac.AsEnumerable().Select(row => row.Field<string>("Groups")).ElementAt(i);
                 dispenseMacInfo[i].state.Text = StatenClassConvert.Convert(x);

View/ProgramgroupView.xaml.cs

@@ -24,7 +24,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         private SQLiteHelper SQLiteHelpers = null;  //定义数据库
         private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
         DataSet sql; //内存数据缓存
-        string[] group_data;
 
         public void Programgroup_sql()
         {