change - 修改自动界面 添加 干混物料到15

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs

@@ -154,6 +154,20 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             var drtSelected = FreeSqlUnit.Instance.Select<DeviceMaterrial>().
             Where(x => x.DeviceId == select && x.Type == 1).ToList();
 
+            if (drtSelected.Count < 15)
+            {
+                DeviceMaterrial deviceMaterrial = new DeviceMaterrial()
+                {
+                    DeviceId = select,
+                    Type = 1,
+                    MaterrialId = -1,
+                    Code = -1,
+                };
+                while(drtSelected.Count < 15)
+                {
+                    drtSelected.Add(deviceMaterrial);
+                }
+            }
             if (drtSelected.Count != 0)
             {
                 ComboE.DryM1.SelectedValue = drtSelected[0].MaterrialId;
@@ -168,6 +182,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 ComboE.DryM10.SelectedValue = drtSelected[9].MaterrialId;
                 ComboE.DryM11.SelectedValue = drtSelected[10].MaterrialId;
                 ComboE.DryM12.SelectedValue = drtSelected[11].MaterrialId;
+                ComboE.DryM13.SelectedValue = drtSelected[12].MaterrialId;
+                ComboE.DryM14.SelectedValue = drtSelected[13].MaterrialId;
+                ComboE.DryM15.SelectedValue = drtSelected[14].MaterrialId;
             }
             else
             {
@@ -183,6 +200,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 ComboE.DryM10.SelectedIndex = 0;
                 ComboE.DryM11.SelectedIndex = 0;
                 ComboE.DryM12.SelectedIndex = 0;
+                ComboE.DryM13.SelectedIndex = 0;
+                ComboE.DryM14.SelectedIndex = 0;
+                ComboE.DryM15.SelectedIndex = 0;
             }
 
             var getDryerD1 = LjPlanningPlcHelp.GetDryerD1;
@@ -223,6 +243,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             TextE.DryW10.MCValue = Dry.RecipePlcViews[9].Set;
             TextE.DryW11.MCValue = Dry.RecipePlcViews[10].Set;
             TextE.DryW12.MCValue = Dry.RecipePlcViews[11].Set;
+            //TextE.DryW13.MCValue = Dry.RecipePlcViews[12].Set;
+            //TextE.DryW14.MCValue = Dry.RecipePlcViews[13].Set;
+            //TextE.DryW15.MCValue = Dry.RecipePlcViews[14].Set;
             TextE.DryT1.MCValue = Dry.RecipePlcViews[0].Tolerance;
             TextE.DryT2.MCValue = Dry.RecipePlcViews[1].Tolerance;
             TextE.DryT3.MCValue = Dry.RecipePlcViews[2].Tolerance;
@@ -235,6 +258,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             TextE.DryT10.MCValue = Dry.RecipePlcViews[9].Tolerance;
             TextE.DryT11.MCValue = Dry.RecipePlcViews[10].Tolerance;
             TextE.DryT12.MCValue = Dry.RecipePlcViews[11].Tolerance;
+            //TextE.DryT13.MCValue = Dry.RecipePlcViews[12].Tolerance;
+            //TextE.DryT14.MCValue = Dry.RecipePlcViews[13].Tolerance;
+            //TextE.DryT15.MCValue = Dry.RecipePlcViews[14].Tolerance;
             TextE.DryWaitTime.MCValue = Dry.RecipeSteps[1].MixTime;
             TextE.DryOutDelayTime.MCValue = Dry.RecipeSteps[2].MixTime;
             TextE.DrySpeed1.MCValue = Dry.RecipeSteps[0].MixSpeed;

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs

@@ -42,6 +42,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.Entity
         public MCCombobox DryM10 { get; set; }
         public MCCombobox DryM11 { get; set; }
         public MCCombobox DryM12 { get; set; }
+        public MCCombobox DryM13 { get; set; }
+        public MCCombobox DryM14 { get; set; }
+        public MCCombobox DryM15 { get; set; }
         public MCCombobox PasteChooseDry { get; set; }
         public MCCombobox PasteChooseWet { get; set; }
 
@@ -141,6 +144,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.Entity
         public MCTextBox DryW10 { get; set; }
         public MCTextBox DryW11 { get; set; }
         public MCTextBox DryW12 { get; set; }
+        public MCTextBox DryW13 { get; set; }
+        public MCTextBox DryW14 { get; set; }
+        public MCTextBox DryW15 { get; set; }
         public MCTextBox DryT1 { get; set; }
         public MCTextBox DryT2 { get; set; }
         public MCTextBox DryT3 { get; set; }
@@ -153,6 +159,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.Entity
         public MCTextBox DryT10 { get; set; }
         public MCTextBox DryT11 { get; set; }
         public MCTextBox DryT12 { get; set; }
+        public MCTextBox DryT13 { get; set; }
+        public MCTextBox DryT14 { get; set; }
+        public MCTextBox DryT15 { get; set; }
         public MCTextBox DryWaitTime { get; set; }
         public MCTextBox DryOutDelayTime { get; set; }
         public MCTextBox CADeviation { get; set; }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs

@@ -362,6 +362,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             ComboE.DryM10.DataSource = StockMaterrialDbHelp.GetDryerMaterrial();
             ComboE.DryM11.DataSource = StockMaterrialDbHelp.GetDryerMaterrial();
             ComboE.DryM12.DataSource = StockMaterrialDbHelp.GetDryerMaterrial();
+            ComboE.DryM13.DataSource = StockMaterrialDbHelp.GetDryerMaterrial();
+            ComboE.DryM14.DataSource = StockMaterrialDbHelp.GetDryerMaterrial();
+            ComboE.DryM15.DataSource = StockMaterrialDbHelp.GetDryerMaterrial();
 
             string[] s = new string[8];
             for (int i = 1; i <= 8; i++)

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs

@@ -361,6 +361,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             DryerGetValue(ComboE.DryM10, TextE.DryW10, TextE.DryT10, recipes, materials, RadioE);
             DryerGetValue(ComboE.DryM11, TextE.DryW11, TextE.DryT11, recipes, materials, RadioE);
             DryerGetValue(ComboE.DryM12, TextE.DryW12, TextE.DryT12, recipes, materials, RadioE);
+            //DryerGetValue(ComboE.DryM13, TextE.DryW13, TextE.DryT13, recipes, materials, RadioE);
+            //DryerGetValue(ComboE.DryM14, TextE.DryW14, TextE.DryT14, recipes, materials, RadioE);
+            //DryerGetValue(ComboE.DryM15, TextE.DryW15, TextE.DryT15, recipes, materials, RadioE);
 
             if (TFlag == 1)
             {
@@ -1285,7 +1288,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
 
         #endregion
 
-        #region 湿混机物料封装
+        #region 干混机物料封装
 
         /// <summary>
         /// 干混机数据打包封装