From 2caa1d97437e4089a7d6547c2efb87c7990b3b16 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 03 八月 2025 08:51:24 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Program.cs | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 6832ec6..5474a54 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -1,6 +1,8 @@
锘縰sing CefSharp;
using CefSharp.WinForms;
using Gs.DevApp.DevFrm;
+using Gs.DevApp.DevFrm.Work;
+using Gs.DevApp.Properties;
using System;
using System.Diagnostics;
using System.IO;
@@ -48,7 +50,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());
+ else
+ Application.Run(new FrmMain());
+ }
}
else
{
--
Gitblit v1.9.3