SVN r261

SVN-Revision: r261
2025-02-11 08:37:24 +00:00
parent 9cfb9ec919
commit 4d95c53cfd
3 changed files with 147 additions and 94 deletions
@@ -119,25 +119,6 @@ namespace Lskj.AutoWordFile
                Task crateTask = new Task(() =>
                {
                    AutoCreatWord.CreateWordUtil.DbOperator = new Lskj.Data.ADO.Template.DbTemplate(string.Format("server={0};database={1};persist security info=true;user id=lserpAdmin;password=lserp110;max pool size = 512;", DBConfig.Instance.ServerName, DBConfig.Instance.DataBase), "system.data.sqlclient");
-                    AutoCreatWord.CreateWordUtil.Create(mainTempPath, menuTempPath, Model.MenuTempArray, SqlHelper.ExecuteDataSet(Model.MasterSql), savePdfPath, SystemInfo.Instance.OAUrl, out string msg);
-                    cts.Cancel();
-                    if (this.InvokeRequired)
-                    {
-                        this.Invoke(new Action(() =>
-                        {
-                            progressBar1.Value = 100;
-                            Process.Start(savePdfPath);
-                            Close();
-                        }));
-                    }
-                });
-                crateTask.Start();
-            }
-            catch (Exception ex)
-            {
-                MessageUtil.Show(ex.Message);
-                Close();
-            }
-        }
-    }
-}
+                    string[] masterSqls = Model.MasterSql.Trim('^').Split('^');
+                    List<DataSet> dataSets = new List<DataSet>();
+                    for