From ae28c33700e413d5acf60d1e48bbc9870bdef5a5 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 15 八月 2025 11:27:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Program.cs | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index b0361c8..801da22 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -1,11 +1,13 @@
-锘縰sing System;
+锘縰sing CefSharp;
+using CefSharp.WinForms;
+using Gs.DevApp.DevFrm;
+using Gs.DevApp.DevFrm.Work;
+using Gs.DevApp.Properties;
+using Gs.DevApp.ToolBox;
+using System;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
-using CefSharp.WinForms;
-using CefSharp;
-using Gs.DevApp.DevFrm;
-using DevExpress.XtraEditors;
namespace Gs.DevApp
{
@@ -41,8 +43,6 @@
{
//Application.Run(new XtraForm1());
//return;
-
-
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
Cef.Initialize(settings);
@@ -51,7 +51,22 @@
{
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
- Application.Run(new FrmMain());
+ {
+ //Application.Run(new DevFrm.User.SysMenu());
+ //return;
+ bool IsWeight = false;
+ try
+ {
+ IsWeight = Settings.Default.isWeight;
+ }
+ catch (Exception)
+ {
+ }
+ if (IsWeight == true)
+ Application.Run(new Frm_Work09(QcSeason.浜х嚎绉伴噸.ToString()));
+ else
+ Application.Run(new FrmMain());
+ }
}
else
{
--
Gitblit v1.9.3