diff --git a/Project/Dialog/fLogin.Designer.cs b/Project/Dialog/fLogin.Designer.cs index c87e5ca..901238b 100644 --- a/Project/Dialog/fLogin.Designer.cs +++ b/Project/Dialog/fLogin.Designer.cs @@ -79,17 +79,17 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(888, 710); + this.panel1.Size = new System.Drawing.Size(888, 639); this.panel1.TabIndex = 0; // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(16, 303); + this.tabControl1.Location = new System.Drawing.Point(16, 288); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(860, 389); + this.tabControl1.Size = new System.Drawing.Size(860, 327); this.tabControl1.TabIndex = 13; // // tabPage1 @@ -98,7 +98,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 32); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(852, 353); + this.tabPage1.Size = new System.Drawing.Size(852, 291); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "FAQ"; this.tabPage1.UseVisualStyleBackColor = true; @@ -111,7 +111,7 @@ this.listView1.HideSelection = false; this.listView1.Location = new System.Drawing.Point(3, 3); this.listView1.Name = "listView1"; - this.listView1.Size = new System.Drawing.Size(846, 347); + this.listView1.Size = new System.Drawing.Size(846, 285); this.listView1.TabIndex = 13; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; @@ -148,7 +148,7 @@ this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F); this.label4.ForeColor = System.Drawing.Color.Teal; - this.label4.Location = new System.Drawing.Point(13, 267); + this.label4.Location = new System.Drawing.Point(13, 257); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(243, 15); this.label4.TabIndex = 10; @@ -181,7 +181,7 @@ this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F); this.tbID.FormattingEnabled = true; this.tbID.ImeMode = System.Windows.Forms.ImeMode.Alpha; - this.tbID.Location = new System.Drawing.Point(16, 213); + this.tbID.Location = new System.Drawing.Point(16, 205); this.tbID.Name = "tbID"; this.tbID.Size = new System.Drawing.Size(364, 41); this.tbID.TabIndex = 3; @@ -191,7 +191,7 @@ this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F); this.label2.ForeColor = System.Drawing.Color.Gray; - this.label2.Location = new System.Drawing.Point(509, 195); + this.label2.Location = new System.Drawing.Point(509, 187); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(31, 15); this.label2.TabIndex = 4; @@ -202,7 +202,7 @@ this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(13, 196); + this.label1.Location = new System.Drawing.Point(13, 188); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(55, 15); this.label1.TabIndex = 2; @@ -212,7 +212,7 @@ // this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tbPW.ImeMode = System.Windows.Forms.ImeMode.Alpha; - this.tbPW.Location = new System.Drawing.Point(512, 213); + this.tbPW.Location = new System.Drawing.Point(512, 205); this.tbPW.Name = "tbPW"; this.tbPW.PasswordChar = '●'; this.tbPW.Size = new System.Drawing.Size(364, 40); @@ -224,18 +224,18 @@ this.panel2.BackColor = System.Drawing.SystemColors.Control; this.panel2.Controls.Add(this.btLogin); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 710); + this.panel2.Location = new System.Drawing.Point(0, 639); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(888, 105); + this.panel2.Size = new System.Drawing.Size(888, 82); this.panel2.TabIndex = 6; // // btLogin // this.btLogin.Dock = System.Windows.Forms.DockStyle.Fill; - this.btLogin.Font = new System.Drawing.Font("맑은 고딕", 40F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btLogin.Font = new System.Drawing.Font("맑은 고딕", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btLogin.Location = new System.Drawing.Point(0, 0); this.btLogin.Name = "btLogin"; - this.btLogin.Size = new System.Drawing.Size(888, 105); + this.btLogin.Size = new System.Drawing.Size(888, 82); this.btLogin.TabIndex = 0; this.btLogin.Text = "접속"; this.btLogin.UseVisualStyleBackColor = true; @@ -245,7 +245,7 @@ // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.OrangeRed; - this.ClientSize = new System.Drawing.Size(888, 815); + this.ClientSize = new System.Drawing.Size(888, 721); this.Controls.Add(this.panel1); this.Controls.Add(this.panel2); this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/Project/Properties/Settings.Designer.cs b/Project/Properties/Settings.Designer.cs index b52c091..db907e7 100644 --- a/Project/Properties/Settings.Designer.cs +++ b/Project/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Project.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Project/Properties/Settings.settings b/Project/Properties/Settings.settings index 32baeec..4d86415 100644 --- a/Project/Properties/Settings.settings +++ b/Project/Properties/Settings.settings @@ -4,7 +4,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> @@ -12,7 +12,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> diff --git a/Project/StateMachine/_MailService.cs b/Project/StateMachine/_MailService.cs index ed82795..c165e29 100644 --- a/Project/StateMachine/_MailService.cs +++ b/Project/StateMachine/_MailService.cs @@ -1044,7 +1044,7 @@ namespace Project "

"; //전송을 해야 함 - var mc = new System.Net.Mail.SmtpClient("10.101.10.6"); + var mc = new System.Net.Mail.SmtpClient("10.101.5.150"); var msg = new System.Net.Mail.MailMessage (list_from, list_to, diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs index d3976de..c1bd83a 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs @@ -333,7 +333,7 @@ label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label7.Name = "label7"; label7.Padding = new System.Windows.Forms.Padding(5); - label7.Size = new System.Drawing.Size(910, 103); + label7.Size = new System.Drawing.Size(910, 80); label7.TabIndex = 1; label7.Text = resources.GetString("label7.Text"); // @@ -591,10 +591,11 @@ // // btSave // - this.btSave.Location = new System.Drawing.Point(11, 749); + this.btSave.Font = new System.Drawing.Font("맑은 고딕", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.btSave.Location = new System.Drawing.Point(929, 13); this.btSave.Margin = new System.Windows.Forms.Padding(4); this.btSave.Name = "btSave"; - this.btSave.Size = new System.Drawing.Size(490, 43); + this.btSave.Size = new System.Drawing.Size(141, 547); this.btSave.TabIndex = 2; this.btSave.Text = "저장(&S)"; this.btSave.UseVisualStyleBackColor = true; @@ -685,10 +686,10 @@ // // btSaveAdd // - this.btSaveAdd.Location = new System.Drawing.Point(511, 749); + this.btSaveAdd.Location = new System.Drawing.Point(929, 584); this.btSaveAdd.Margin = new System.Windows.Forms.Padding(4); this.btSaveAdd.Name = "btSaveAdd"; - this.btSaveAdd.Size = new System.Drawing.Size(410, 43); + this.btSaveAdd.Size = new System.Drawing.Size(141, 136); this.btSaveAdd.TabIndex = 3; this.btSaveAdd.Text = "저장 및 추가(&A)"; this.btSaveAdd.UseVisualStyleBackColor = true; @@ -1162,7 +1163,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(929, 796); + this.ClientSize = new System.Drawing.Size(1079, 729); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.btSaveAdd);