From e6a39d52e91f61155625926464f2ceef606825ad Mon Sep 17 00:00:00 2001 From: ChiKyun Kim Date: Tue, 11 Nov 2025 08:39:59 +0900 Subject: [PATCH] .. --- Project/Dialog/fCommon.cs | 2 +- Project/Dialog/fDashboard.cs | 2 +- Project/Dialog/fHolyday.cs | 2 +- Project/Dialog/fJobReport.cs | 2 +- Project/Dialog/fLogin_WB.cs | 2 +- Project/Program.cs | 4 +- Project/Properties/AssemblyInfo.cs | 4 +- Project/Pub.cs | 3 + Project/Setting.cs | 7 +- Project/Web/wwwroot/Common.html | 21 +++--- Project/Web/wwwroot/DashBoard/index.html | 75 +--------------------- Project/Web/wwwroot/react/CommonCode.jsx | 8 +-- Project/fMain.cs | 7 +- Project/fSystemCheck.cs | 12 ++-- SubProject/FPJ0000/OtConfirm/fOTConfirm.cs | 37 ++++++----- 15 files changed, 60 insertions(+), 128 deletions(-) diff --git a/Project/Dialog/fCommon.cs b/Project/Dialog/fCommon.cs index 6a6d3fb..5e1e8c3 100644 --- a/Project/Dialog/fCommon.cs +++ b/Project/Dialog/fCommon.cs @@ -67,7 +67,7 @@ namespace Project.Dialog await this.webView21.EnsureCoreWebView2Async(); } // OWIN 서버의 DashBoard 페이지로 연결 - webView21.Source = new Uri($"{Pub.setting.WebServiceURL}/Common"); + webView21.Source = new Uri($"{Pub.WebServiceURL}/Common"); } catch (Exception ex) { diff --git a/Project/Dialog/fDashboard.cs b/Project/Dialog/fDashboard.cs index 4950a82..9560962 100644 --- a/Project/Dialog/fDashboard.cs +++ b/Project/Dialog/fDashboard.cs @@ -72,7 +72,7 @@ namespace Project.Dialog await this.webView21.EnsureCoreWebView2Async(); } // OWIN 서버의 DashBoard 페이지로 연결 - webView21.Source = new Uri($"{Pub.setting.WebServiceURL}/DashBoard"); + webView21.Source = new Uri($"{Pub.WebServiceURL}/DashBoard"); label1.Visible = false; loadok = true; } diff --git a/Project/Dialog/fHolyday.cs b/Project/Dialog/fHolyday.cs index 4bf2e30..99f23d0 100644 --- a/Project/Dialog/fHolyday.cs +++ b/Project/Dialog/fHolyday.cs @@ -66,7 +66,7 @@ namespace Project.Dialog await this.webView21.EnsureCoreWebView2Async(); } // OWIN 서버의 DashBoard 페이지로 연결 - webView21.Source = new Uri($"{Pub.setting.WebServiceURL}/kuntae"); + webView21.Source = new Uri($"{Pub.WebServiceURL}/kuntae"); } catch (Exception ex) { diff --git a/Project/Dialog/fJobReport.cs b/Project/Dialog/fJobReport.cs index c847fb3..172b956 100644 --- a/Project/Dialog/fJobReport.cs +++ b/Project/Dialog/fJobReport.cs @@ -66,7 +66,7 @@ namespace Project.Dialog await this.webView21.EnsureCoreWebView2Async(); } // OWIN 서버의 DashBoard 페이지로 연결 - webView21.Source = new Uri($"{Pub.setting.WebServiceURL}/Jobreport"); + webView21.Source = new Uri($"{Pub.WebServiceURL}/Jobreport"); } catch (Exception ex) { diff --git a/Project/Dialog/fLogin_WB.cs b/Project/Dialog/fLogin_WB.cs index d861116..433b759 100644 --- a/Project/Dialog/fLogin_WB.cs +++ b/Project/Dialog/fLogin_WB.cs @@ -80,7 +80,7 @@ namespace Project.Dialog webView21.CoreWebView2.WebMessageReceived += WebView2_WebMessageReceived; // OWIN 서버의 Login 페이지로 연결 - webView21.Source = new Uri($"{Pub.setting.WebServiceURL}/home/login"); + webView21.Source = new Uri($"{Pub.WebServiceURL}/home/login"); label1.Visible = false; } catch (Exception ex) diff --git a/Project/Program.cs b/Project/Program.cs index 0c64725..9ea021c 100644 --- a/Project/Program.cs +++ b/Project/Program.cs @@ -58,7 +58,7 @@ namespace Project "동시에 여러 개의 프로그램을 실행할 수 없습니다.\n\n" + "해결방법을 선택하세요:"; - var result = MessageBox.Show(message + "\n\n예(Y): 기존 프로그램을 종료하고 새로 시작\n아니오(N): 현재 실행을 취소", + var result = MessageBox.Show(message + "\n\n예(Y): 기존 프로그램을 종료하고 새로 시작\n아니오(N): 무시하고 실행", "중복실행 감지", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); @@ -93,7 +93,7 @@ namespace Project else { // 현재 실행을 취소 - return false; + return true; } } diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index dc22d04..a71d289 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("25.10.17.1600")] -[assembly: AssemblyFileVersion("25.10.17.1600")] +[assembly: AssemblyVersion("25.11.03.1350")] +[assembly: AssemblyFileVersion("25.11.03.1350")] diff --git a/Project/Pub.cs b/Project/Pub.cs index bd7fdb8..2e7e962 100644 --- a/Project/Pub.cs +++ b/Project/Pub.cs @@ -29,6 +29,7 @@ namespace Project public static DateTime LastInputTime = DateTime.Now; public static CResult Result = new CResult(); public static DatabaseConnectionString.DatabaseInfo dbinfo = null; + public static string WebServiceURL { get; set; } @@ -192,6 +193,8 @@ namespace Project //language Lang.Loading(Pub.setting.Language + ".ini"); + if (WebServiceURL.isEmpty()) + WebServiceURL = "http://127.0.0.1:7979"; } private static WebView2 webView21; diff --git a/Project/Setting.cs b/Project/Setting.cs index 483fc7a..7287985 100644 --- a/Project/Setting.cs +++ b/Project/Setting.cs @@ -70,7 +70,7 @@ namespace Project [Category("Barcode"), DisplayName("Port Name")] public string Barcode { get; set; } - public string WebServiceURL { get; set; } + [Browsable(false)] public string lastid { get; set; } @@ -104,14 +104,9 @@ namespace Project public override void AfterLoad() { - //if (wondoller < 1) wondoller = 1200; - if (WebServiceURL.isEmpty()) - WebServiceURL = "http://127.0.0.1:7979"; - if (Language.isEmpty()) Language = "Kor"; if (Password_Setup.isEmpty()) Password_Setup = "0000"; if (Password_User.isEmpty()) Password_User = "9999"; - //if (lastdept == "") lastdept = "제조본부 장비기술팀 K4장비기술1파트"; var str_toolbar = Xml.get_Data("enum", "HideToolbar", "0"); this.HideToolbar = (eToolPosition)int.Parse(str_toolbar); diff --git a/Project/Web/wwwroot/Common.html b/Project/Web/wwwroot/Common.html index bdcdf3e..bc75b66 100644 --- a/Project/Web/wwwroot/Common.html +++ b/Project/Web/wwwroot/Common.html @@ -298,11 +298,12 @@ - - -