From 6adfafd9e7fdae7a46cfddec2dabb6196c832f7f Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Sat, 23 Dec 2023 14:47:55 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=B8=80=E9=94=AE=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E6=9C=AA=E5=AE=8C=E6=88=90=E8=AE=A1=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoControl/AutoControl.cs                | 11 ++++++
 .../Entity/GelerWeterControlsEntity.cs        |  1 +
 .../Data/MCProject/nodeForm/AutoControlC.xml  | 37 ++++++++++++++++---
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs
index 420d6cc..a7e340f 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs
@@ -21,6 +21,8 @@ using Mesnac.Action.ChemicalWeighing.InterfaceDocking.DockingEntity;
 using Mesnac.Action.ChemicalWeighing.InterfaceDocking;
 using Mesnac.Action.ChemicalWeighing.SetValueInfo;
 using System.Security.Cryptography.X509Certificates;
+using Mesnac.Action.ChemicalWeighing.FreeDb;
+using Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity;
 
 namespace Mesnac.Action.ChemicalWeighing.AutoControl
 {
@@ -521,6 +523,15 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
 
             #endregion
 
+            #region 清除计时记录
+
+            if(runtime.Sender == ButtonE.TimeRecordClear)
+            {
+                FreeSqlUnit.Instance.Delete<Lj_RGVTimeRecord>().Where(x => x.Done == false).ExecuteDeleted();
+            }
+
+            #endregion
+
         }
 
         #region 下发接料请求
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs
index 304b9da..9bdcb27 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs
@@ -90,6 +90,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.Entity
         public Button EliAlarms { get; set; }
         public Button DownloadRequest { get; set; }
         public Button GelSetWeight { get; set; }
+        public Button TimeRecordClear { get; set; }
     }
 
     public class MCTextBoxEntity
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
index 5a454d0..1edff44 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
@@ -1,5 +1,30 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AutoControlC" children="Controls">
+    <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="TimeRecordClear" children="Controls">
+      <Property name="ClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</Binary>
+      </Property>
+      <Property name="MCKey" />
+      <Property name="MCDataSourceID" />
+      <Property name="IsDbControl">False</Property>
+      <Property name="InitDataSource" />
+      <Property name="ActionDataSource" />
+      <Property name="BindDataSource" />
+      <Property name="DbOptionType">Query</Property>
+      <Property name="MCVisible">True</Property>
+      <Property name="MCEnabled">True</Property>
+      <Property name="MCPurview">False</Property>
+      <Property name="Format" />
+      <Property name="TextName" />
+      <Property name="NewFillColor">Red</Property>
+      <Property name="OldFillColor">DarkGray</Property>
+      <Property name="Text">清除计时记录</Property>
+      <Property name="Font">宋体, 12pt</Property>
+      <Property name="Location">1240, 644</Property>
+      <Property name="Name">TimeRecordClear</Property>
+      <Property name="Size">91, 49</Property>
+      <Property name="TabIndex">76</Property>
+    </Object>
     <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="BtnQz" children="Controls">
       <Property name="ClickActionList">
         <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</Binary>
@@ -20,9 +45,9 @@
       <Property name="OldFillColor">DarkGray</Property>
       <Property name="Text">强制</Property>
       <Property name="Font">宋体, 12pt</Property>
-      <Property name="Location">1212, 646</Property>
+      <Property name="Location">1143, 644</Property>
       <Property name="Name">BtnQz</Property>
-      <Property name="Size">91, 50</Property>
+      <Property name="Size">91, 49</Property>
       <Property name="TabIndex">73</Property>
     </Object>
     <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DownloadRequest" children="Controls">
@@ -2989,9 +3014,9 @@
       <Property name="OldFillColor">DarkGray</Property>
       <Property name="Text">水称下传</Property>
       <Property name="Font">宋体, 12pt</Property>
-      <Property name="Location">643, 650</Property>
+      <Property name="Location">643, 642</Property>
       <Property name="Name">WaterDownload</Property>
-      <Property name="Size">211, 47</Property>
+      <Property name="Size">146, 58</Property>
       <Property name="TabIndex">66</Property>
     </Object>
     <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RepairState" children="Controls">
@@ -3197,7 +3222,7 @@
       <Property name="OldFillColor">DarkGray</Property>
       <Property name="Text">停止</Property>
       <Property name="Font">宋体, 12pt</Property>
-      <Property name="Location">1034, 646</Property>
+      <Property name="Location">969, 644</Property>
       <Property name="Name">LineStop</Property>
       <Property name="Size">168, 50</Property>
       <Property name="TabIndex">7</Property>
@@ -3222,7 +3247,7 @@
       <Property name="OldFillColor">DarkGray</Property>
       <Property name="Text">开始</Property>
       <Property name="Font">宋体, 12pt</Property>
-      <Property name="Location">860, 647</Property>
+      <Property name="Location">795, 644</Property>
       <Property name="Name">LineStart</Property>
       <Property name="Size">168, 50</Property>
       <Property name="TabIndex">6</Property>