diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Su/SuSongInit.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Su/SuSongInit.cs index 2c5ad83..4503e33 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Su/SuSongInit.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Su/SuSongInit.cs @@ -98,8 +98,8 @@ namespace Mesnac.Action.ChemicalWeighing.Su int ab= Convert.ToInt32(mCCombobox.MCValue); - var list = FreeDb.FreeSqlUnit.Instance.Queryable().Where(x => x.UpdateTime > a) - .Where(x => x.UpdateTime < b) + var list = FreeDb.FreeSqlUnit.Instance.Queryable().Where(x => x.CreateTime > a) + .Where(x => x.CreateTime < b) .Where(x=>x.No==ab) .Take(1000).OrderByDescending(x => x.UpdateTime).ToList(); @@ -110,7 +110,8 @@ namespace Mesnac.Action.ChemicalWeighing.Su dt.Columns.Add("方式", typeof(string)); dt.Columns.Add("目标仓", typeof(string)); dt.Columns.Add("数量", typeof(string)); - dt.Columns.Add("时间", typeof(string)); + dt.Columns.Add("开始时间", typeof(string)); + dt.Columns.Add("更新时间", typeof(string)); dt.Columns.Add("状态", typeof(string)); foreach (var x in list) @@ -152,9 +153,9 @@ namespace Mesnac.Action.ChemicalWeighing.Su dr[4] = x.Number; dr[5] = Convert.ToDateTime(x.CreateTime).ToString("yyyy-MM-dd hh:mm:ss"); + dr[6] = Convert.ToDateTime(x.UpdateTime).ToString("yyyy-MM-dd hh:mm:ss"); - - dr[6] = x.Remark; + dr[7]h = x.Remark; dt.Rows.Add(dr); } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index 972bcc6..7b27d9a 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -1646,7 +1646,7 @@ 状态 Transparent ButtonHighlight - 164, 90 + 159, 90 MCLabel346 29, 12 @@ -2029,7 +2029,7 @@ 状态 Transparent ButtonHighlight - 162, 96 + 156, 96 MCLabel344 29, 12