|
|
|
@ -38,6 +38,11 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
|
|
|
|
|
DataTable dataTable = new DataTable();
|
|
|
|
|
dataTable.Columns.Add("CmbValue", typeof(string));
|
|
|
|
|
dataTable.Columns.Add("CmbDisplay", typeof(string));
|
|
|
|
|
|
|
|
|
|
DataRow dr = dataTable.NewRow();
|
|
|
|
|
dr[0] = "-1";
|
|
|
|
|
dr[1] = "请选择";
|
|
|
|
|
dataTable.Rows.Add(dr);
|
|
|
|
|
return dataTable;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -48,7 +53,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
|
|
|
|
|
public static DataTable GetSiloMaterrial()
|
|
|
|
|
{
|
|
|
|
|
var list1 = GetStockMaterrial(1);
|
|
|
|
|
list1 = list1.Where(x => x.CmbValue == 5 || x.CmbValue == 6).ToList();
|
|
|
|
|
list1 = list1.Where(x => x.CmbValue == 5 || x.CmbValue == 6 ).ToList();
|
|
|
|
|
var dt = GetMcBox();
|
|
|
|
|
foreach (var entity in list1)
|
|
|
|
|
{
|
|
|
|
@ -84,11 +89,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
|
|
|
|
|
|
|
|
|
|
var dataTable = DBHelp.GetTable(sql);
|
|
|
|
|
List<MyMCCombobox> ls = new List<MyMCCombobox>();
|
|
|
|
|
ls.Add(new MyMCCombobox()
|
|
|
|
|
{
|
|
|
|
|
CmbValue = -1,
|
|
|
|
|
CmbDisplay = "请选择"
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
foreach (DataRow o in dataTable.Rows)
|
|
|
|
|
{
|
|
|
|
|
int tableMTypeId = Convert.ToInt32(o["MTypeId"]);
|
|
|
|
|