|
|
|
@ -15,23 +15,51 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
|
|
|
|
|
/// 获取干混机物料
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public static List<MyMCCombobox> GetDryerMaterrial()
|
|
|
|
|
public static DataTable GetDryerMaterrial()
|
|
|
|
|
{
|
|
|
|
|
var list = GetStockMaterrial(1);
|
|
|
|
|
list.RemoveAll(x => x.CmbValue == 5);
|
|
|
|
|
list.RemoveAll(x => x.CmbValue == 6);
|
|
|
|
|
return list;
|
|
|
|
|
var dt = GetMcBox();
|
|
|
|
|
foreach (var entity in list)
|
|
|
|
|
{
|
|
|
|
|
var dr = dt.NewRow();
|
|
|
|
|
dr[0] = entity.CmbValue.ToString();
|
|
|
|
|
dr[1] = entity.CmbDisplay;
|
|
|
|
|
dt.Rows.Add(dr);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static DataTable GetMcBox()
|
|
|
|
|
{
|
|
|
|
|
DataTable dataTable = new DataTable();
|
|
|
|
|
dataTable.Columns.Add("CmbValue", typeof(string));
|
|
|
|
|
dataTable.Columns.Add("CmbDisplay", typeof(string));
|
|
|
|
|
return dataTable;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取糊化机物料
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public static List<MyMCCombobox> GetSiloMaterrial()
|
|
|
|
|
public static DataTable GetSiloMaterrial()
|
|
|
|
|
{
|
|
|
|
|
var list1 = GetStockMaterrial(1);
|
|
|
|
|
list1 = list1.Where(x => x.CmbValue == 5 || x.CmbValue == 6).ToList();
|
|
|
|
|
return list1;
|
|
|
|
|
var dt = GetMcBox();
|
|
|
|
|
foreach (var entity in list1)
|
|
|
|
|
{
|
|
|
|
|
var dr = dt.NewRow();
|
|
|
|
|
dr[0] = entity.CmbValue.ToString();
|
|
|
|
|
dr[1] = entity.CmbDisplay;
|
|
|
|
|
dt.Rows.Add(dr);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|