From a149a39d5f42accd1f4d86a9fc78040a200197df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Thu, 20 Jun 2024 09:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Mesnac.Action.ChemicalWeighing/Su/SuSongInit.cs   | 11 ++++++-----
 Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml     |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

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<SuSong>().Where(x => x.UpdateTime > a)
-                .Where(x => x.UpdateTime < b)
+            var list = FreeDb.FreeSqlUnit.Instance.Queryable<SuSong>().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 @@
           <Property name="Text">状态</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">164, 90</Property>
+          <Property name="Location">159, 90</Property>
           <Property name="Name">MCLabel346</Property>
           <Property name="Size">29, 12</Property>
         </Object>
@@ -2029,7 +2029,7 @@
           <Property name="Text">状态</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">162, 96</Property>
+          <Property name="Location">156, 96</Property>
           <Property name="Name">MCLabel344</Property>
           <Property name="Size">29, 12</Property>
         </Object>