Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zrg

2024-03-07 355dec078e44db52fc6c6371debbe44898e6f1f1

 NETERPNoWin/Program.cs

@@ -25,10 +25,12 @@
            {
                if (DBUtility.ClsPub.CheckUpdate())
                {
                    string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
                    System.Diagnostics.Process.Start(strFileName);
                    Application.Exit();
                    return;
                    //string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
                    //System.Diagnostics.Process.Start(strFileName);
                    //Application.Exit();
                    //return;
                    MESMain oMESMain = new MESMain();
                    Application.Run(oMESMain);
                }
                else
                {