휴가 승인자 정보 추적

SubProject/FCM0000/Item/fItemAdd.Designer.cs

@@ -380,7 +380,6 @@
             this.MinimumSize = new System.Drawing.Size(685, 448);
             this.Name = "fItemAdd";
             this.Text = "품목 추가";
-            this.Load += new System.EventHandler(this.fItemAdd_Load);
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();

SubProject/FCM0000/Item/fItemAdd.cs

@@ -1,4 +1,5 @@
-using FCOMMON;
+using FarPoint.Excel.EntityClassLibrary.SpreadsheetML;
+using FCOMMON;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -43,14 +44,10 @@ namespace FCM0000.Item
             }
         }
 
-        private void fItemAdd_Load(object sender, EventArgs e)
+        protected override void OnLoad(EventArgs e)
         {
-            if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal;
-            if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0)
-            {
-                this.Location = new Point(0, 0);
-            }
-            this.Show();
+            base.OnLoad(e);
+            EnsureVisibleAndUsableSize();
             //Application.DoEvents();
 
             if (tbSid.Text.isEmpty()) tbSid.Focus();
@@ -77,7 +74,8 @@ namespace FCM0000.Item
             else
             {
                 //이떄는 sid가 정상이어야 한다.
-                if (tbSid.Text.StartsWith("10") == false || tbSid.TextLength != 9)
+                var siddata = tbSid.Text.Split('-')[0].Trim();
+                if (siddata.StartsWith("10") == false || siddata.Length != 9)
                 {
                     Util.MsgE("SID는 9자리 숫자이며 10으로 시작 합니다\n입력값을 확인 하세요");
                     tbSid.Focus();
@@ -87,9 +85,12 @@ namespace FCM0000.Item
 
                 if (ta.ExistSID(FCOMMON.info.Login.gcode, tbSid.Text) > 0)
                 {
-                    Util.MsgE("동일한 SID정보가 있습니다\n화면을 닫은 후 SID로 검색하세요");
-                    this.Close();
-                    return;
+                    var dlg = Util.MsgQ("동일한 SID정보가 있습니다\n강제입력을 진행할까요?\n입력값을 다시 확인하세요.\n품목정보에서 해당 SID정보를 검색해보세요");
+                    if(dlg != DialogResult.Yes)
+                    {
+                        
+                        return;
+                    }
                 }
             }
 

SubProject/FCM0000/Item/fItemEdit.cs

@@ -47,14 +47,11 @@ namespace FCM0000.Item
                 SendKeys.Send("{TAB}");
             }
         }
-
+      
         private void fItemAdd_Load(object sender, EventArgs e)
         {
-            if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal;
-            if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0)
-            {
-                this.Location = new Point(0, 0);
-            }
+            EnsureVisibleAndUsableSize();
+          
 
             tbSid.Text = dr.IssidNull() == false ? dr.sid : string.Empty;
             tbName.Text = dr.IsnameNull() == false ? dr.name : string.Empty;

SubProject/FCM0000/Item/fItems.cs

@@ -28,9 +28,10 @@ namespace FCM0000
         void fItems_FormClosed(object sender, FormClosedEventArgs e)
         {
         }
+        
         private void fItems_Load(object sender, EventArgs e)
         {
-            //get catelist
+            EnsureVisibleAndUsableSize();
             var cateList = FCOMMON.DBM.getGroupTable("cate", "Items", "isnull(cate,'') <> ''");
             this.cmbCate.Items.Clear();
             this.cmbCate.Items.Add("-- All --");

SubProject/FCM0000/Item/fLovItem.cs

@@ -1,4 +1,5 @@
-using System;
+using FCOMMON;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
 
 namespace FCM0000
 {
-    public partial class fLovItem : Form
+    public partial class fLovItem : fBase
     {
         string fn_fpcolsize = "";
 
@@ -59,10 +60,10 @@ namespace FCM0000
             this.tbFind.Text = search_;
             this.StartPosition = FormStartPosition.CenterScreen;
         }
-
+    
         private void fLovItem_Load(object sender, EventArgs e)
         {
-            this.Show();
+            EnsureVisibleAndUsableSize();
             Application.DoEvents();
 
             

SubProject/FCM0000/Item/fLovOneItem.cs

@@ -1,4 +1,5 @@
-using System;
+using FCOMMON;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -9,7 +10,7 @@ using System.Windows.Forms;
 
 namespace FCM0000
 {
-    public partial class fLovOneItem : Form
+    public partial class fLovOneItem : fBase
     {
         public string Title { get; set; }
         DataTable dt;
@@ -49,8 +50,10 @@ namespace FCM0000
             };
 
         }
+      
         private void fLovItem_Load(object sender, EventArgs e)
         {
+            EnsureVisibleAndUsableSize();
             this.bs.DataSource = this.dt;
             this.bn.BindingSource = this.bs;
             this.dv.DataSource = this.bs;