From dd5f4450cb6568c7a1c15a9c10674abaeb4084e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=97=E9=93=AD=20=E5=90=95?= <896951544@qq.com>
Date: Fri, 16 May 2025 15:04:40 +0800
Subject: [PATCH] =?UTF-8?q?LCS=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ControlMonitorClient/FrmClient.designer.cs | 5 +++--
 WcfControlMonitorHost/FrmHost.Designer.cs  | 1 +
 WcfControlMonitorHost/FrmHost.cs           | 3 ++-
 webapi/WindowsFormsApp1/APIChannel.cs      | 8 ++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ControlMonitorClient/FrmClient.designer.cs b/ControlMonitorClient/FrmClient.designer.cs
index 5cbadf9..fc47d9d 100644
--- a/ControlMonitorClient/FrmClient.designer.cs
+++ b/ControlMonitorClient/FrmClient.designer.cs
@@ -455,6 +455,7 @@
             this.MIInterfaceUpdate.Name = "MIInterfaceUpdate";
             this.MIInterfaceUpdate.Size = new System.Drawing.Size(242, 26);
             this.MIInterfaceUpdate.Text = "接口异常信息处理";
+            this.MIInterfaceUpdate.Visible = false;
             this.MIInterfaceUpdate.Click += new System.EventHandler(this.MIInterfaceUpdate_Click);
             // 
             // MMUserManage
@@ -543,7 +544,7 @@
             this.dockPanel1.DockBackColor = System.Drawing.SystemColors.Control;
             this.dockPanel1.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingSdi;
             this.dockPanel1.Location = new System.Drawing.Point(0, 38);
-            this.dockPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dockPanel1.Margin = new System.Windows.Forms.Padding(4);
             this.dockPanel1.Name = "dockPanel1";
             this.dockPanel1.ShowDocumentIcon = true;
             this.dockPanel1.Size = new System.Drawing.Size(1069, 512);
@@ -603,7 +604,7 @@
             this.Controls.Add(this.dockPanel1);
             this.Controls.Add(this.menuStrip1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "FrmClient";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git a/WcfControlMonitorHost/FrmHost.Designer.cs b/WcfControlMonitorHost/FrmHost.Designer.cs
index 1395052..d461500 100644
--- a/WcfControlMonitorHost/FrmHost.Designer.cs
+++ b/WcfControlMonitorHost/FrmHost.Designer.cs
@@ -90,6 +90,7 @@
             this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.listBox1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
             this.listBox1.FormattingEnabled = true;
             this.listBox1.HorizontalScrollbar = true;
             this.listBox1.ItemHeight = 15;
diff --git a/WcfControlMonitorHost/FrmHost.cs b/WcfControlMonitorHost/FrmHost.cs
index 9f748d7..9cd1469 100644
--- a/WcfControlMonitorHost/FrmHost.cs
+++ b/WcfControlMonitorHost/FrmHost.cs
@@ -825,7 +825,8 @@ namespace wcfControlMonitorClient
             try
             {
                 if (txtinfo.IndexOf("巡检客户端") >= 0) return true;
-                if (listBox1.Items.Count >= 70) listBox1.Items.Clear();
+                if (listBox1.Items.Count >= 70)
+                    listBox1.Items.Clear();
                 foreach (object li in listBox1.Items)
                 {
                     if (li.ToString().IndexOf(txtinfo) >= 0)
diff --git a/webapi/WindowsFormsApp1/APIChannel.cs b/webapi/WindowsFormsApp1/APIChannel.cs
index 9c07466..9259892 100644
--- a/webapi/WindowsFormsApp1/APIChannel.cs
+++ b/webapi/WindowsFormsApp1/APIChannel.cs
@@ -186,7 +186,11 @@ namespace WindowsFormsApp1
 
                                 }
                                 else if (stepOk == 1 && FSTATUS == 0) {
-                                    sql.Clear();
+                                     sql.Remove(0, sql.Length);
+                                      sql.Append("INSERT INTO T_Manage_Task_BAK SELECT * FROM T_Manage_Task where  FID=").Append(wms_wcs_cancel.taskId).Append(" and F_ManageTaskKindIndex>=1");
+                                    dbo.ExecuteSql(sql.ToString());
+
+                                     sql.Clear();
                                     sql.Append("delete from T_Monitor_Task where F_ManageTaskIndex = '").Append(wms_wcs_cancel.taskId).Append("'");
                                     dbo.ExecuteSql(sql.ToString());
                                     sql.Clear();
@@ -199,11 +203,11 @@ namespace WindowsFormsApp1
                                     sql.Clear();
                                     sql.Append("delete from IO_CONTROL where MANAGE_ID = '").Append(wms_wcs_cancel.taskId).Append("'");
                                     dbo.ExecuteSql(sql.ToString());
+
                                     wcs_wms_cancel.code = 0;
                                     wcs_wms_cancel.msg = "";
                                     wcs_wms_cancel.data = "";
 
-
                                 }
                                 else
                                 {