파트리스트 금액칸 9백에서 9조로 수정 함 (붙여넣기 값 오류 있었음)

2020-05-11 13:00:44 +09:00
parent f68c0a0ea4
commit 91c2ddc961
17 changed files with 720 additions and 470 deletions
--- a/Project/Dialog/fLogin.Designer.cs
+++ b/Project/Dialog/fLogin.Designer.cs
@@ -31,15 +31,13 @@
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin));
            this.pictureBox1 = new System.Windows.Forms.PictureBox();
            this.panel1 = new System.Windows.Forms.Panel();
-            this.linkLabel1 = new System.Windows.Forms.LinkLabel();
+            this.linkLabel2 = new System.Windows.Forms.LinkLabel();
            this.cmbDept = new System.Windows.Forms.ComboBox();
            this.tbID = new System.Windows.Forms.ComboBox();
            this.label2 = new System.Windows.Forms.Label();
            this.label1 = new System.Windows.Forms.Label();
            this.tbPW = new System.Windows.Forms.TextBox();
            this.panel2 = new System.Windows.Forms.Panel();
            this.btLogin = new System.Windows.Forms.Button();
            this.linkLabel2 = new System.Windows.Forms.LinkLabel();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
            this.panel1.SuspendLayout();
            this.panel2.SuspendLayout();
@@ -59,8 +57,6 @@
            // 
            this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244)))));
            this.panel1.Controls.Add(this.linkLabel2);
            this.panel1.Controls.Add(this.linkLabel1);
            this.panel1.Controls.Add(this.cmbDept);
            this.panel1.Controls.Add(this.tbID);
            this.panel1.Controls.Add(this.label2);
            this.panel1.Controls.Add(this.label1);
@@ -69,36 +65,28 @@
            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(488, 366);
+            this.panel1.Size = new System.Drawing.Size(488, 276);
            this.panel1.TabIndex = 0;
            // 
-            // linkLabel1
+            // linkLabel2
            // 
-            this.linkLabel1.AutoSize = true;
+            this.linkLabel2.AutoSize = true;
-            this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.linkLabel2.Font = new System.Drawing.Font("맑은 고딕", 9F);
-            this.linkLabel1.Location = new System.Drawing.Point(12, 126);
+            this.linkLabel2.ForeColor = System.Drawing.Color.DodgerBlue;
-            this.linkLabel1.Name = "linkLabel1";
+            this.linkLabel2.LinkColor = System.Drawing.Color.DodgerBlue;
-            this.linkLabel1.Size = new System.Drawing.Size(31, 15);
+            this.linkLabel2.Location = new System.Drawing.Point(13, 247);
-            this.linkLabel1.TabIndex = 0;
+            this.linkLabel2.Name = "linkLabel2";
-            this.linkLabel1.TabStop = true;
+            this.linkLabel2.Size = new System.Drawing.Size(243, 15);
-            this.linkLabel1.Text = "부서";
+            this.linkLabel2.TabIndex = 7;
-            this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+            this.linkLabel2.TabStop = true;
-            // 
+            this.linkLabel2.Text = "문의 ) Chickyun.kim@amkor.co.kr,   T.8567";
-            // cmbDept
+            this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
            // 
            this.cmbDept.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbDept.Font = new System.Drawing.Font("Calibri", 20.25F);
            this.cmbDept.FormattingEnabled = true;
            this.cmbDept.Location = new System.Drawing.Point(15, 144);
            this.cmbDept.Name = "cmbDept";
            this.cmbDept.Size = new System.Drawing.Size(460, 41);
            this.cmbDept.TabIndex = 1;
            // 
            // tbID
            // 
            this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F);
            this.tbID.FormattingEnabled = true;
-            this.tbID.Location = new System.Drawing.Point(15, 217);
+            this.tbID.Location = new System.Drawing.Point(16, 125);
            this.tbID.Name = "tbID";
            this.tbID.Size = new System.Drawing.Size(460, 41);
            this.tbID.TabIndex = 3;
@@ -108,7 +96,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(12, 272);
+            this.label2.Location = new System.Drawing.Point(13, 181);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(31, 15);
            this.label2.TabIndex = 4;
@@ -119,7 +107,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(12, 200);
+            this.label1.Location = new System.Drawing.Point(13, 108);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(55, 15);
            this.label1.TabIndex = 2;
@@ -128,7 +116,7 @@
            // tbPW
            // 
            this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.tbPW.Location = new System.Drawing.Point(15, 291);
+            this.tbPW.Location = new System.Drawing.Point(16, 199);
            this.tbPW.Name = "tbPW";
            this.tbPW.PasswordChar = '●';
            this.tbPW.Size = new System.Drawing.Size(460, 40);
@@ -140,7 +128,7 @@
            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, 366);
+            this.panel2.Location = new System.Drawing.Point(0, 276);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(488, 34);
            this.panel2.TabIndex = 6;
@@ -156,25 +144,11 @@
            this.btLogin.UseVisualStyleBackColor = true;
            this.btLogin.Click += new System.EventHandler(this.button1_Click);
            // 
            // linkLabel2
            // 
            this.linkLabel2.AutoSize = true;
            this.linkLabel2.Font = new System.Drawing.Font("맑은 고딕", 9F);
            this.linkLabel2.ForeColor = System.Drawing.Color.DodgerBlue;
            this.linkLabel2.LinkColor = System.Drawing.Color.DodgerBlue;
            this.linkLabel2.Location = new System.Drawing.Point(12, 339);
            this.linkLabel2.Name = "linkLabel2";
            this.linkLabel2.Size = new System.Drawing.Size(243, 15);
            this.linkLabel2.TabIndex = 7;
            this.linkLabel2.TabStop = true;
            this.linkLabel2.Text = "문의 ) Chickyun.kim@amkor.co.kr,   T.8567";
            this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
            // 
            // fLogin
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
            this.BackColor = System.Drawing.Color.OrangeRed;
-            this.ClientSize = new System.Drawing.Size(488, 400);
+            this.ClientSize = new System.Drawing.Size(488, 310);
            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)));
@@ -202,8 +176,6 @@
        private System.Windows.Forms.Label label1;
        private System.Windows.Forms.Label label2;
        private System.Windows.Forms.ComboBox tbID;
        private System.Windows.Forms.ComboBox cmbDept;
        private System.Windows.Forms.LinkLabel linkLabel1;
        private System.Windows.Forms.LinkLabel linkLabel2;
    }
 }
--- a/Project/Dialog/fLogin.cs
+++ b/Project/Dialog/fLogin.cs
@@ -28,10 +28,10 @@ namespace Project.Dialog
                if (item != "") tbID.Items.Add(item);
            if (tbID.Items.Count > 0) tbID.SelectedIndex = 0;
-            var dlist = Pub.setting.lastdept.Split(';');
+            //var dlist = Pub.setting.lastdept.Split(';');
-            foreach (var item in dlist)
+            //foreach (var item in dlist)
-                if (item != "") this.cmbDept.Items.Add(item);
+            //    if (item != "") this.cmbDept.Items.Add(item);
-            if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0;
+            //if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0;
            this.Show();
            Application.DoEvents();
@@ -58,22 +58,22 @@ namespace Project.Dialog
            foreach (var item in this.tbID.Items)
                if (idlist.Contains(item) == false) idlist.Add(item.ToString());
-            List<string> deptlist = new List<string>();
+            //List<string> deptlist = new List<string>();
-            deptlist.Add(cmbDept.Text.Trim());
+            //deptlist.Add(cmbDept.Text.Trim());
-            foreach (var item in this.cmbDept.Items)
+            //foreach (var item in this.cmbDept.Items)
-                if (deptlist.Contains(item) == false) deptlist.Add(item.ToString());
+            //    if (deptlist.Contains(item) == false) deptlist.Add(item.ToString());
            //180605
            var vuserlist = "";
            foreach (var item in idlist)
                vuserlist += ";" + item;
-            var vdeptlist = "";
+            //var vdeptlist = "";
-            foreach(var item in deptlist)
+            //foreach(var item in deptlist)
-                vdeptlist += ";" + item;
+            //    vdeptlist += ";" + item;
            Pub.setting.lastid = vuserlist;// tbID.Text.Trim();
-            Pub.setting.lastdept = vdeptlist;
+           // Pub.setting.lastdept = vdeptlist;
            Pub.setting.Save();
            var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim());
@@ -95,23 +95,23 @@ namespace Project.Dialog
                //이사용자의 부서 코드확인
                var userdr = users.Rows[0] as dsMSSQL.UsersRow;
-                if (userdr.level < 9 && userdr.dept != cmbDept.Text)
+                //if (userdr.level < 9 && userdr.dept != cmbDept.Text)
-                {
+                //{
-                    Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
+                //    Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
-                    return;
+                //    return;
-                }
+                //}
                FCOMMON.info.Login.no = userdr.id;
                FCOMMON.info.Login.nameK = userdr.name;
-                FCOMMON.info.Login.dept = cmbDept.Text;
+                FCOMMON.info.Login.dept = userdr.dept;// cmbDept.Text;
                FCOMMON.info.Login.level = userdr.level;
                FCOMMON.info.Login.email = userdr.email;
                FCOMMON.info.Login.nameE = userdr.nameE;
                FCOMMON.info.Login.hp = userdr.hp;
                FCOMMON.info.Login.tel = userdr.tel;
                FCOMMON.info.Login.title = userdr.ads_title;
-                var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
+                var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + userdr.dept + "'");
-                var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
+                var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + userdr.dept + "'");
                FCOMMON.info.Login.gcode = gcode;
                FCOMMON.info.Login.process = userdr.processs;
                FCOMMON.info.Login.permission = 0;
@@ -133,13 +133,13 @@ namespace Project.Dialog
        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
        {
-            var f = new Dialog.fSelectDept();
+            //var f = new Dialog.fSelectDept();
-            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            //if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-            {
+            //{
-                if (cmbDept.Items.Contains(f.deptName) == false)
+            //    if (cmbDept.Items.Contains(f.deptName) == false)
-                    cmbDept.Items.Add(f.deptName);
+            //        cmbDept.Items.Add(f.deptName);
-                cmbDept.Text = f.deptName;
+            //    cmbDept.Text = f.deptName;
-            }
+            //}
        }
        private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("20.05.07.1700")]
+[assembly: AssemblyVersion("20.05.11.1300")]
-[assembly: AssemblyFileVersion("20.05.07.1700")]
+[assembly: AssemblyFileVersion("20.05.11.1300")]
--- a/Project/_Common/fADSUserList.cs
+++ b/Project/_Common/fADSUserList.cs
@@ -220,11 +220,20 @@ namespace Project._Common
                try
                {
-                    taUser.InsertADSInfo(
+                    //이 대상의 id가 잇는지 체크한다.
                    if(taUser.ExistID(pager) > 0)
                    {
                        taUser.UpdateDept(dept, pager);
                    }
                    else
                    {
                        taUser.InsertADSInfo(
                        pager, disp, sn, dept,
-                        mail, tel, empno,title,
+                        mail, tel, empno, title,
                        whencre,
-                        "Auto Gen", FCOMMON.info.Login.no, DateTime.Now );
+                        "Auto Gen", FCOMMON.info.Login.no, DateTime.Now);
                    }
                }
                catch (Exception eX)
                {
--- a/Project/dsMSSQL.Designer.cs
+++ b/Project/dsMSSQL.Designer.cs
@@ -6440,7 +6440,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
        private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7];
            this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[0].Connection = this.Connection;
            this._commandCollection[0].CommandText = @"SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, processs, gcode
@@ -6452,48 +6452,59 @@ ORDER BY name";
            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[1].Connection = this.Connection;
-            this._commandCollection[1].CommandText = "SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, te" +
+            this._commandCollection[1].CommandText = "SELECT COUNT(*) FROM Users where id = @userid";
                "l, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, processs," +
                " gcode\r\nFROM     Users\r\nWHERE  (name = @username) AND (password = @encpw)";
            this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
-            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@encpw", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[2].Connection = this.Connection;
            this._commandCollection[2].CommandText = "SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, te" +
                "l, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, processs," +
-                " gcode\r\nFROM     Users\r\nWHERE  (id = @id)\r\nORDER BY name";
+                " gcode\r\nFROM     Users\r\nWHERE  (name = @username) AND (password = @encpw)";
            this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
-            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@encpw", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[3].Connection = this.Connection;
-            this._commandCollection[3].CommandText = @"SELECT  ads_created, ads_employNo, ads_title, dept, email, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, tel, wdate, wuid, processs, gcode
+            this._commandCollection[3].CommandText = "SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, te" +
                "l, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, processs," +
                " gcode\r\nFROM     Users\r\nWHERE  (id = @id)\r\nORDER BY name";
            this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[4].Connection = this.Connection;
            this._commandCollection[4].CommandText = @"SELECT  ads_created, ads_employNo, ads_title, dept, email, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, tel, wdate, wuid, processs, gcode
 FROM     Users
 WHERE  (password = @encpw) AND (level > 0) AND (email = @idkey) OR
               (password = @encpw) AND (level > 0) AND (id = @idkey) OR
               (password = @encpw) AND (level > 0) AND (email = { fn CONCAT(@idkey, '@amkor.co.kr') })";
-            this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
-            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@encpw", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@encpw", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idkey", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idkey", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
-            this._commandCollection[4].Connection = this.Connection;
+            this._commandCollection[5].Connection = this.Connection;
-            this._commandCollection[4].CommandText = @"INSERT INTO Users
+            this._commandCollection[5].CommandText = @"INSERT INTO Users
               (id, password, nameE, name, dept, email, level, tel, ads_employNo, ads_title, ads_created, memo, wuid, wdate)
 VALUES  (@id, 'B6589FC6AB0DC82CF12099D1C2D40AB994E8410C',@nameE,@name,@dept,@email, 0,@tel,@ads_employNo,@ads_title,@ads_created,@memo,@wuid,@wdate); 
 SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate FROM Users WHERE (id = @id) ORDER BY name";
-            this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[5].CommandType = global::System.Data.CommandType.Text;
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nameE", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "nameE", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nameE", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "nameE", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_employNo", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ads_employNo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_employNo", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ads_employNo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_title", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "ads_title", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_title", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "ads_title", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_created", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ads_created", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_created", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ads_created", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[6].Connection = this.Connection;
            this._commandCollection[6].CommandText = "UPDATE Users\r\nSET         dept = @dept\r\nWHERE  (id = @Original_id); ";
            this._commandCollection[6].CommandType = global::System.Data.CommandType.Text;
            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
        }
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6549,7 +6560,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
        public virtual int FillByNamePw(dsMSSQL.UsersDataTable dataTable, string username, string encpw) {
-            this.Adapter.SelectCommand = this.CommandCollection[1];
+            this.Adapter.SelectCommand = this.CommandCollection[2];
            if ((username == null)) {
                this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
            }
@@ -6574,7 +6585,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
        public virtual dsMSSQL.UsersDataTable GetByNamePw(string username, string encpw) {
-            this.Adapter.SelectCommand = this.CommandCollection[1];
+            this.Adapter.SelectCommand = this.CommandCollection[2];
            if ((username == null)) {
                this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
            }
@@ -6597,7 +6608,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
        public virtual int FillID(dsMSSQL.UsersDataTable dataTable, string id) {
-            this.Adapter.SelectCommand = this.CommandCollection[2];
+            this.Adapter.SelectCommand = this.CommandCollection[3];
            if ((id == null)) {
                throw new global::System.ArgumentNullException("id");
            }
@@ -6616,7 +6627,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
        public virtual dsMSSQL.UsersDataTable GetID(string id) {
-            this.Adapter.SelectCommand = this.CommandCollection[2];
+            this.Adapter.SelectCommand = this.CommandCollection[3];
            if ((id == null)) {
                throw new global::System.ArgumentNullException("id");
            }
@@ -6633,7 +6644,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
        public virtual int FillIDPW(dsMSSQL.UsersDataTable dataTable, string encpw, string idkey) {
-            this.Adapter.SelectCommand = this.CommandCollection[3];
+            this.Adapter.SelectCommand = this.CommandCollection[4];
            if ((encpw == null)) {
                this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
            }
@@ -6658,7 +6669,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
        public virtual dsMSSQL.UsersDataTable GetIDPW(string encpw, string idkey) {
-            this.Adapter.SelectCommand = this.CommandCollection[3];
+            this.Adapter.SelectCommand = this.CommandCollection[4];
            if ((encpw == null)) {
                this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
            }
@@ -7248,12 +7259,46 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
            return this.Update(Original_id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, process, gcode, Original_id);
        }
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        public virtual global::System.Nullable<int> ExistID(string userid) {
            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
            if ((userid == null)) {
                throw new global::System.ArgumentNullException("userid");
            }
            else {
                command.Parameters[0].Value = ((string)(userid));
            }
            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                        != global::System.Data.ConnectionState.Open)) {
                command.Connection.Open();
            }
            object returnValue;
            try {
                returnValue = command.ExecuteScalar();
            }
            finally {
                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
                    command.Connection.Close();
                }
            }
            if (((returnValue == null) 
                        || (returnValue.GetType() == typeof(global::System.DBNull)))) {
                return new global::System.Nullable<int>();
            }
            else {
                return new global::System.Nullable<int>(((int)(returnValue)));
            }
        }
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, false)]
        public virtual int InsertADSInfo(string id, string nameE, string name, string dept, string email, string tel, string ads_employNo, string ads_title, string ads_created, string memo, string wuid, System.DateTime wdate) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
            if ((id == null)) {
                throw new global::System.ArgumentNullException("id");
            }
@@ -7337,6 +7382,41 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
            }
            return returnValue;
        }
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)]
        public virtual int UpdateDept(string dept, string Original_id) {
            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
            if ((dept == null)) {
                command.Parameters[0].Value = global::System.DBNull.Value;
            }
            else {
                command.Parameters[0].Value = ((string)(dept));
            }
            if ((Original_id == null)) {
                throw new global::System.ArgumentNullException("Original_id");
            }
            else {
                command.Parameters[1].Value = ((string)(Original_id));
            }
            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                        != global::System.Data.ConnectionState.Open)) {
                command.Connection.Open();
            }
            int returnValue;
            try {
                returnValue = command.ExecuteNonQuery();
            }
            finally {
                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
                    command.Connection.Close();
                }
            }
            return returnValue;
        }
    }
    /// <summary>
--- a/Project/dsMSSQL.xsd
+++ b/Project/dsMSSQL.xsd
@@ -155,6 +155,16 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
              <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
            </Mappings>
            <Sources>
              <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="ExistID" Modifier="Public" Name="ExistID" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="ExistID">
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>SELECT COUNT(*) FROM Users where id = @userid</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="userid" ColumnName="id" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@userid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </SelectCommand>
              </DbSource>
              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByNamePw" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByNamePw" GeneratorSourceName="FillByNamePw" GetMethodModifier="Public" GetMethodName="GetByNamePw" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByNamePw" UserSourceName="FillByNamePw">
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
@@ -196,7 +206,7 @@ WHERE  (password = @encpw) AND (level &gt; 0) AND (email = @idkey) OR
                  </DbCommand>
                </SelectCommand>
              </DbSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="InsertADSInfo" Modifier="Public" Name="InsertADSInfo" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="InsertADSInfo">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="InsertADSInfo" Modifier="Public" Name="InsertADSInfo" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="InsertADSInfo">
                <InsertCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>INSERT INTO Users
@@ -220,6 +230,19 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
                  </DbCommand>
                </InsertCommand>
              </DbSource>
              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="UpdateDept" Modifier="Public" Name="UpdateDept" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="UpdateDept">
                <UpdateCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>UPDATE Users
 SET         dept = @dept
 WHERE  (id = @Original_id); </CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="true" AutogeneratedName="dept" ColumnName="dept" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="Original_id" ColumnName="id" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_id" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </UpdateCommand>
              </DbSource>
            </Sources>
          </TableAdapter>
          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ProjectsTableAdapter" GeneratorDataComponentClassName="ProjectsTableAdapter" Name="Projects" UserDataComponentName="ProjectsTableAdapter">
--- a/Project/dsMSSQL.xss
+++ b/Project/dsMSSQL.xss
@@ -4,9 +4,9 @@
     Changes to this file may cause incorrect behavior and will be lost if
     the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="113" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="28" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
-    <Shape ID="DesignTable:Users" ZOrder="3" X="38" Y="90" Height="554" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
+    <Shape ID="DesignTable:Users" ZOrder="3" X="38" Y="90" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
    <Shape ID="DesignTable:Projects" ZOrder="8" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
    <Shape ID="DesignTable:Items" ZOrder="7" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
    <Shape ID="DesignTable:Inventory" ZOrder="6" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
--- a/SubProject/FEQ0000/Purchase/fPurchase_AddS.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_AddS.Designer.cs
@@ -39,6 +39,7 @@
            System.Windows.Forms.Label label3;
            System.Windows.Forms.Label label6;
            System.Windows.Forms.Label label2;
            System.Windows.Forms.Label receiveLabel;
            this.tbSID = new System.Windows.Forms.TextBox();
            this.tbPumName = new System.Windows.Forms.TextBox();
            this.tbPumModel = new System.Windows.Forms.TextBox();
@@ -63,6 +64,7 @@
            this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
            this.cmbPlace = new System.Windows.Forms.ComboBox();
            this.pictureBox1 = new System.Windows.Forms.PictureBox();
            this.cmbReceive = new System.Windows.Forms.ComboBox();
            sidLabel = new System.Windows.Forms.Label();
            pumscaleLabel = new System.Windows.Forms.Label();
            pumqtyLabel = new System.Windows.Forms.Label();
@@ -73,6 +75,7 @@
            label3 = new System.Windows.Forms.Label();
            label6 = new System.Windows.Forms.Label();
            label2 = new System.Windows.Forms.Label();
            receiveLabel = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.purchaseBindingSource)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -406,18 +409,43 @@
            // 
            this.pictureBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
            this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pictureBox1.Location = new System.Drawing.Point(490, 11);
+            this.pictureBox1.Location = new System.Drawing.Point(490, 44);
            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(393, 538);
+            this.pictureBox1.Size = new System.Drawing.Size(393, 505);
            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
            this.pictureBox1.TabIndex = 33;
            this.pictureBox1.TabStop = false;
            // 
            // receiveLabel
            // 
            receiveLabel.AutoSize = true;
            receiveLabel.Location = new System.Drawing.Point(494, 11);
            receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            receiveLabel.Name = "receiveLabel";
            receiveLabel.Size = new System.Drawing.Size(54, 20);
            receiveLabel.TabIndex = 34;
            receiveLabel.Text = "수령인";
            // 
            // cmbReceive
            // 
            this.cmbReceive.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
            this.cmbReceive.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
            this.cmbReceive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbReceive.FormattingEnabled = true;
            this.cmbReceive.ImeMode = System.Windows.Forms.ImeMode.Hangul;
            this.cmbReceive.Location = new System.Drawing.Point(556, 9);
            this.cmbReceive.Margin = new System.Windows.Forms.Padding(4);
            this.cmbReceive.Name = "cmbReceive";
            this.cmbReceive.Size = new System.Drawing.Size(327, 28);
            this.cmbReceive.TabIndex = 35;
            // 
            // fPurchase_AddS
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(895, 561);
            this.Controls.Add(receiveLabel);
            this.Controls.Add(this.cmbReceive);
            this.Controls.Add(this.pictureBox1);
            this.Controls.Add(this.cmbPlace);
            this.Controls.Add(label2);
@@ -490,5 +518,6 @@
        private System.Windows.Forms.LinkLabel linkLabel6;
        private System.Windows.Forms.ComboBox cmbPlace;
        private System.Windows.Forms.PictureBox pictureBox1;
        private System.Windows.Forms.ComboBox cmbReceive;
    }
 }
--- a/SubProject/FEQ0000/Purchase/fPurchase_AddS.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_AddS.cs
@@ -62,6 +62,7 @@ namespace FEQ0000
            var userList = FCOMMON.DBM.getUserList(); //.getGroupList("name", "Users", "[level] > 0 and [level] < 10");
            foreach (var user in userList)
            {
                this.cmbReceive.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value));
                this.cmbRequest.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value));
            }
@@ -81,6 +82,18 @@ namespace FEQ0000
                }
            } else cmbRequest.Text = dr.request;
            if (cmbReceive.Items.Count > 0)
            {
                for (int i = 0; i < cmbReceive.Items.Count; i++)
                {
                    if (cmbReceive.Items[i].ToString().StartsWith("[" + dr.receive + "]"))
                    {
                        cmbReceive.SelectedIndex = i;
                        break;
                    }
                }
            }
            else cmbReceive.Text = dr.receive;
            cmbPlace.Text = dr.place;
@@ -113,6 +126,8 @@ namespace FEQ0000
            if (curLevel < 5)
            {
                if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
                    cmbReceive.Enabled = false;
                cmbState.Enabled = false;
                if (cmbRequest.Text != "") cmbRequest.Enabled = false;
@@ -382,6 +397,13 @@ namespace FEQ0000
            else dr.supplyidx = int.Parse(tbSupplyIndex.Text);
            dr.state = cmbState.Text.Trim();
            if (cmbReceive.Text.IndexOf("]") != -1)
                dr.receive = cmbReceive.Text.Substring(1, cmbReceive.Text.IndexOf("]") - 1);
            else
                dr.receive = cmbReceive.Text.Trim();
            dr.bigo = tbBigo.Text;
            //품정보가 업데이트 되어있으면 해당 데이터의 이미지를 업데이트 한다.(크기비교)
--- a/SubProject/FEQ0000/Purchase/fPurchase_AddS.resx
+++ b/SubProject/FEQ0000/Purchase/fPurchase_AddS.resx
@@ -150,6 +150,9 @@
  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>490, 17</value>
  </metadata>
  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>490, 17</value>
  </metadata>
  <metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
@@ -159,6 +162,9 @@
  <metadata name="purchaseTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>313, 17</value>
  </metadata>
  <metadata name="receiveLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>58</value>
  </metadata>
--- a/SubProject/FPJ0000/JobReport/fJobReport.cs
+++ b/SubProject/FPJ0000/JobReport/fJobReport.cs
@@ -40,7 +40,7 @@ namespace FPJ0000
            var processStr = "%";
            if (cmbProcess.SelectedIndex > 0) processStr = cmbProcess.Text;
-            var dtUserList = taUserList.GetData(processStr);
+            var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
            foreach (dsReport.ProcessUserListRow dr in dtUserList)
            {
                string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
--- a/SubProject/FPJ0000/Project/fPartList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs
@@ -739,6 +739,8 @@
            // 
            this.fpSpread1.AccessibleDescription = "";
            this.fpSpread1.AllowDragFill = true;
            this.fpSpread1.AutoAdvance = true;
            this.fpSpread1.ClipboardPasteToFill = true;
            this.fpSpread1.ContextMenuStrip = this.cm1;
            this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.fpSpread1.EditModeReplace = true;
@@ -881,19 +883,25 @@
            this.fpSpread1_Sheet1.Columns.Get(9).Label = "N대 수량";
            this.fpSpread1_Sheet1.Columns.Get(9).Tag = "qtyn";
            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
            numberCellType5.DecimalPlaces = 0;
            numberCellType5.MaximumValue = 9999999999999.99D;
            numberCellType5.MinimumValue = -9999999999999.99D;
            numberCellType5.NegativeRed = true;
            numberCellType5.NullDisplay = "--";
            numberCellType5.Separator = ",";
            numberCellType5.ShowSeparator = true;
            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType5;
            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "amt";
            this.fpSpread1_Sheet1.Columns.Get(10).Formula = "RC[-3]*RC[-2]";
            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
            this.fpSpread1_Sheet1.Columns.Get(10).Label = "1대 금액";
            this.fpSpread1_Sheet1.Columns.Get(10).Tag = "amt";
            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5;
            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amtn";
            this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[-4]*RC[-2]";
            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
            this.fpSpread1_Sheet1.Columns.Get(11).Label = "N대 금액";
            this.fpSpread1_Sheet1.Columns.Get(11).Tag = "amtn";
--- a/SubProject/FPJ0000/Project/fPartList.cs
+++ b/SubProject/FPJ0000/Project/fPartList.cs
@@ -160,6 +160,8 @@ namespace FPJ0000
            var delindex = this.fpSpread1.ActiveSheet.Columns["sid"].Index;
            var col_pmp = this.fpSpread1.ActiveSheet.Columns["pmp"].Index;
            var col_buy = this.fpSpread1.ActiveSheet.Columns["buy"].Index;
            var col_amt = this.fpSpread1.ActiveSheet.Columns["amt"].Index;
            var col_amtn = this.fpSpread1.ActiveSheet.Columns["amtn"].Index;
            for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
            {
                var value = this.fpSpread1.ActiveSheet.GetValue(i, delindex);
@@ -178,6 +180,8 @@ namespace FPJ0000
                this.fpSpread1.ActiveSheet.Cells[i, delindex].BackColor = Color.FromArgb(240,240, 250);
                this.fpSpread1.ActiveSheet.Cells[i, col_pmp].BackColor = Color.FromArgb(240, 240, 240);
                this.fpSpread1.ActiveSheet.Cells[i, col_buy].BackColor = Color.FromArgb(200,200,255);
                this.fpSpread1.ActiveSheet.Cells[i, col_amt].BackColor = Color.WhiteSmoke;
                this.fpSpread1.ActiveSheet.Cells[i, col_amtn].BackColor = Color.WhiteSmoke;
            }
@@ -186,13 +190,11 @@ namespace FPJ0000
        void RefreshSum()
        {
-            decimal sum = 0;
+            decimal sum =  this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
-            foreach (dsPRJ.ProjectsPartRow dr in this.dsPRJ.ProjectsPart.Rows)
+            decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
-            {
+
-                if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
+
-                sum += dr.amt;
+            lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", sum, sumN);
            }
            lbSum.Text = sum.ToString("N0");
        }
--- a/SubProject/FPJ0000/Project/fPartList.resx
+++ b/SubProject/FPJ0000/Project/fPartList.resx
@@ -280,57 +280,57 @@
  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANISURBVDhPtZBdTFN3GIdJvFu4ULMaVIiZW0JCci6GLhCp
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        q5sSNE8iWWjCmiSFg8E8sT2k/ZtAQmLqu9h4h4+bC7eoBF7iR3hWRRLr0tVUVEqLeXWSXMpgkeGh9f/H
-        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
+        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
 </value>
  </data>
  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        yWQik8bw8DCGhoag18oRo6+itOFG6dMAtldfIjpxE+23W/9+wGHxIY/FbVcsmx9olHL3wT66gB9bNBaN
-        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
+        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
-        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
+        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
-        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
+        F53gvpdq4iPUCyuXbgH3+QVePaj9ysrq6sQjqurt7UVPTw+Cqks73OYqytt+lNb5GazbD9VzVApx5F+P
-        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
+        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
 </value>
  </data>
  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
-        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
+        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
-        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
+        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
-        1uZehs0VZNHJQePbvBPFL6dx9tawR5SrCglE/XO4Umf9sbDEDpi9MEwxMEwz0JsZ6CZXoPm+jM4hN5YZ
+        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
-        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
+        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
-        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
+        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
-        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
+        xUtuVwQj63UUUusiIa6+hNjqWDQNraB5xILGb5vYID0FyHppXiAqF+0NzE1jNePdeDUsQ5EyhZdEV4WQ
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        EZGvDAq2E9uMLSj4H26yQkRmW1CwW/bGYzJbf6318FrY7E7f1hSlKxAnRWZ1T0w5PE7T1KJvYoHChJXC
+        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
-        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
+        6WLVYufhmrfQLJaNGw6KojY8b7V8d8UFghOJbcne4taOYxKFyVvSQP8h3onXb8QNtKe4Zf1wbEunV4w8
-        LhAIBL8ByxmhJDO9TtAAAAAASUVORK5CYII=
+        TiAQCH4BkPChBKRJ4EwAAAAASUVORK5CYII=
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -352,19 +352,18 @@
  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
-        zIfemk9tmloazBoWoYYow0TYAI0JNzAkvfxacvlhuEpHbBgoyKBf/koDrxDWp3sud0u31mOf7bOzfXc+
+        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
-        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
+        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
-        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
+        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
-        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
+        vUilUnC5XMIemqYRj8eFG/HiejEVRfl8PkQiEXJlSSAQgN1ulxDx+Pi4hMTQ6XQSIlar1RJ+JuSXy+W1
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
        YII=
 </value>
  </data>
  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/SubProject/FPJ0000/dsReport.Designer.cs
+++ b/SubProject/FPJ0000/dsReport.Designer.cs
@@ -1355,6 +1355,8 @@ namespace FPJ0000 {
            private global::System.Data.DataColumn columnname;
            private global::System.Data.DataColumn columngcode;
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
            public ProcessUserListDataTable() {
@@ -1404,6 +1406,14 @@ namespace FPJ0000 {
                }
            }
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
            public global::System.Data.DataColumn gcodeColumn {
                get {
                    return this.columngcode;
                }
            }
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
            [global::System.ComponentModel.Browsable(false)]
@@ -1441,11 +1451,12 @@ namespace FPJ0000 {
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public ProcessUserListRow AddProcessUserListRow(string id, string name) {
+            public ProcessUserListRow AddProcessUserListRow(string id, string name, string gcode) {
                ProcessUserListRow rowProcessUserListRow = ((ProcessUserListRow)(this.NewRow()));
                object[] columnValuesArray = new object[] {
                        id,
-                        name};
+                        name,
                        gcode};
                rowProcessUserListRow.ItemArray = columnValuesArray;
                this.Rows.Add(rowProcessUserListRow);
                return rowProcessUserListRow;
@@ -1470,6 +1481,7 @@ namespace FPJ0000 {
            internal void InitVars() {
                this.columnid = base.Columns["id"];
                this.columnname = base.Columns["name"];
                this.columngcode = base.Columns["gcode"];
            }
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1479,11 +1491,14 @@ namespace FPJ0000 {
                base.Columns.Add(this.columnid);
                this.columnname = new global::System.Data.DataColumn("name", typeof(string), null, global::System.Data.MappingType.Element);
                base.Columns.Add(this.columnname);
                this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element);
                base.Columns.Add(this.columngcode);
                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                this.columnid}, false));
                this.columnid.Unique = true;
                this.columnid.MaxLength = 20;
                this.columnname.MaxLength = 100;
                this.columngcode.MaxLength = 10;
            }
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2269,6 +2284,22 @@ namespace FPJ0000 {
                }
            }
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
            public string gcode {
                get {
                    if (this.IsgcodeNull()) {
                        return string.Empty;
                    }
                    else {
                        return ((string)(this[this.tableProcessUserList.gcodeColumn]));
                    }
                }
                set {
                    this[this.tableProcessUserList.gcodeColumn] = value;
                }
            }
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
            public bool IsidNull() {
@@ -2292,6 +2323,18 @@ namespace FPJ0000 {
            public void SetnameNull() {
                this[this.tableProcessUserList.nameColumn] = global::System.Convert.DBNull;
            }
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
            public bool IsgcodeNull() {
                return this.IsNull(this.tableProcessUserList.gcodeColumn);
            }
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
            public void SetgcodeNull() {
                this[this.tableProcessUserList.gcodeColumn] = global::System.Convert.DBNull;
            }
        }
        /// <summary>
@@ -3301,28 +3344,34 @@ ORDER BY processs, JobReport.pdate, uname";
            tableMapping.DataSetTable = "ProcessUserList";
            tableMapping.ColumnMappings.Add("id", "id");
            tableMapping.ColumnMappings.Add("name", "name");
            tableMapping.ColumnMappings.Add("gcode", "gcode");
            this._adapter.TableMappings.Add(tableMapping);
            this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
            this._adapter.DeleteCommand.Connection = this.Connection;
            this._adapter.DeleteCommand.CommandText = "DELETE FROM [Users] WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Origina" +
-                "l_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)))" +
+                "l_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) " +
-                "";
+                "AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)))";
            this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_id", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
            this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
            this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE [Users] SET [id] = @id, [name] = @name WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)));
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [Users] SET [id] = @id, [name] = @name, [gcode] = @gcode WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)));
-SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name ORDER BY Users.name";
+SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name, Users.gcode ORDER BY Users.name";
            this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_id", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
        }
@@ -3339,19 +3388,22 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
            this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT  Users.id, Users.name\r\nFROM     Users RIGHT OUTER JOIN\r\n               Job" +
+            this._commandCollection[0].CommandText = @"SELECT  Users.id, Users.name, Users.gcode
-                "Report ON Users.id = JobReport.uid\r\nWHERE  (Users.processs LIKE @process) AND (U" +
+FROM     Users RIGHT OUTER JOIN
-                "sers.id <> \'dev\') AND (Users.id <> \'test\')\r\nGROUP BY Users.id, Users.name\r\nORDER" +
+               JobReport ON Users.id = JobReport.uid
-                " BY Users.name";
+WHERE  (Users.processs LIKE @process) AND (Users.id <> 'dev') AND (Users.id <> 'test') AND (Users.gcode = @gcode)
 GROUP BY Users.id, Users.name, Users.gcode
 ORDER BY Users.name";
            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "processs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
        }
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
-        public virtual int Fill(dsReport.ProcessUserListDataTable dataTable, string process) {
+        public virtual int Fill(dsReport.ProcessUserListDataTable dataTable, string process, string gcode) {
            this.Adapter.SelectCommand = this.CommandCollection[0];
            if ((process == null)) {
                this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -3359,6 +3411,12 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
            else {
                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(process));
            }
            if ((gcode == null)) {
                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
            }
            else {
                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
            }
            if ((this.ClearBeforeFill == true)) {
                dataTable.Clear();
            }
@@ -3370,7 +3428,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
-        public virtual dsReport.ProcessUserListDataTable GetData(string process) {
+        public virtual dsReport.ProcessUserListDataTable GetData(string process, string gcode) {
            this.Adapter.SelectCommand = this.CommandCollection[0];
            if ((process == null)) {
                this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -3378,6 +3436,12 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
            else {
                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(process));
            }
            if ((gcode == null)) {
                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
            }
            else {
                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
            }
            dsReport.ProcessUserListDataTable dataTable = new dsReport.ProcessUserListDataTable();
            this.Adapter.Fill(dataTable);
            return dataTable;
@@ -3416,7 +3480,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
-        public virtual int Delete(string Original_id, string Original_name) {
+        public virtual int Delete(string Original_id, string Original_name, string Original_gcode) {
            if ((Original_id == null)) {
                throw new global::System.ArgumentNullException("Original_id");
            }
@@ -3432,6 +3496,14 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
                this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0));
                this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_name));
            }
            if ((Original_gcode == null)) {
                this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1));
                this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value;
            }
            else {
                this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0));
                this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_gcode));
            }
            global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
            if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                        != global::System.Data.ConnectionState.Open)) {
@@ -3452,7 +3524,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string id, string name, string Original_id, string Original_name, int idx) {
+        public virtual int Update(string id, string name, string gcode, string Original_id, string Original_name, string Original_gcode, int idx) {
            if ((id == null)) {
                throw new global::System.ArgumentNullException("id");
            }
@@ -3465,22 +3537,36 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
            else {
                this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(name));
            }
            if ((gcode == null)) {
                this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
            }
            else {
                this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(gcode));
            }
            if ((Original_id == null)) {
                throw new global::System.ArgumentNullException("Original_id");
            }
            else {
-                this.Adapter.UpdateCommand.Parameters[2].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(Original_id));
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_id));
            }
            if ((Original_name == null)) {
-                this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value;
            }
            else {
-                this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_name));
+                this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_name));
            }
-            this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(idx));
+            if ((Original_gcode == null)) {
                this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1));
                this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value;
            }
            else {
                this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0));
                this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_gcode));
            }
            this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(idx));
            global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
            if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                        != global::System.Data.ConnectionState.Open)) {
--- a/SubProject/FPJ0000/dsReport.xsd
+++ b/SubProject/FPJ0000/dsReport.xsd
@@ -90,39 +90,45 @@ ORDER BY processs</CommandText>
              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                <DeleteCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [Users] WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)))</CommandText>
+                    <CommandText>DELETE FROM [Users] WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)))</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_id" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_name" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </DeleteCommand>
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  Users.id, Users.name
+                    <CommandText>SELECT  Users.id, Users.name, Users.gcode
 FROM     Users RIGHT OUTER JOIN
               JobReport ON Users.id = JobReport.uid
-WHERE  (Users.processs LIKE @process) AND (Users.id &lt;&gt; 'dev') AND (Users.id &lt;&gt; 'test')
+WHERE  (Users.processs LIKE @process) AND (Users.id &lt;&gt; 'dev') AND (Users.id &lt;&gt; 'test') AND (Users.gcode = @gcode)
-GROUP BY Users.id, Users.name
+GROUP BY Users.id, Users.name, Users.gcode
 ORDER BY Users.name</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="processs" DataSourceName="EE.dbo.Users" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@process" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="processs" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </SelectCommand>
                <UpdateCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [Users] SET [id] = @id, [name] = @name WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)));
+                    <CommandText>UPDATE [Users] SET [id] = @id, [name] = @name, [gcode] = @gcode WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)));
-SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name ORDER BY Users.name</CommandText>
+SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name, Users.gcode ORDER BY Users.name</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_id" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_name" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
@@ -132,6 +138,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
            <Mappings>
              <Mapping SourceColumn="id" DataSetColumn="id" />
              <Mapping SourceColumn="name" DataSetColumn="name" />
              <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
            </Mappings>
            <Sources />
          </TableAdapter>
@@ -143,7 +150,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
  <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
    <xs:complexType>
      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowEvArgName="jobReportRowChangeEvent">
+        <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_RowClassName="jobReportRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm">
@@ -173,7 +180,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
+        <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent" msprop:Generator_RowClassName="JobReportDayRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
@@ -209,7 +216,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent">
+        <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_RowClassName="ProcessListRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs">
@@ -222,7 +229,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent">
+        <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_RowClassName="ProcessUserListRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
@@ -239,10 +246,17 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
              <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="10" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_RowClassName="PartSummaryRow" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent">
+        <xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent" msprop:Generator_RowClassName="PartSummaryRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="ItemGroup" msprop:nullValue="미지정" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:Generator_UserColumnName="ItemGroup" type="xs:string" minOccurs="0" />
--- a/SubProject/FPJ0000/dsReport.xss
+++ b/SubProject/FPJ0000/dsReport.xss
@@ -9,7 +9,7 @@
    <Shape ID="DesignTable:jobReport" ZOrder="5" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
    <Shape ID="DesignTable:JobReportDay" ZOrder="4" X="335" Y="164" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
    <Shape ID="DesignTable:ProcessList" ZOrder="3" X="587" Y="65" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:ProcessUserList" ZOrder="2" X="619" Y="303" Height="115" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:ProcessUserList" ZOrder="2" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
    <Shape ID="DesignTable:PartSummary" ZOrder="1" X="852" Y="79" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
  </Shapes>
  <Connectors />