From 3800182d06b5d9d09df1a42e3592531d83b1209a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 23 九月 2024 09:51:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
LMES/Program.cs | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/LMES/Program.cs b/LMES/Program.cs
index 81a7262..7f03a02 100644
--- a/LMES/Program.cs
+++ b/LMES/Program.cs
@@ -15,44 +15,44 @@
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- //Application.Run(new DingDing_autoGetData());
+ Application.Run(new DingDing_autoGetData());
- DBUtility.ClsPub.AppPath = System.Environment.CurrentDirectory;
- Pub_Class.ClsPub.AppPath = System.Environment.CurrentDirectory;
- Pub_Class.ClsPub.SetIPAddress();
- DBUtility.ClsPub.SetIPAddress();
- DBUtility.ClsPub.VersionNum = "12.1";
- Pub_Class.ClsPub.VersionNum = "12.1";//
- //===================================================================
- try
- {
- if (DBUtility.ClsPub.CheckUpdate())
- {
- MessageBox.Show("鍙戠幇鏈�鏂扮増鏈�,闇�瑕佹洿鏂帮紒");
- string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
- System.Diagnostics.Process.Start(strFileName);
- Application.Exit();
- return;
- }
- else
- {
- //============================================
- BLL.FrmLogin frmlg = new BLL.FrmLogin();
- frmlg.ShowDialog();
- if (frmlg.isOk)
- {
- MDIMain MainFrm = new MDIMain();
- Application.Run(MainFrm);
- }
- }
- }
- catch (Exception e)
- {
- MessageBox.Show(e.Message);
- Application.Exit();
- return;
- }
+ //DBUtility.ClsPub.AppPath = System.Environment.CurrentDirectory;
+ //Pub_Class.ClsPub.AppPath = System.Environment.CurrentDirectory;
+ //Pub_Class.ClsPub.SetIPAddress();
+ //DBUtility.ClsPub.SetIPAddress();
+ //DBUtility.ClsPub.VersionNum = "12.1";
+ //Pub_Class.ClsPub.VersionNum = "12.1";//
+ ////===================================================================
+ //try
+ //{
+ // if (DBUtility.ClsPub.CheckUpdate())
+ // {
+ // MessageBox.Show("鍙戠幇鏈�鏂扮増鏈�,闇�瑕佹洿鏂帮紒");
+ // string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
+ // System.Diagnostics.Process.Start(strFileName);
+ // Application.Exit();
+ // return;
+ // }
+ // else
+ // {
+ // //============================================
+ // BLL.FrmLogin frmlg = new BLL.FrmLogin();
+ // frmlg.ShowDialog();
+ // if (frmlg.isOk)
+ // {
+ // MDIMain MainFrm = new MDIMain();
+ // Application.Run(MainFrm);
+ // }
+ // }
+ //}
+ //catch (Exception e)
+ //{
+ // MessageBox.Show(e.Message);
+ // Application.Exit();
+ // return;
+ //}
}
}
}
--
Gitblit v1.9.1