Merge branch 'main' of http://192.168.0.7:4133/cyf/lserp_cs_6.0

# Conflicts:
#	插件库/Lskj.PubModuleDetail/FrmMain.cs

插件库/Lskj.PubModuleDetail/FrmMain.cs

@@ -1,4 +1,4 @@
-/******************************
+/******************************
 * 说明：基础档案带明细模版
 * 创建人：龚宇超
 * 创建日期：2017-11-21
@@ -157,6 +157,8 @@ namespace Lskj.PubModuleDetail
             string guid = this.Tag + "";
             if (string.IsNullOrWhiteSpace(guid))
             {
+                this.CloseExecution();
+                this.mControl.ReleaseResourcesForDispose();
                 return;
             }
             DllModule m = Manager.ModuleForms[guid];
@@ -184,20 +186,33 @@ namespace Lskj.PubModuleDetail
             // confirmed; waiting for FrmMain.Dispose leaves GDI handles alive
             // between module cycles.
             if (!e.Cancel)
+            {
+                this.CloseExecution();
+                this.mControl.ReleaseResourcesForDispose();
+            }
+        }
+
+        private void CloseExecution()
+        {
+            try
             {
                 if (!string.IsNullOrEmpty(this.mControl.SysModel.FrmCloseStored))
                 {
                     string sql = this.mControl.SysModel.FrmCloseStored;
-                    if (this.mControl.SearchObj!=null) sql=this.mControl.SearchObj.ReplaceControlValue(sql);
+                    if (this.mControl.SearchObj != null) sql = this.mControl.SearchObj.ReplaceControlValue(sql);
                     sql = ReplaceHelper.ReplaceUserInfo(sql);
                     string result = SqlHelper.ExecuteScalar(sql) + "";
                     if (!string.IsNullOrEmpty(result)) MessageUtil.Show(result);
                 }
-
-                this.mControl.ReleaseResourcesForDispose();
             }
+            catch (Exception ex)
+            {
+
+            }
+
         }
 
+
         /// <summary>
         /// <para>说明：拿到底部表格数据</para>
         /// <para>创建人：龚宇超</para>