From 8eaf4618fd765316a1d92fe156e1fa507d4a5528 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 20 十二月 2024 13:52:03 +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 7f03a02..81a7262 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