...

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("23.04.24.1000")]
+[assembly: AssemblyVersion("23.04.24.1350")]
-[assembly: AssemblyFileVersion("23.04.24.1000")]
+[assembly: AssemblyFileVersion("23.04.24.1350")]

SubProject/FEQ0000/Purchase/fMailForm.cs

@@ -25,7 +25,7 @@ namespace FEQ0000.Purchase
         {
             var db = new DataClasses1DataContext();
 
-            var mailform = db.MailForm.Where(t => t.cate == Cate).ToList();
+            var mailform = db.MailForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == Cate).ToList();
             this.cmbForm.DataSource = mailform;
             this.cmbForm.DisplayMember = "title";
             this.cmbForm.ValueMember = "idx";

SubProject/FEQ0000/Purchase/fPurchaseNR.cs

@@ -1285,7 +1285,7 @@ namespace FEQ0000
                     return;
                 }
             }
-            var f = new FEQ0000.Purchase.fPurchaseNR_Ipgo(dr.idx);
+            var f = new FEQ0000.Purchase.fPurchaseNR_Ipgo(dr.idx, string.Empty);
             if (f.ShowDialog() == DialogResult.OK)
             {
                 refreshData();

SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs

@@ -62,20 +62,6 @@ namespace FEQ0000.Purchase
             this.tbPrjName = new System.Windows.Forms.TextBox();
             this.tbIdx = new System.Windows.Forms.TextBox();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.tbUnit = new System.Windows.Forms.TextBox();
-            this.tbModel = new System.Windows.Forms.TextBox();
-            this.arLabel1 = new System.Windows.Forms.Label();
-            this.tbPumname = new System.Windows.Forms.TextBox();
-            this.textBox16 = new System.Windows.Forms.TextBox();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.tbInRemark = new System.Windows.Forms.TextBox();
-            this.tbInQty = new System.Windows.Forms.TextBox();
-            this.chkInDate = new System.Windows.Forms.CheckBox();
-            this.dtInDate = new System.Windows.Forms.DateTimePicker();
-            this.btOK = new System.Windows.Forms.Button();
-            this.arLabel3 = new System.Windows.Forms.Label();
-            this.cmbReceive = new System.Windows.Forms.ComboBox();
-            this.tbInPrice = new System.Windows.Forms.TextBox();
             this.tbSCRCF = new System.Windows.Forms.TextBox();
             this.tbSC = new System.Windows.Forms.TextBox();
             this.tbPO = new System.Windows.Forms.TextBox();
@@ -83,6 +69,20 @@ namespace FEQ0000.Purchase
             this.tbAmt = new System.Windows.Forms.TextBox();
             this.tbPriceO = new System.Windows.Forms.TextBox();
             this.tbQty = new System.Windows.Forms.TextBox();
+            this.tbUnit = new System.Windows.Forms.TextBox();
+            this.tbModel = new System.Windows.Forms.TextBox();
+            this.arLabel1 = new System.Windows.Forms.Label();
+            this.tbPumname = new System.Windows.Forms.TextBox();
+            this.textBox16 = new System.Windows.Forms.TextBox();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.tbInPrice = new System.Windows.Forms.TextBox();
+            this.cmbReceive = new System.Windows.Forms.ComboBox();
+            this.tbInRemark = new System.Windows.Forms.TextBox();
+            this.tbInQty = new System.Windows.Forms.TextBox();
+            this.chkInDate = new System.Windows.Forms.CheckBox();
+            this.dtInDate = new System.Windows.Forms.DateTimePicker();
+            this.btOK = new System.Windows.Forms.Button();
+            this.arLabel3 = new System.Windows.Forms.Label();
             label17 = new System.Windows.Forms.Label();
             label12 = new System.Windows.Forms.Label();
             label11 = new System.Windows.Forms.Label();
@@ -244,6 +244,63 @@ namespace FEQ0000.Purchase
             label8.TabIndex = 107;
             label8.Text = "입고수량";
             // 
+            // receiveLabel
+            // 
+            receiveLabel.AutoSize = true;
+            receiveLabel.Location = new System.Drawing.Point(25, 38);
+            receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            receiveLabel.Name = "receiveLabel";
+            receiveLabel.Size = new System.Drawing.Size(41, 12);
+            receiveLabel.TabIndex = 111;
+            receiveLabel.Text = "수령인";
+            // 
+            // label13
+            // 
+            label13.AutoSize = true;
+            label13.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            label13.Location = new System.Drawing.Point(63, 187);
+            label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label13.Name = "label13";
+            label13.Size = new System.Drawing.Size(52, 28);
+            label13.TabIndex = 113;
+            label13.Text = "단가";
+            // 
+            // label10
+            // 
+            label10.AutoSize = true;
+            label10.Location = new System.Drawing.Point(9, 157);
+            label10.Name = "label10";
+            label10.Size = new System.Drawing.Size(89, 12);
+            label10.TabIndex = 105;
+            label10.Text = "SC / SCR/CF#";
+            // 
+            // label14
+            // 
+            label14.AutoSize = true;
+            label14.Location = new System.Drawing.Point(92, 301);
+            label14.Name = "label14";
+            label14.Size = new System.Drawing.Size(22, 12);
+            label14.TabIndex = 103;
+            label14.Text = "PO";
+            // 
+            // label6
+            // 
+            label6.AutoSize = true;
+            label6.Location = new System.Drawing.Point(69, 120);
+            label6.Name = "label6";
+            label6.Size = new System.Drawing.Size(29, 12);
+            label6.TabIndex = 97;
+            label6.Text = "비고";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new System.Drawing.Point(9, 90);
+            label1.Name = "label1";
+            label1.Size = new System.Drawing.Size(89, 12);
+            label1.TabIndex = 98;
+            label1.Text = "수량/단가/금액";
+            // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.Gainsboro;
@@ -385,8 +442,6 @@ namespace FEQ0000.Purchase
             this.panel2.Controls.Add(this.tbSCRCF);
             this.panel2.Controls.Add(this.tbSC);
             this.panel2.Controls.Add(label10);
-            this.panel2.Controls.Add(this.tbPO);
-            this.panel2.Controls.Add(label14);
             this.panel2.Controls.Add(this.tbRemarkO);
             this.panel2.Controls.Add(this.tbAmt);
             this.panel2.Controls.Add(this.tbPriceO);
@@ -403,9 +458,79 @@ namespace FEQ0000.Purchase
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 193);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(584, 234);
+            this.panel2.Size = new System.Drawing.Size(584, 188);
             this.panel2.TabIndex = 88;
             // 
+            // tbSCRCF
+            // 
+            this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbSCRCF.Location = new System.Drawing.Point(340, 144);
+            this.tbSCRCF.Name = "tbSCRCF";
+            this.tbSCRCF.ReadOnly = true;
+            this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
+            this.tbSCRCF.TabIndex = 107;
+            // 
+            // tbSC
+            // 
+            this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbSC.Location = new System.Drawing.Point(104, 143);
+            this.tbSC.Name = "tbSC";
+            this.tbSC.ReadOnly = true;
+            this.tbSC.Size = new System.Drawing.Size(232, 38);
+            this.tbSC.TabIndex = 106;
+            // 
+            // tbPO
+            // 
+            this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbPO.Location = new System.Drawing.Point(120, 298);
+            this.tbPO.Name = "tbPO";
+            this.tbPO.Size = new System.Drawing.Size(320, 38);
+            this.tbPO.TabIndex = 104;
+            // 
+            // tbRemarkO
+            // 
+            this.tbRemarkO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbRemarkO.Location = new System.Drawing.Point(104, 117);
+            this.tbRemarkO.Name = "tbRemarkO";
+            this.tbRemarkO.ReadOnly = true;
+            this.tbRemarkO.Size = new System.Drawing.Size(437, 21);
+            this.tbRemarkO.TabIndex = 102;
+            // 
+            // tbAmt
+            // 
+            this.tbAmt.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbAmt.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbAmt.Location = new System.Drawing.Point(372, 79);
+            this.tbAmt.Name = "tbAmt";
+            this.tbAmt.ReadOnly = true;
+            this.tbAmt.Size = new System.Drawing.Size(200, 34);
+            this.tbAmt.TabIndex = 101;
+            this.tbAmt.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            // 
+            // tbPriceO
+            // 
+            this.tbPriceO.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbPriceO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbPriceO.Location = new System.Drawing.Point(237, 79);
+            this.tbPriceO.Name = "tbPriceO";
+            this.tbPriceO.ReadOnly = true;
+            this.tbPriceO.Size = new System.Drawing.Size(129, 34);
+            this.tbPriceO.TabIndex = 100;
+            this.tbPriceO.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            // 
+            // tbQty
+            // 
+            this.tbQty.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbQty.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbQty.Location = new System.Drawing.Point(104, 79);
+            this.tbQty.Name = "tbQty";
+            this.tbQty.ReadOnly = true;
+            this.tbQty.Size = new System.Drawing.Size(127, 34);
+            this.tbQty.TabIndex = 99;
+            // 
             // tbUnit
             // 
             this.tbUnit.ImeMode = System.Windows.Forms.ImeMode.Hangul;
@@ -461,6 +586,8 @@ namespace FEQ0000.Purchase
             this.panel3.Controls.Add(this.tbInPrice);
             this.panel3.Controls.Add(label13);
             this.panel3.Controls.Add(receiveLabel);
+            this.panel3.Controls.Add(this.tbPO);
+            this.panel3.Controls.Add(label14);
             this.panel3.Controls.Add(this.cmbReceive);
             this.panel3.Controls.Add(this.tbInRemark);
             this.panel3.Controls.Add(label7);
@@ -471,11 +598,37 @@ namespace FEQ0000.Purchase
             this.panel3.Controls.Add(this.btOK);
             this.panel3.Controls.Add(this.arLabel3);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel3.Location = new System.Drawing.Point(0, 427);
+            this.panel3.Location = new System.Drawing.Point(0, 381);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(584, 313);
+            this.panel3.Size = new System.Drawing.Size(584, 348);
             this.panel3.TabIndex = 89;
             // 
+            // tbInPrice
+            // 
+            this.tbInPrice.Enabled = false;
+            this.tbInPrice.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbInPrice.Location = new System.Drawing.Point(120, 183);
+            this.tbInPrice.Margin = new System.Windows.Forms.Padding(4);
+            this.tbInPrice.Name = "tbInPrice";
+            this.tbInPrice.Size = new System.Drawing.Size(319, 34);
+            this.tbInPrice.TabIndex = 114;
+            this.tbInPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            // 
+            // 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.Enabled = false;
+            this.cmbReceive.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.cmbReceive.FormattingEnabled = true;
+            this.cmbReceive.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.cmbReceive.Location = new System.Drawing.Point(24, 59);
+            this.cmbReceive.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbReceive.Name = "cmbReceive";
+            this.cmbReceive.Size = new System.Drawing.Size(415, 45);
+            this.cmbReceive.TabIndex = 112;
+            // 
             // tbInRemark
             // 
             this.tbInRemark.Enabled = false;
@@ -483,7 +636,7 @@ namespace FEQ0000.Purchase
             this.tbInRemark.Margin = new System.Windows.Forms.Padding(4);
             this.tbInRemark.Multiline = true;
             this.tbInRemark.Name = "tbInRemark";
-            this.tbInRemark.Size = new System.Drawing.Size(286, 70);
+            this.tbInRemark.Size = new System.Drawing.Size(319, 70);
             this.tbInRemark.TabIndex = 110;
             // 
             // tbInQty
@@ -493,7 +646,7 @@ namespace FEQ0000.Purchase
             this.tbInQty.Location = new System.Drawing.Point(120, 145);
             this.tbInQty.Margin = new System.Windows.Forms.Padding(4);
             this.tbInQty.Name = "tbInQty";
-            this.tbInQty.Size = new System.Drawing.Size(286, 34);
+            this.tbInQty.Size = new System.Drawing.Size(319, 34);
             this.tbInQty.TabIndex = 108;
             // 
             // chkInDate
@@ -517,7 +670,7 @@ namespace FEQ0000.Purchase
             this.dtInDate.Location = new System.Drawing.Point(120, 110);
             this.dtInDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtInDate.Name = "dtInDate";
-            this.dtInDate.Size = new System.Drawing.Size(286, 34);
+            this.dtInDate.Size = new System.Drawing.Size(319, 34);
             this.dtInDate.TabIndex = 104;
             this.dtInDate.TabStop = false;
             // 
@@ -527,7 +680,7 @@ namespace FEQ0000.Purchase
             this.btOK.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.btOK.Location = new System.Drawing.Point(445, 23);
             this.btOK.Name = "btOK";
-            this.btOK.Size = new System.Drawing.Size(139, 290);
+            this.btOK.Size = new System.Drawing.Size(139, 325);
             this.btOK.TabIndex = 102;
             this.btOK.Text = "등록";
             this.btOK.UseVisualStyleBackColor = true;
@@ -547,165 +700,11 @@ namespace FEQ0000.Purchase
             this.arLabel3.Text = "입고정보";
             this.arLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // receiveLabel
-            // 
-            receiveLabel.AutoSize = true;
-            receiveLabel.Location = new System.Drawing.Point(25, 38);
-            receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            receiveLabel.Name = "receiveLabel";
-            receiveLabel.Size = new System.Drawing.Size(41, 12);
-            receiveLabel.TabIndex = 111;
-            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.Enabled = false;
-            this.cmbReceive.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.cmbReceive.FormattingEnabled = true;
-            this.cmbReceive.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.cmbReceive.Location = new System.Drawing.Point(24, 59);
-            this.cmbReceive.Margin = new System.Windows.Forms.Padding(4);
-            this.cmbReceive.Name = "cmbReceive";
-            this.cmbReceive.Size = new System.Drawing.Size(382, 45);
-            this.cmbReceive.TabIndex = 112;
-            // 
-            // tbInPrice
-            // 
-            this.tbInPrice.Enabled = false;
-            this.tbInPrice.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbInPrice.Location = new System.Drawing.Point(120, 183);
-            this.tbInPrice.Margin = new System.Windows.Forms.Padding(4);
-            this.tbInPrice.Name = "tbInPrice";
-            this.tbInPrice.Size = new System.Drawing.Size(286, 34);
-            this.tbInPrice.TabIndex = 114;
-            this.tbInPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // label13
-            // 
-            label13.AutoSize = true;
-            label13.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label13.Location = new System.Drawing.Point(63, 187);
-            label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label13.Name = "label13";
-            label13.Size = new System.Drawing.Size(52, 28);
-            label13.TabIndex = 113;
-            label13.Text = "단가";
-            // 
-            // tbSCRCF
-            // 
-            this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbSCRCF.Location = new System.Drawing.Point(340, 189);
-            this.tbSCRCF.Name = "tbSCRCF";
-            this.tbSCRCF.ReadOnly = true;
-            this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
-            this.tbSCRCF.TabIndex = 107;
-            // 
-            // tbSC
-            // 
-            this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbSC.Location = new System.Drawing.Point(104, 188);
-            this.tbSC.Name = "tbSC";
-            this.tbSC.ReadOnly = true;
-            this.tbSC.Size = new System.Drawing.Size(232, 38);
-            this.tbSC.TabIndex = 106;
-            // 
-            // label10
-            // 
-            label10.AutoSize = true;
-            label10.Location = new System.Drawing.Point(9, 202);
-            label10.Name = "label10";
-            label10.Size = new System.Drawing.Size(89, 12);
-            label10.TabIndex = 105;
-            label10.Text = "SC / SCR/CF#";
-            // 
-            // tbPO
-            // 
-            this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbPO.Location = new System.Drawing.Point(104, 144);
-            this.tbPO.Name = "tbPO";
-            this.tbPO.ReadOnly = true;
-            this.tbPO.Size = new System.Drawing.Size(437, 38);
-            this.tbPO.TabIndex = 104;
-            // 
-            // label14
-            // 
-            label14.AutoSize = true;
-            label14.Location = new System.Drawing.Point(76, 147);
-            label14.Name = "label14";
-            label14.Size = new System.Drawing.Size(22, 12);
-            label14.TabIndex = 103;
-            label14.Text = "PO";
-            // 
-            // tbRemarkO
-            // 
-            this.tbRemarkO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbRemarkO.Location = new System.Drawing.Point(104, 117);
-            this.tbRemarkO.Name = "tbRemarkO";
-            this.tbRemarkO.ReadOnly = true;
-            this.tbRemarkO.Size = new System.Drawing.Size(437, 21);
-            this.tbRemarkO.TabIndex = 102;
-            // 
-            // tbAmt
-            // 
-            this.tbAmt.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbAmt.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbAmt.Location = new System.Drawing.Point(372, 79);
-            this.tbAmt.Name = "tbAmt";
-            this.tbAmt.ReadOnly = true;
-            this.tbAmt.Size = new System.Drawing.Size(200, 34);
-            this.tbAmt.TabIndex = 101;
-            this.tbAmt.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // tbPriceO
-            // 
-            this.tbPriceO.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbPriceO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbPriceO.Location = new System.Drawing.Point(237, 79);
-            this.tbPriceO.Name = "tbPriceO";
-            this.tbPriceO.ReadOnly = true;
-            this.tbPriceO.Size = new System.Drawing.Size(129, 34);
-            this.tbPriceO.TabIndex = 100;
-            this.tbPriceO.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // tbQty
-            // 
-            this.tbQty.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbQty.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbQty.Location = new System.Drawing.Point(104, 79);
-            this.tbQty.Name = "tbQty";
-            this.tbQty.ReadOnly = true;
-            this.tbQty.Size = new System.Drawing.Size(127, 34);
-            this.tbQty.TabIndex = 99;
-            // 
-            // label6
-            // 
-            label6.AutoSize = true;
-            label6.Location = new System.Drawing.Point(69, 120);
-            label6.Name = "label6";
-            label6.Size = new System.Drawing.Size(29, 12);
-            label6.TabIndex = 97;
-            label6.Text = "비고";
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new System.Drawing.Point(9, 90);
-            label1.Name = "label1";
-            label1.Size = new System.Drawing.Size(89, 12);
-            label1.TabIndex = 98;
-            label1.Text = "수량/단가/금액";
-            // 
             // fPurchaseNR_Ipgo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(584, 740);
+            this.ClientSize = new System.Drawing.Size(584, 729);
             this.Controls.Add(this.panel3);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);

SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs

@@ -13,9 +13,11 @@ namespace FEQ0000.Purchase
     public partial class fPurchaseNR_Ipgo : Form
     {
         int idx = -1;
-        public fPurchaseNR_Ipgo(int purchaseIdx)
+        string po = string.Empty;
+        public fPurchaseNR_Ipgo(int purchaseIdx,string po_)
         {
             InitializeComponent();
+            this.po = po_;
             this.idx = purchaseIdx;
             this.KeyPreview = true;
             this.KeyDown += (s1, e1) => {
@@ -48,6 +50,7 @@ namespace FEQ0000.Purchase
             tbAmt.Text = (dr.pumqty * dr.pumprice).ToString();
             tbRemarkO.Text = dr.bigo;
             tbPO.Text = dr.po;
+            if (string.IsNullOrEmpty(tbPO.Text)) tbPO.Text = this.po;
             tbSC.Text = dr.sc;
             tbSCRCF.Text = dr.orderno;
 
@@ -153,7 +156,9 @@ namespace FEQ0000.Purchase
                 dr.state = "Received";
                 dr.inremark = tbInRemark.Text.Trim();
             }
-
+            dr.windate = DateTime.Now;
+            dr.winuid = FCOMMON.info.Login.no;
+            dr.po = this.tbPO.Text.Trim();
             dr.EndEdit();
             var cnt = ta.Update(dr);
             DialogResult = DialogResult.OK;

SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx

@@ -159,6 +159,12 @@
   <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</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="label13.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
@@ -171,10 +177,4 @@
   <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="receiveLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
 </root>

SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs

@@ -1208,7 +1208,7 @@ namespace FEQ0000
                     return;
                 }
             }
-            var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx);
+            var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx,string.Empty);
             if (f.ShowDialog() == DialogResult.OK)
             {
                 refreshData();

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.Designer.cs

@@ -62,6 +62,9 @@ namespace FEQ0000.Purchase
             this.tbPrjName = new System.Windows.Forms.TextBox();
             this.tbIdx = new System.Windows.Forms.TextBox();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.tbSCRCF = new System.Windows.Forms.TextBox();
+            this.tbSC = new System.Windows.Forms.TextBox();
+            this.tbPO = new System.Windows.Forms.TextBox();
             this.tbRemarkO = new System.Windows.Forms.TextBox();
             this.tbAmt = new System.Windows.Forms.TextBox();
             this.tbPriceO = new System.Windows.Forms.TextBox();
@@ -72,6 +75,7 @@ namespace FEQ0000.Purchase
             this.tbPumname = new System.Windows.Forms.TextBox();
             this.textBox16 = new System.Windows.Forms.TextBox();
             this.panel3 = new System.Windows.Forms.Panel();
+            this.tbInPrice = new System.Windows.Forms.TextBox();
             this.tbInRemark = new System.Windows.Forms.TextBox();
             this.tbInQty = new System.Windows.Forms.TextBox();
             this.chkInDate = new System.Windows.Forms.CheckBox();
@@ -79,10 +83,6 @@ namespace FEQ0000.Purchase
             this.cmbReceive = new System.Windows.Forms.ComboBox();
             this.btOK = new System.Windows.Forms.Button();
             this.arLabel3 = new System.Windows.Forms.Label();
-            this.tbInPrice = new System.Windows.Forms.TextBox();
-            this.tbPO = new System.Windows.Forms.TextBox();
-            this.tbSC = new System.Windows.Forms.TextBox();
-            this.tbSCRCF = new System.Windows.Forms.TextBox();
             label17 = new System.Windows.Forms.Label();
             label12 = new System.Windows.Forms.Label();
             label11 = new System.Windows.Forms.Label();
@@ -272,6 +272,35 @@ namespace FEQ0000.Purchase
             receiveLabel.TabIndex = 105;
             receiveLabel.Text = "수령인";
             // 
+            // label13
+            // 
+            label13.AutoSize = true;
+            label13.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            label13.Location = new System.Drawing.Point(56, 195);
+            label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label13.Name = "label13";
+            label13.Size = new System.Drawing.Size(52, 28);
+            label13.TabIndex = 111;
+            label13.Text = "단가";
+            // 
+            // label14
+            // 
+            label14.AutoSize = true;
+            label14.Location = new System.Drawing.Point(85, 314);
+            label14.Name = "label14";
+            label14.Size = new System.Drawing.Size(22, 12);
+            label14.TabIndex = 92;
+            label14.Text = "PO";
+            // 
+            // label10
+            // 
+            label10.AutoSize = true;
+            label10.Location = new System.Drawing.Point(9, 158);
+            label10.Name = "label10";
+            label10.Size = new System.Drawing.Size(89, 12);
+            label10.TabIndex = 94;
+            label10.Text = "SC / SCR/CF#";
+            // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.Gainsboro;
@@ -413,8 +442,6 @@ namespace FEQ0000.Purchase
             this.panel2.Controls.Add(this.tbSCRCF);
             this.panel2.Controls.Add(this.tbSC);
             this.panel2.Controls.Add(label10);
-            this.panel2.Controls.Add(this.tbPO);
-            this.panel2.Controls.Add(label14);
             this.panel2.Controls.Add(this.tbRemarkO);
             this.panel2.Controls.Add(this.tbAmt);
             this.panel2.Controls.Add(this.tbPriceO);
@@ -431,9 +458,38 @@ namespace FEQ0000.Purchase
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 193);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(584, 234);
+            this.panel2.Size = new System.Drawing.Size(584, 194);
             this.panel2.TabIndex = 88;
             // 
+            // tbSCRCF
+            // 
+            this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbSCRCF.Location = new System.Drawing.Point(340, 145);
+            this.tbSCRCF.Name = "tbSCRCF";
+            this.tbSCRCF.ReadOnly = true;
+            this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
+            this.tbSCRCF.TabIndex = 96;
+            // 
+            // tbSC
+            // 
+            this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbSC.Location = new System.Drawing.Point(104, 144);
+            this.tbSC.Name = "tbSC";
+            this.tbSC.ReadOnly = true;
+            this.tbSC.Size = new System.Drawing.Size(232, 38);
+            this.tbSC.TabIndex = 95;
+            // 
+            // tbPO
+            // 
+            this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbPO.Location = new System.Drawing.Point(113, 311);
+            this.tbPO.Name = "tbPO";
+            this.tbPO.Size = new System.Drawing.Size(321, 38);
+            this.tbPO.TabIndex = 93;
+            // 
             // tbRemarkO
             // 
             this.tbRemarkO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
@@ -530,6 +586,8 @@ namespace FEQ0000.Purchase
             this.panel3.Controls.Add(this.tbInPrice);
             this.panel3.Controls.Add(label13);
             this.panel3.Controls.Add(this.tbInRemark);
+            this.panel3.Controls.Add(this.tbPO);
+            this.panel3.Controls.Add(label14);
             this.panel3.Controls.Add(label7);
             this.panel3.Controls.Add(this.tbInQty);
             this.panel3.Controls.Add(label8);
@@ -540,11 +598,22 @@ namespace FEQ0000.Purchase
             this.panel3.Controls.Add(this.btOK);
             this.panel3.Controls.Add(this.arLabel3);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel3.Location = new System.Drawing.Point(0, 427);
+            this.panel3.Location = new System.Drawing.Point(0, 387);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(584, 313);
+            this.panel3.Size = new System.Drawing.Size(584, 353);
             this.panel3.TabIndex = 89;
             // 
+            // tbInPrice
+            // 
+            this.tbInPrice.Enabled = false;
+            this.tbInPrice.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbInPrice.Location = new System.Drawing.Point(113, 191);
+            this.tbInPrice.Margin = new System.Windows.Forms.Padding(4);
+            this.tbInPrice.Name = "tbInPrice";
+            this.tbInPrice.Size = new System.Drawing.Size(321, 34);
+            this.tbInPrice.TabIndex = 112;
+            this.tbInPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            // 
             // tbInRemark
             // 
             this.tbInRemark.Enabled = false;
@@ -552,7 +621,7 @@ namespace FEQ0000.Purchase
             this.tbInRemark.Margin = new System.Windows.Forms.Padding(4);
             this.tbInRemark.Multiline = true;
             this.tbInRemark.Name = "tbInRemark";
-            this.tbInRemark.Size = new System.Drawing.Size(286, 70);
+            this.tbInRemark.Size = new System.Drawing.Size(321, 70);
             this.tbInRemark.TabIndex = 110;
             // 
             // tbInQty
@@ -562,7 +631,7 @@ namespace FEQ0000.Purchase
             this.tbInQty.Location = new System.Drawing.Point(113, 149);
             this.tbInQty.Margin = new System.Windows.Forms.Padding(4);
             this.tbInQty.Name = "tbInQty";
-            this.tbInQty.Size = new System.Drawing.Size(286, 34);
+            this.tbInQty.Size = new System.Drawing.Size(321, 34);
             this.tbInQty.TabIndex = 108;
             // 
             // chkInDate
@@ -586,7 +655,7 @@ namespace FEQ0000.Purchase
             this.dtInDate.Location = new System.Drawing.Point(113, 108);
             this.dtInDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtInDate.Name = "dtInDate";
-            this.dtInDate.Size = new System.Drawing.Size(286, 34);
+            this.dtInDate.Size = new System.Drawing.Size(321, 34);
             this.dtInDate.TabIndex = 104;
             this.dtInDate.TabStop = false;
             // 
@@ -602,7 +671,7 @@ namespace FEQ0000.Purchase
             this.cmbReceive.Location = new System.Drawing.Point(17, 56);
             this.cmbReceive.Margin = new System.Windows.Forms.Padding(4);
             this.cmbReceive.Name = "cmbReceive";
-            this.cmbReceive.Size = new System.Drawing.Size(382, 45);
+            this.cmbReceive.Size = new System.Drawing.Size(417, 45);
             this.cmbReceive.TabIndex = 106;
             // 
             // btOK
@@ -611,7 +680,7 @@ namespace FEQ0000.Purchase
             this.btOK.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.btOK.Location = new System.Drawing.Point(445, 23);
             this.btOK.Name = "btOK";
-            this.btOK.Size = new System.Drawing.Size(139, 290);
+            this.btOK.Size = new System.Drawing.Size(139, 330);
             this.btOK.TabIndex = 102;
             this.btOK.Text = "등록";
             this.btOK.UseVisualStyleBackColor = true;
@@ -631,76 +700,6 @@ namespace FEQ0000.Purchase
             this.arLabel3.Text = "입고정보";
             this.arLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // tbInPrice
-            // 
-            this.tbInPrice.Enabled = false;
-            this.tbInPrice.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbInPrice.Location = new System.Drawing.Point(113, 191);
-            this.tbInPrice.Margin = new System.Windows.Forms.Padding(4);
-            this.tbInPrice.Name = "tbInPrice";
-            this.tbInPrice.Size = new System.Drawing.Size(286, 34);
-            this.tbInPrice.TabIndex = 112;
-            this.tbInPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // label13
-            // 
-            label13.AutoSize = true;
-            label13.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label13.Location = new System.Drawing.Point(56, 195);
-            label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label13.Name = "label13";
-            label13.Size = new System.Drawing.Size(52, 28);
-            label13.TabIndex = 111;
-            label13.Text = "단가";
-            // 
-            // tbPO
-            // 
-            this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbPO.Location = new System.Drawing.Point(104, 145);
-            this.tbPO.Name = "tbPO";
-            this.tbPO.ReadOnly = true;
-            this.tbPO.Size = new System.Drawing.Size(437, 38);
-            this.tbPO.TabIndex = 93;
-            // 
-            // label14
-            // 
-            label14.AutoSize = true;
-            label14.Location = new System.Drawing.Point(76, 148);
-            label14.Name = "label14";
-            label14.Size = new System.Drawing.Size(22, 12);
-            label14.TabIndex = 92;
-            label14.Text = "PO";
-            // 
-            // tbSC
-            // 
-            this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbSC.Location = new System.Drawing.Point(104, 189);
-            this.tbSC.Name = "tbSC";
-            this.tbSC.ReadOnly = true;
-            this.tbSC.Size = new System.Drawing.Size(232, 38);
-            this.tbSC.TabIndex = 95;
-            // 
-            // label10
-            // 
-            label10.AutoSize = true;
-            label10.Location = new System.Drawing.Point(9, 203);
-            label10.Name = "label10";
-            label10.Size = new System.Drawing.Size(89, 12);
-            label10.TabIndex = 94;
-            label10.Text = "SC / SCR/CF#";
-            // 
-            // tbSCRCF
-            // 
-            this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbSCRCF.Location = new System.Drawing.Point(340, 190);
-            this.tbSCRCF.Name = "tbSCRCF";
-            this.tbSCRCF.ReadOnly = true;
-            this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
-            this.tbSCRCF.TabIndex = 96;
-            // 
             // fPurchaseCR_Ipgo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs

@@ -13,9 +13,11 @@ namespace FEQ0000.Purchase
     public partial class fPurchaseCR_Ipgo : Form
     {
         int idx = -1;
-        public fPurchaseCR_Ipgo(int purchaseIdx)
+        string po = string.Empty;
+        public fPurchaseCR_Ipgo(int purchaseIdx,string po_)
         {
             InitializeComponent();
+            this.po = po_;
             this.idx = purchaseIdx;
             this.KeyPreview = true;
             this.KeyDown += (s1, e1) =>
@@ -49,6 +51,7 @@ namespace FEQ0000.Purchase
             tbAmt.Text = (dr.pumqty * dr.pumprice).ToString();
             tbRemarkO.Text = dr.bigo;
             tbPO.Text = dr.po;
+            if (string.IsNullOrEmpty(tbPO.Text)) tbPO.Text = this.po;
             tbSC.Text = dr.sc;
             tbSCRCF.Text = dr.orderno;
 
@@ -176,7 +179,9 @@ namespace FEQ0000.Purchase
                 dr.state = "Received";
                 dr.inremark = tbInRemark.Text.Trim();
             }
-
+            dr.windate = DateTime.Now;
+            dr.winuid = FCOMMON.info.Login.no;
+            dr.po = this.tbPO.Text.Trim();
             dr.EndEdit();
             var cnt = ta.Update(dr);
             DialogResult = DialogResult.OK;

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.resx

@@ -168,13 +168,13 @@
   <metadata name="receiveLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
 </root>

SubProject/FEQ0000/dsPurchase.xsd

@@ -12,7 +12,7 @@
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" 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 [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)))</CommandText>
+                    <CommandText>DELETE FROM [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -80,13 +80,17 @@
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_pumpriceD" Precision="18" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="pumpriceD" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_inremark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_inremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_winuid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_winuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_windate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_windate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark);
+                    <CommandText>INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate);
-SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC</CommandText>
+SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -123,14 +127,16 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@inqty" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="inqty" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@pumpriceD" Precision="18" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="pumpriceD" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@inremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@winuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@windate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, 
-               pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, 
+               pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, 
-               inremark
+               winuid, windate
 FROM     Purchase
 WHERE  (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
 ORDER BY pdate DESC, idx DESC</CommandText>
@@ -141,8 +147,8 @@ ORDER BY pdate DESC, idx DESC</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)));
+                    <CommandText>UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)));
-SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC</CommandText>
+SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -179,6 +185,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@inqty" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="inqty" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@pumpriceD" Precision="18" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="pumpriceD" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@inremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@winuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@windate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -245,6 +253,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_pumpriceD" Precision="18" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="pumpriceD" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_inremark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_inremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_winuid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_winuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_windate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_windate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Purchase" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -290,6 +302,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
               <Mapping SourceColumn="inqty" DataSetColumn="inqty" />
               <Mapping SourceColumn="pumpriceD" DataSetColumn="pumpriceD" />
               <Mapping SourceColumn="inremark" DataSetColumn="inremark" />
+              <Mapping SourceColumn="winuid" DataSetColumn="winuid" />
+              <Mapping SourceColumn="windate" DataSetColumn="windate" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CoutImport" Modifier="Public" Name="CoutImport" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CoutImport">
@@ -329,11 +343,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByDateExceptCR" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByDateExceptCR" GeneratorSourceName="FillByDateExceptCR" GetMethodModifier="Public" GetMethodName="GetByDateExceptCR" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByDateExceptCR" UserSourceName="FillByDateExceptCR">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT  asset, bigo, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, 
+                    <CommandText>SELECT asset, bigo, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received')) ORDER BY pdate DESC, idx DESC</CommandText>
-               pumqty, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, wuid
-FROM     Purchase
-WHERE  (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received'))
-ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -345,7 +355,7 @@ ORDER BY pdate DESC, idx DESC</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByIdx" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByIdx" GeneratorSourceName="FillByIdx" GetMethodModifier="Public" GetMethodName="GetByIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByIdx" UserSourceName="FillByIdx">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT asset, bigo, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, wuid FROM Purchase WHERE (idx = @idx)</CommandText>
+                    <CommandText>SELECT asset, bigo, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (idx = @idx)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Purchase" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
@@ -355,7 +365,7 @@ ORDER BY pdate DESC, idx DESC</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillDate" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDate" GeneratorSourceName="FillDate" GetMethodModifier="Public" GetMethodName="GetDate" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDate" UserSourceName="FillDate">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT asset, bigo, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC</CommandText>
+                    <CommandText>SELECT asset, bigo, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -371,7 +381,7 @@ ORDER BY pdate DESC, idx DESC</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_PurchaseCR" 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 [EETGW_PurchaseCR] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)))</CommandText>
+                    <CommandText>DELETE FROM [EETGW_PurchaseCR] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -439,13 +449,17 @@ ORDER BY pdate DESC, idx DESC</CommandText>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_pumpriceD" Precision="18" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="pumpriceD" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_inremark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_inremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_winuid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_winuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_windate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_windate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [EETGW_PurchaseCR] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark);
+                    <CommandText>INSERT INTO [EETGW_PurchaseCR] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate);
-SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark FROM EETGW_PurchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC</CommandText>
+SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate FROM EETGW_PurchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -482,14 +496,16 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@inqty" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="inqty" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@pumpriceD" Precision="18" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="pumpriceD" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@inremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@winuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@windate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, 
-               pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, 
+               pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, 
-               inremark
+               winuid, windate
 FROM     EETGW_PurchaseCR
 WHERE  (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
 ORDER BY pdate DESC, idx DESC</CommandText>
@@ -500,8 +516,8 @@ ORDER BY pdate DESC, idx DESC</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [EETGW_PurchaseCR] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)));
+                    <CommandText>UPDATE [EETGW_PurchaseCR] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)));
-SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark FROM EETGW_PurchaseCR WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC</CommandText>
+SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate FROM EETGW_PurchaseCR WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -538,6 +554,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@inqty" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="inqty" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@pumpriceD" Precision="18" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="pumpriceD" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@inremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@winuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@windate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -604,6 +622,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_pumpriceD" Precision="18" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="pumpriceD" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_inremark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_inremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="inremark" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_winuid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_winuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="winuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_windate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_windate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="windate" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_PurchaseCR" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -649,6 +671,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
               <Mapping SourceColumn="inqty" DataSetColumn="inqty" />
               <Mapping SourceColumn="pumpriceD" DataSetColumn="pumpriceD" />
               <Mapping SourceColumn="inremark" DataSetColumn="inremark" />
+              <Mapping SourceColumn="winuid" DataSetColumn="winuid" />
+              <Mapping SourceColumn="windate" DataSetColumn="windate" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CoutImport" Modifier="Public" Name="CoutImport" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CoutImport">
@@ -689,11 +713,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_PurchaseCR" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByIdx" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByIdx" GeneratorSourceName="FillByIdx" GetMethodModifier="Public" GetMethodName="GetByIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByIdx" UserSourceName="FillByIdx">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT  idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, 
+                    <CommandText>SELECT asset, bigo, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseCR WHERE (idx = @idx)</CommandText>
-               pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, 
-               inremark
-FROM     EETGW_PurchaseCR
-WHERE  idx = @idx</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_PurchaseCR" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
@@ -704,7 +724,8 @@ WHERE  idx = @idx</CommandText>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>SELECT  asset, bigo, dept, edate, gcode, idx, import, indate, inqty, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, 
-               pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, wuid, inremark
+               pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, wuid, inremark, 
+               winuid, windate
 FROM     EETGW_PurchaseCR
 WHERE  (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state IN ('PO', 'Received'))
 ORDER BY pdate DESC, idx DESC</CommandText>
@@ -723,16 +744,19 @@ ORDER BY pdate DESC, idx DESC</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" 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">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request
+                    <CommandText>SELECT  'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+               dbo.getUserName(receive) AS receive, sc, po, orderno
 FROM     Purchase
-WHERE  (state IN ('PO', 'PR')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0)
+WHERE  (state IN ('PO', 'PR')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
 UNION
-SELECT  'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request
+SELECT  'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+               dbo.getUserName(receive) AS receive, sc, po, orderno
 FROM     EETGW_PurchaseCR
-WHERE  (state IN ('PO', 'PR')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0)
+WHERE  (state IN ('PO', 'PR')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
 ORDER BY state, wdate DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" Scale="0" Size="10" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -754,8 +778,35 @@ ORDER BY state, wdate DESC</CommandText>
               <Mapping SourceColumn="bigo" DataSetColumn="bigo" />
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
               <Mapping SourceColumn="request" DataSetColumn="request" />
+              <Mapping SourceColumn="indate" DataSetColumn="indate" />
+              <Mapping SourceColumn="inqty" DataSetColumn="inqty" />
+              <Mapping SourceColumn="receive" DataSetColumn="receive" />
+              <Mapping SourceColumn="sc" DataSetColumn="sc" />
+              <Mapping SourceColumn="po" DataSetColumn="po" />
+              <Mapping SourceColumn="orderno" DataSetColumn="orderno" />
             </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByTodayIn" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByTodayIn" GeneratorSourceName="FillByTodayIn" GetMethodModifier="Public" GetMethodName="GetByTodayIn" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByTodayIn" UserSourceName="FillByTodayIn">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT  'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+               dbo.getUserName(receive) AS receive, sc, po, orderno
+FROM     Purchase
+WHERE  (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
+UNION
+SELECT  'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+               dbo.getUserName(receive) AS receive, sc, po, orderno
+FROM     EETGW_PurchaseCR
+WHERE  (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
+ORDER BY source DESC, request, wdate DESC</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="indate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="indate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" Scale="0" Size="10" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
           </TableAdapter>
         </Tables>
         <Sources />
@@ -765,7 +816,7 @@ ORDER BY state, wdate DESC</CommandText>
   <xs:element name="dsPurchase" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPurchase" msprop:Generator_UserDSName="dsPurchase">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_RowClassName="PurchaseRow" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent">
+        <xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent" msprop:Generator_RowClassName="PurchaseRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -963,10 +1014,18 @@ ORDER BY state, wdate DESC</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="winuid" msprop:Generator_ColumnVarNameInTable="columnwinuid" msprop:Generator_ColumnPropNameInRow="winuid" msprop:Generator_ColumnPropNameInTable="winuidColumn" msprop:Generator_UserColumnName="winuid" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="windate" msprop:Generator_ColumnVarNameInTable="columnwindate" msprop:Generator_ColumnPropNameInRow="windate" msprop:Generator_ColumnPropNameInTable="windateColumn" msprop:Generator_UserColumnName="windate" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_PurchaseCR" msprop:Generator_TableClassName="EETGW_PurchaseCRDataTable" msprop:Generator_TableVarName="tableEETGW_PurchaseCR" msprop:Generator_TablePropName="EETGW_PurchaseCR" msprop:Generator_RowDeletingName="EETGW_PurchaseCRRowDeleting" msprop:Generator_RowChangingName="EETGW_PurchaseCRRowChanging" msprop:Generator_RowEvHandlerName="EETGW_PurchaseCRRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_PurchaseCRRowDeleted" msprop:Generator_UserTableName="EETGW_PurchaseCR" msprop:Generator_RowChangedName="EETGW_PurchaseCRRowChanged" msprop:Generator_RowEvArgName="EETGW_PurchaseCRRowChangeEvent" msprop:Generator_RowClassName="EETGW_PurchaseCRRow">
+        <xs:element name="EETGW_PurchaseCR" msprop:Generator_TableClassName="EETGW_PurchaseCRDataTable" msprop:Generator_TableVarName="tableEETGW_PurchaseCR" msprop:Generator_RowChangedName="EETGW_PurchaseCRRowChanged" msprop:Generator_TablePropName="EETGW_PurchaseCR" msprop:Generator_RowDeletingName="EETGW_PurchaseCRRowDeleting" msprop:Generator_RowChangingName="EETGW_PurchaseCRRowChanging" msprop:Generator_RowEvHandlerName="EETGW_PurchaseCRRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_PurchaseCRRowDeleted" msprop:Generator_RowClassName="EETGW_PurchaseCRRow" msprop:Generator_UserTableName="EETGW_PurchaseCR" msprop:Generator_RowEvArgName="EETGW_PurchaseCRRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1164,20 +1223,28 @@ ORDER BY state, wdate DESC</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="winuid" msprop:Generator_ColumnVarNameInTable="columnwinuid" msprop:Generator_ColumnPropNameInRow="winuid" msprop:Generator_ColumnPropNameInTable="winuidColumn" msprop:Generator_UserColumnName="winuid" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="windate" msprop:Generator_ColumnVarNameInTable="columnwindate" msprop:Generator_ColumnPropNameInRow="windate" msprop:Generator_ColumnPropNameInTable="windateColumn" msprop:Generator_UserColumnName="windate" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Ipkolist" msprop:Generator_TableClassName="IpkolistDataTable" msprop:Generator_TableVarName="tableIpkolist" msprop:Generator_RowChangedName="IpkolistRowChanged" msprop:Generator_TablePropName="Ipkolist" msprop:Generator_RowDeletingName="IpkolistRowDeleting" msprop:Generator_RowChangingName="IpkolistRowChanging" msprop:Generator_RowEvHandlerName="IpkolistRowChangeEventHandler" msprop:Generator_RowDeletedName="IpkolistRowDeleted" msprop:Generator_RowClassName="IpkolistRow" msprop:Generator_UserTableName="Ipkolist" msprop:Generator_RowEvArgName="IpkolistRowChangeEvent">
+        <xs:element name="Ipkolist" msprop:Generator_TableClassName="IpkolistDataTable" msprop:Generator_TableVarName="tableIpkolist" msprop:Generator_TablePropName="Ipkolist" msprop:Generator_RowDeletingName="IpkolistRowDeleting" msprop:Generator_RowChangingName="IpkolistRowChanging" msprop:Generator_RowEvHandlerName="IpkolistRowChangeEventHandler" msprop:Generator_RowDeletedName="IpkolistRowDeleted" msprop:Generator_UserTableName="Ipkolist" msprop:Generator_RowChangedName="IpkolistRowChanged" msprop:Generator_RowEvArgName="IpkolistRowChangeEvent" msprop:Generator_RowClassName="IpkolistRow">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="source" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnsource" msprop:Generator_ColumnPropNameInRow="source" msprop:Generator_ColumnPropNameInTable="sourceColumn" msprop:Generator_UserColumnName="source" minOccurs="0">
+              <xs:element name="source" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnsource" msprop:Generator_ColumnPropNameInRow="source" msprop:Generator_ColumnPropNameInTable="sourceColumn" msprop:Generator_UserColumnName="source">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" minOccurs="0" />
+              <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
               <xs:element name="pdate" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -1227,6 +1294,42 @@ ORDER BY state, wdate DESC</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="indate" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInRow="indate" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="inqty" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columninqty" msprop:Generator_ColumnPropNameInRow="inqty" msprop:Generator_ColumnPropNameInTable="inqtyColumn" msprop:Generator_UserColumnName="inqty" type="xs:int" minOccurs="0" />
+              <xs:element name="receive" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnreceive" msprop:Generator_ColumnPropNameInRow="receive" msprop:Generator_ColumnPropNameInTable="receiveColumn" msprop:Generator_UserColumnName="receive" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="200" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="sc" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="sc" msprop:Generator_ColumnVarNameInTable="columnsc" msprop:Generator_ColumnPropNameInTable="scColumn" msprop:Generator_UserColumnName="sc" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="30" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="po" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="po" msprop:Generator_ColumnVarNameInTable="columnpo" msprop:Generator_ColumnPropNameInTable="poColumn" msprop:Generator_UserColumnName="po" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="orderno" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="orderno" msprop:Generator_ColumnVarNameInTable="columnorderno" msprop:Generator_ColumnPropNameInTable="ordernoColumn" msprop:Generator_UserColumnName="orderno" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FEQ0000/dsPurchase.xss

@@ -4,11 +4,11 @@
      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="3" ViewPortY="0" 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="-10" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:Purchase" ZOrder="3" X="148" Y="70" Height="596" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="433" />
     <Shape ID="DesignTable:EETGW_PurchaseCR" ZOrder="2" X="452" Y="74" Height="592" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="448" />
-    <Shape ID="DesignTable:Ipkolist" ZOrder="1" X="827" Y="132" Height="305" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Ipkolist" ZOrder="1" X="827" Y="132" Height="324" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FEQ0000/fItemin.Designer.cs

@@ -31,8 +31,14 @@ namespace FEQ0000
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItemin));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
             this.button1 = new System.Windows.Forms.Button();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
@@ -45,8 +51,21 @@ namespace FEQ0000
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.ipkolistDataGridView = new System.Windows.Forms.DataGridView();
+            this.dvc_in = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
@@ -69,22 +88,51 @@ namespace FEQ0000
             this.label3 = new System.Windows.Forms.Label();
             this.ta = new FEQ0000.dsPurchaseTableAdapters.IpkolistTableAdapter();
             this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager();
-            this.dvc_in = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dv2 = new System.Windows.Forms.DataGridView();
-            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bs2 = new System.Windows.Forms.BindingSource(this.components);
-            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dsPurchase1 = new FEQ0000.dsPurchase();
-            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components);
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
-            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
-            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.toolStripButton10 = new System.Windows.Forms.ToolStripButton();
-            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.toolStripTextBox1 = new System.Windows.Forms.ToolStripTextBox();
-            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripButton11 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButton12 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
+            this.tbFind2 = new System.Windows.Forms.ToolStripTextBox();
+            this.btFind2 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButton15 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
+            this.toolStrip2 = new System.Windows.Forms.ToolStrip();
+            this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
+            this.tbindate = new System.Windows.Forms.ToolStripTextBox();
+            this.btRefreshIn = new System.Windows.Forms.ToolStripButton();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewButtonColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.orderno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.lbPO = new System.Windows.Forms.ToolStripStatusLabel();
             this.statusStrip1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
-            this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ipkolistDataGridView)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
@@ -92,13 +140,22 @@ namespace FEQ0000
             this.bn.SuspendLayout();
             this.panel2.SuspendLayout();
             this.panel3.SuspendLayout();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dv2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsPurchase1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit();
+            this.bindingNavigator1.SuspendLayout();
+            this.toolStrip2.SuspendLayout();
             this.SuspendLayout();
             // 
             // button1
             // 
             this.button1.Dock = System.Windows.Forms.DockStyle.Right;
             this.button1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.button1.Location = new System.Drawing.Point(1019, 0);
+            this.button1.Location = new System.Drawing.Point(1005, 0);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(122, 51);
             this.button1.TabIndex = 0;
@@ -113,10 +170,12 @@ namespace FEQ0000
             this.lbSID,
             this.toolStripStatusLabel4,
             this.lbCOST,
+            this.toolStripStatusLabel3,
+            this.lbPO,
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 708);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 676);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(1141, 22);
+            this.statusStrip1.Size = new System.Drawing.Size(1127, 22);
             this.statusStrip1.TabIndex = 1;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -161,7 +220,7 @@ namespace FEQ0000
             this.tbSearch.ImeMode = System.Windows.Forms.ImeMode.Alpha;
             this.tbSearch.Location = new System.Drawing.Point(0, 22);
             this.tbSearch.Name = "tbSearch";
-            this.tbSearch.Size = new System.Drawing.Size(1019, 29);
+            this.tbSearch.Size = new System.Drawing.Size(1005, 29);
             this.tbSearch.TabIndex = 2;
             this.tbSearch.Text = "4520286819#00020#109007296#1#EA#K115232311329759#001";
             this.tbSearch.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -173,10 +232,11 @@ namespace FEQ0000
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripButton1,
             this.toolStripButton2,
-            this.toolStripButton3});
+            this.toolStripButton3,
+            this.toolStripSeparator2});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1141, 47);
+            this.toolStrip1.Size = new System.Drawing.Size(1127, 47);
             this.toolStrip1.TabIndex = 3;
             this.toolStrip1.Text = "toolStrip1";
             // 
@@ -208,17 +268,10 @@ namespace FEQ0000
             this.toolStripButton3.Text = "새로고침";
             this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
             // 
-            // groupBox1
+            // toolStripSeparator2
             // 
-            this.groupBox1.Controls.Add(this.ipkolistDataGridView);
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.groupBox1.Controls.Add(this.bn);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47);
-            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox1.Location = new System.Drawing.Point(10, 10);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(1121, 590);
-            this.groupBox1.TabIndex = 4;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "미입고 자료";
             // 
             // ipkolistDataGridView
             // 
@@ -243,26 +296,119 @@ namespace FEQ0000
             this.dataGridViewTextBoxColumn13,
             this.dataGridViewTextBoxColumn12});
             this.ipkolistDataGridView.DataSource = this.bs;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5);
+            dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5);
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.ipkolistDataGridView.DefaultCellStyle = dataGridViewCellStyle2;
+            this.ipkolistDataGridView.DefaultCellStyle = dataGridViewCellStyle10;
             this.ipkolistDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ipkolistDataGridView.Location = new System.Drawing.Point(3, 17);
+            this.ipkolistDataGridView.Location = new System.Drawing.Point(0, 98);
             this.ipkolistDataGridView.Name = "ipkolistDataGridView";
             this.ipkolistDataGridView.ReadOnly = true;
             this.ipkolistDataGridView.RowHeadersVisible = false;
             this.ipkolistDataGridView.RowTemplate.Height = 23;
-            this.ipkolistDataGridView.Size = new System.Drawing.Size(1115, 531);
+            this.ipkolistDataGridView.Size = new System.Drawing.Size(1127, 539);
             this.ipkolistDataGridView.TabIndex = 0;
             this.ipkolistDataGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.ipkolistDataGridView_CellClick);
             this.ipkolistDataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.ipkolistDataGridView_DataError);
             // 
+            // dvc_in
+            // 
+            this.dvc_in.DataPropertyName = "request";
+            this.dvc_in.HeaderText = "담당자";
+            this.dvc_in.Name = "dvc_in";
+            this.dvc_in.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "source";
+            this.dataGridViewTextBoxColumn1.HeaderText = "위치";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "pdate";
+            this.dataGridViewTextBoxColumn3.HeaderText = "등록일";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "state";
+            this.dataGridViewTextBoxColumn4.HeaderText = "상태";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "sid";
+            this.dataGridViewTextBoxColumn5.HeaderText = "SID";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "pumname";
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle9;
+            this.dataGridViewTextBoxColumn6.HeaderText = "품명";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "pumscale";
+            this.dataGridViewTextBoxColumn7.HeaderText = "모델";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "pumqty";
+            this.dataGridViewTextBoxColumn8.HeaderText = "수량";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "pumprice";
+            this.dataGridViewTextBoxColumn9.HeaderText = "단가";
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "pumamt";
+            this.dataGridViewTextBoxColumn10.HeaderText = "금액";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn11
+            // 
+            this.dataGridViewTextBoxColumn11.DataPropertyName = "supply";
+            this.dataGridViewTextBoxColumn11.HeaderText = "공급";
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn13
+            // 
+            this.dataGridViewTextBoxColumn13.DataPropertyName = "bigo";
+            this.dataGridViewTextBoxColumn13.HeaderText = "비고";
+            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
+            this.dataGridViewTextBoxColumn13.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn12
+            // 
+            this.dataGridViewTextBoxColumn12.DataPropertyName = "project";
+            this.dataGridViewTextBoxColumn12.HeaderText = "연관프로젝트";
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.ReadOnly = true;
+            // 
             // bs
             // 
             this.bs.DataMember = "Ipkolist";
@@ -296,14 +442,14 @@ namespace FEQ0000
             this.btFind,
             this.toolStripButton4,
             this.toolStripButton5});
-            this.bn.Location = new System.Drawing.Point(3, 548);
+            this.bn.Location = new System.Drawing.Point(0, 637);
             this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
             this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
             this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
             this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
             this.bn.Name = "bn";
             this.bn.PositionItem = this.bindingNavigatorPositionItem;
-            this.bn.Size = new System.Drawing.Size(1115, 39);
+            this.bn.Size = new System.Drawing.Size(1127, 39);
             this.bn.TabIndex = 6;
             this.bn.Text = "bindingNavigator1";
             // 
@@ -341,6 +487,7 @@ namespace FEQ0000
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -420,12 +567,15 @@ namespace FEQ0000
             // 
             // panel2
             // 
-            this.panel2.Controls.Add(this.groupBox1);
+            this.panel2.Controls.Add(this.ipkolistDataGridView);
+            this.panel2.Controls.Add(this.bn);
+            this.panel2.Controls.Add(this.statusStrip1);
+            this.panel2.Controls.Add(this.panel3);
+            this.panel2.Controls.Add(this.toolStrip1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel2.Location = new System.Drawing.Point(0, 98);
+            this.panel2.Location = new System.Drawing.Point(3, 3);
             this.panel2.Name = "panel2";
-            this.panel2.Padding = new System.Windows.Forms.Padding(10);
+            this.panel2.Size = new System.Drawing.Size(1127, 698);
-            this.panel2.Size = new System.Drawing.Size(1141, 610);
             this.panel2.TabIndex = 5;
             // 
             // panel3
@@ -437,7 +587,7 @@ namespace FEQ0000
             this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel3.Location = new System.Drawing.Point(0, 47);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1141, 51);
+            this.panel3.Size = new System.Drawing.Size(1127, 51);
             this.panel3.TabIndex = 6;
             // 
             // label3
@@ -447,7 +597,7 @@ namespace FEQ0000
             this.label3.ForeColor = System.Drawing.Color.Gray;
             this.label3.Location = new System.Drawing.Point(0, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(1019, 22);
+            this.label3.Size = new System.Drawing.Size(1005, 22);
             this.label3.TabIndex = 3;
             this.label3.Text = "QR CODE 값을 입력하세요";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -464,108 +614,423 @@ namespace FEQ0000
             this.tam.PurchaseTableAdapter = null;
             this.tam.UpdateOrder = FEQ0000.dsPurchaseTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
             // 
-            // dvc_in
+            // tabControl1
             // 
-            this.dvc_in.DataPropertyName = "request";
+            this.tabControl1.Controls.Add(this.tabPage1);
-            this.dvc_in.HeaderText = "담당자";
+            this.tabControl1.Controls.Add(this.tabPage2);
-            this.dvc_in.Name = "dvc_in";
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dvc_in.ReadOnly = true;
+            this.tabControl1.Location = new System.Drawing.Point(0, 0);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(1141, 730);
+            this.tabControl1.TabIndex = 5;
+            this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
             // 
-            // dataGridViewTextBoxColumn1
+            // tabPage1
             // 
-            this.dataGridViewTextBoxColumn1.DataPropertyName = "source";
+            this.tabPage1.Controls.Add(this.panel2);
-            this.dataGridViewTextBoxColumn1.HeaderText = "위치";
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.tabPage1.Name = "tabPage1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(1133, 704);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "미 입고 자료";
+            this.tabPage1.UseVisualStyleBackColor = true;
             // 
-            // dataGridViewTextBoxColumn3
+            // tabPage2
             // 
-            this.dataGridViewTextBoxColumn3.DataPropertyName = "pdate";
+            this.tabPage2.Controls.Add(this.dv2);
-            this.dataGridViewTextBoxColumn3.HeaderText = "등록일";
+            this.tabPage2.Controls.Add(this.bindingNavigator1);
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.tabPage2.Controls.Add(this.toolStrip2);
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(1133, 704);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "금일 입고 내역";
+            this.tabPage2.UseVisualStyleBackColor = true;
             // 
-            // dataGridViewTextBoxColumn4
+            // dv2
             // 
-            this.dataGridViewTextBoxColumn4.DataPropertyName = "state";
+            this.dv2.AllowUserToAddRows = false;
-            this.dataGridViewTextBoxColumn4.HeaderText = "상태";
+            this.dv2.AllowUserToDeleteRows = false;
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dv2.AutoGenerateColumns = false;
-            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dv2.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
+            this.dv2.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.dv2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dv2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewButtonColumn1,
+            this.dataGridViewTextBoxColumn14,
+            this.dataGridViewTextBoxColumn15,
+            this.dataGridViewTextBoxColumn16,
+            this.dataGridViewTextBoxColumn17,
+            this.dataGridViewTextBoxColumn18,
+            this.dataGridViewTextBoxColumn19,
+            this.dataGridViewTextBoxColumn20,
+            this.dataGridViewTextBoxColumn21,
+            this.dataGridViewTextBoxColumn22,
+            this.orderno,
+            this.dataGridViewTextBoxColumn23,
+            this.dataGridViewTextBoxColumn24});
+            this.dv2.DataSource = this.bs2;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle16.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5);
+            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dv2.DefaultCellStyle = dataGridViewCellStyle16;
+            this.dv2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dv2.Location = new System.Drawing.Point(3, 50);
+            this.dv2.Name = "dv2";
+            this.dv2.ReadOnly = true;
+            this.dv2.RowHeadersVisible = false;
+            this.dv2.RowTemplate.Height = 23;
+            this.dv2.Size = new System.Drawing.Size(1127, 612);
+            this.dv2.TabIndex = 8;
             // 
-            // dataGridViewTextBoxColumn5
+            // bs2
             // 
-            this.dataGridViewTextBoxColumn5.DataPropertyName = "sid";
+            this.bs2.DataMember = "Ipkolist";
-            this.dataGridViewTextBoxColumn5.HeaderText = "SID";
+            this.bs2.DataSource = this.dsPurchase1;
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.ReadOnly = true;
             // 
-            // dataGridViewTextBoxColumn6
+            // dsPurchase1
             // 
-            this.dataGridViewTextBoxColumn6.DataPropertyName = "pumname";
+            this.dsPurchase1.DataSetName = "dsPurchase";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dsPurchase1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle1;
-            this.dataGridViewTextBoxColumn6.HeaderText = "품명";
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.ReadOnly = true;
             // 
-            // dataGridViewTextBoxColumn7
+            // bindingNavigator1
             // 
-            this.dataGridViewTextBoxColumn7.DataPropertyName = "pumscale";
+            this.bindingNavigator1.AddNewItem = null;
-            this.dataGridViewTextBoxColumn7.HeaderText = "모델";
+            this.bindingNavigator1.BindingSource = this.bs2;
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.bindingNavigator1.CountItem = this.toolStripLabel2;
-            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.bindingNavigator1.DeleteItem = null;
+            this.bindingNavigator1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.bindingNavigator1.ImageScalingSize = new System.Drawing.Size(32, 32);
+            this.bindingNavigator1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripButton8,
+            this.toolStripButton10,
+            this.toolStripSeparator4,
+            this.toolStripTextBox1,
+            this.toolStripLabel2,
+            this.toolStripSeparator5,
+            this.toolStripButton11,
+            this.toolStripButton12,
+            this.toolStripSeparator6,
+            this.toolStripLabel3,
+            this.tbFind2,
+            this.btFind2,
+            this.toolStripButton15,
+            this.toolStripSeparator7,
+            this.toolStripButton6});
+            this.bindingNavigator1.Location = new System.Drawing.Point(3, 662);
+            this.bindingNavigator1.MoveFirstItem = this.toolStripButton8;
+            this.bindingNavigator1.MoveLastItem = this.toolStripButton12;
+            this.bindingNavigator1.MoveNextItem = this.toolStripButton11;
+            this.bindingNavigator1.MovePreviousItem = this.toolStripButton10;
+            this.bindingNavigator1.Name = "bindingNavigator1";
+            this.bindingNavigator1.PositionItem = this.toolStripTextBox1;
+            this.bindingNavigator1.Size = new System.Drawing.Size(1127, 39);
+            this.bindingNavigator1.TabIndex = 7;
+            this.bindingNavigator1.Text = "bindingNavigator1";
             // 
-            // dataGridViewTextBoxColumn8
+            // toolStripLabel2
             // 
-            this.dataGridViewTextBoxColumn8.DataPropertyName = "pumqty";
+            this.toolStripLabel2.Name = "toolStripLabel2";
-            this.dataGridViewTextBoxColumn8.HeaderText = "수량";
+            this.toolStripLabel2.Size = new System.Drawing.Size(27, 36);
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.toolStripLabel2.Text = "/{0}";
-            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.toolStripLabel2.ToolTipText = "전체 항목 수";
             // 
-            // dataGridViewTextBoxColumn9
+            // toolStripButton8
             // 
-            this.dataGridViewTextBoxColumn9.DataPropertyName = "pumprice";
+            this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.dataGridViewTextBoxColumn9.HeaderText = "단가";
+            this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image")));
-            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.toolStripButton8.Name = "toolStripButton8";
-            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            this.toolStripButton8.RightToLeftAutoMirrorImage = true;
+            this.toolStripButton8.Size = new System.Drawing.Size(36, 36);
+            this.toolStripButton8.Text = "처음으로 이동";
             // 
-            // dataGridViewTextBoxColumn10
+            // toolStripButton10
             // 
-            this.dataGridViewTextBoxColumn10.DataPropertyName = "pumamt";
+            this.toolStripButton10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.dataGridViewTextBoxColumn10.HeaderText = "금액";
+            this.toolStripButton10.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton10.Image")));
-            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.toolStripButton10.Name = "toolStripButton10";
-            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            this.toolStripButton10.RightToLeftAutoMirrorImage = true;
+            this.toolStripButton10.Size = new System.Drawing.Size(36, 36);
+            this.toolStripButton10.Text = "이전으로 이동";
             // 
-            // dataGridViewTextBoxColumn11
+            // toolStripSeparator4
             // 
-            this.dataGridViewTextBoxColumn11.DataPropertyName = "supply";
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.dataGridViewTextBoxColumn11.HeaderText = "공급";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);
-            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
-            this.dataGridViewTextBoxColumn11.ReadOnly = true;
             // 
-            // dataGridViewTextBoxColumn13
+            // toolStripTextBox1
             // 
-            this.dataGridViewTextBoxColumn13.DataPropertyName = "bigo";
+            this.toolStripTextBox1.AccessibleName = "위치";
-            this.dataGridViewTextBoxColumn13.HeaderText = "비고";
+            this.toolStripTextBox1.AutoSize = false;
-            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
+            this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F);
-            this.dataGridViewTextBoxColumn13.ReadOnly = true;
+            this.toolStripTextBox1.Name = "toolStripTextBox1";
+            this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23);
+            this.toolStripTextBox1.Text = "0";
+            this.toolStripTextBox1.ToolTipText = "현재 위치";
             // 
-            // dataGridViewTextBoxColumn12
+            // toolStripSeparator5
             // 
-            this.dataGridViewTextBoxColumn12.DataPropertyName = "project";
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.dataGridViewTextBoxColumn12.HeaderText = "연관프로젝트";
+            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 39);
-            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            // 
-            this.dataGridViewTextBoxColumn12.ReadOnly = true;
+            // toolStripButton11
+            // 
+            this.toolStripButton11.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton11.Image")));
+            this.toolStripButton11.Name = "toolStripButton11";
+            this.toolStripButton11.RightToLeftAutoMirrorImage = true;
+            this.toolStripButton11.Size = new System.Drawing.Size(36, 36);
+            this.toolStripButton11.Text = "다음으로 이동";
+            // 
+            // toolStripButton12
+            // 
+            this.toolStripButton12.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton12.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton12.Image")));
+            this.toolStripButton12.Name = "toolStripButton12";
+            this.toolStripButton12.RightToLeftAutoMirrorImage = true;
+            this.toolStripButton12.Size = new System.Drawing.Size(36, 36);
+            this.toolStripButton12.Text = "마지막으로 이동";
+            // 
+            // toolStripSeparator6
+            // 
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
+            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 39);
+            // 
+            // toolStripLabel3
+            // 
+            this.toolStripLabel3.Name = "toolStripLabel3";
+            this.toolStripLabel3.Size = new System.Drawing.Size(31, 36);
+            this.toolStripLabel3.Text = "검색";
+            // 
+            // tbFind2
+            // 
+            this.tbFind2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbFind2.Font = new System.Drawing.Font("맑은 고딕", 15F);
+            this.tbFind2.Name = "tbFind2";
+            this.tbFind2.Size = new System.Drawing.Size(200, 39);
+            this.tbFind2.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tbFind2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind2_KeyDown);
+            // 
+            // btFind2
+            // 
+            this.btFind2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btFind2.Image = ((System.Drawing.Image)(resources.GetObject("btFind2.Image")));
+            this.btFind2.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btFind2.Name = "btFind2";
+            this.btFind2.Size = new System.Drawing.Size(36, 36);
+            this.btFind2.Text = "toolStripButton3";
+            this.btFind2.Click += new System.EventHandler(this.toolStripButton13_Click);
+            // 
+            // toolStripButton15
+            // 
+            this.toolStripButton15.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton15.Image")));
+            this.toolStripButton15.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton15.Name = "toolStripButton15";
+            this.toolStripButton15.Size = new System.Drawing.Size(103, 36);
+            this.toolStripButton15.Text = "검색지우기";
+            this.toolStripButton15.Click += new System.EventHandler(this.toolStripButton15_Click);
+            // 
+            // toolStripSeparator7
+            // 
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
+            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 39);
+            // 
+            // toolStripButton6
+            // 
+            this.toolStripButton6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
+            this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton6.Name = "toolStripButton6";
+            this.toolStripButton6.Size = new System.Drawing.Size(135, 36);
+            this.toolStripButton6.Text = "메일발송(아웃룩)";
+            this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
+            // 
+            // toolStrip2
+            // 
+            this.toolStrip2.ImageScalingSize = new System.Drawing.Size(40, 40);
+            this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripButton7,
+            this.toolStripLabel4,
+            this.tbindate,
+            this.btRefreshIn});
+            this.toolStrip2.Location = new System.Drawing.Point(3, 3);
+            this.toolStrip2.Name = "toolStrip2";
+            this.toolStrip2.Size = new System.Drawing.Size(1127, 47);
+            this.toolStrip2.TabIndex = 4;
+            this.toolStrip2.Text = "toolStrip2";
+            // 
+            // toolStripButton7
+            // 
+            this.toolStripButton7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
+            this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton7.Name = "toolStripButton7";
+            this.toolStripButton7.Size = new System.Drawing.Size(75, 44);
+            this.toolStripButton7.Text = "닫기";
+            // 
+            // toolStripLabel4
+            // 
+            this.toolStripLabel4.Name = "toolStripLabel4";
+            this.toolStripLabel4.Size = new System.Drawing.Size(43, 44);
+            this.toolStripLabel4.Text = "입고일";
+            // 
+            // tbindate
+            // 
+            this.tbindate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbindate.Font = new System.Drawing.Font("맑은 고딕", 18F);
+            this.tbindate.Name = "tbindate";
+            this.tbindate.Size = new System.Drawing.Size(200, 47);
+            // 
+            // btRefreshIn
+            // 
+            this.btRefreshIn.Image = ((System.Drawing.Image)(resources.GetObject("btRefreshIn.Image")));
+            this.btRefreshIn.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btRefreshIn.Name = "btRefreshIn";
+            this.btRefreshIn.Size = new System.Drawing.Size(99, 44);
+            this.btRefreshIn.Text = "새로고침";
+            this.btRefreshIn.Click += new System.EventHandler(this.btRefreshIn_Click);
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "source";
+            this.dataGridViewTextBoxColumn2.HeaderText = "위치";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            // 
+            // dataGridViewButtonColumn1
+            // 
+            this.dataGridViewButtonColumn1.DataPropertyName = "request";
+            this.dataGridViewButtonColumn1.HeaderText = "담당자";
+            this.dataGridViewButtonColumn1.Name = "dataGridViewButtonColumn1";
+            this.dataGridViewButtonColumn1.ReadOnly = true;
+            this.dataGridViewButtonColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewButtonColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn14
+            // 
+            this.dataGridViewTextBoxColumn14.DataPropertyName = "pdate";
+            this.dataGridViewTextBoxColumn14.HeaderText = "등록일";
+            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
+            this.dataGridViewTextBoxColumn14.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn15
+            // 
+            this.dataGridViewTextBoxColumn15.DataPropertyName = "state";
+            this.dataGridViewTextBoxColumn15.HeaderText = "상태";
+            this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
+            this.dataGridViewTextBoxColumn15.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn16
+            // 
+            this.dataGridViewTextBoxColumn16.DataPropertyName = "sid";
+            this.dataGridViewTextBoxColumn16.HeaderText = "SID";
+            this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16";
+            this.dataGridViewTextBoxColumn16.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn17
+            // 
+            this.dataGridViewTextBoxColumn17.DataPropertyName = "pumname";
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle11;
+            this.dataGridViewTextBoxColumn17.HeaderText = "품명";
+            this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
+            this.dataGridViewTextBoxColumn17.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn18
+            // 
+            this.dataGridViewTextBoxColumn18.DataPropertyName = "pumscale";
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle12;
+            this.dataGridViewTextBoxColumn18.HeaderText = "모델";
+            this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
+            this.dataGridViewTextBoxColumn18.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn19
+            // 
+            this.dataGridViewTextBoxColumn19.DataPropertyName = "pumqty";
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle13.Format = "N0";
+            this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle13;
+            this.dataGridViewTextBoxColumn19.HeaderText = "수량";
+            this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
+            this.dataGridViewTextBoxColumn19.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn20
+            // 
+            this.dataGridViewTextBoxColumn20.DataPropertyName = "pumprice";
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle14.Format = "N0";
+            this.dataGridViewTextBoxColumn20.DefaultCellStyle = dataGridViewCellStyle14;
+            this.dataGridViewTextBoxColumn20.HeaderText = "단가";
+            this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
+            this.dataGridViewTextBoxColumn20.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn21
+            // 
+            this.dataGridViewTextBoxColumn21.DataPropertyName = "pumamt";
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle15.Format = "N0";
+            this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle15;
+            this.dataGridViewTextBoxColumn21.HeaderText = "금액";
+            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
+            this.dataGridViewTextBoxColumn21.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn22
+            // 
+            this.dataGridViewTextBoxColumn22.DataPropertyName = "supply";
+            this.dataGridViewTextBoxColumn22.HeaderText = "공급";
+            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
+            this.dataGridViewTextBoxColumn22.ReadOnly = true;
+            // 
+            // orderno
+            // 
+            this.orderno.DataPropertyName = "orderno";
+            this.orderno.HeaderText = "SCR/CF";
+            this.orderno.Name = "orderno";
+            this.orderno.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn23
+            // 
+            this.dataGridViewTextBoxColumn23.DataPropertyName = "bigo";
+            this.dataGridViewTextBoxColumn23.HeaderText = "비고";
+            this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
+            this.dataGridViewTextBoxColumn23.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn24
+            // 
+            this.dataGridViewTextBoxColumn24.DataPropertyName = "project";
+            this.dataGridViewTextBoxColumn24.HeaderText = "연관프로젝트";
+            this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
+            this.dataGridViewTextBoxColumn24.ReadOnly = true;
+            // 
+            // toolStripStatusLabel3
+            // 
+            this.toolStripStatusLabel3.Name = "toolStripStatusLabel3";
+            this.toolStripStatusLabel3.Size = new System.Drawing.Size(23, 17);
+            this.toolStripStatusLabel3.Text = "PO";
+            // 
+            // lbPO
+            // 
+            this.lbPO.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold);
+            this.lbPO.Name = "lbPO";
+            this.lbPO.Size = new System.Drawing.Size(17, 17);
+            this.lbPO.Text = "--";
             // 
             // fItemin
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1141, 730);
-            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.tabControl1);
-            this.Controls.Add(this.panel3);
-            this.Controls.Add(this.statusStrip1);
-            this.Controls.Add(this.toolStrip1);
             this.Name = "fItemin";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "품목 입고";
@@ -574,8 +1039,6 @@ namespace FEQ0000
             this.statusStrip1.PerformLayout();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ipkolistDataGridView)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit();
@@ -583,10 +1046,22 @@ namespace FEQ0000
             this.bn.ResumeLayout(false);
             this.bn.PerformLayout();
             this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
+            this.tabPage2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dv2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsPurchase1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit();
+            this.bindingNavigator1.ResumeLayout(false);
+            this.bindingNavigator1.PerformLayout();
+            this.toolStrip2.ResumeLayout(false);
+            this.toolStrip2.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -597,7 +1072,6 @@ namespace FEQ0000
         private System.Windows.Forms.ToolStrip toolStrip1;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
         private System.Windows.Forms.ToolStripButton toolStripButton2;
-        private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
         private dsPurchase dsPurchase;
@@ -640,5 +1114,49 @@ namespace FEQ0000
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.ToolStrip toolStrip2;
+        private System.Windows.Forms.ToolStripButton toolStripButton7;
+        private System.Windows.Forms.ToolStripButton btRefreshIn;
+        private dsPurchase dsPurchase1;
+        private System.Windows.Forms.BindingSource bs2;
+        private System.Windows.Forms.DataGridView dv2;
+        private System.Windows.Forms.BindingNavigator bindingNavigator1;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel2;
+        private System.Windows.Forms.ToolStripButton toolStripButton8;
+        private System.Windows.Forms.ToolStripButton toolStripButton10;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.ToolStripTextBox toolStripTextBox1;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+        private System.Windows.Forms.ToolStripButton toolStripButton11;
+        private System.Windows.Forms.ToolStripButton toolStripButton12;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel3;
+        private System.Windows.Forms.ToolStripTextBox tbFind2;
+        private System.Windows.Forms.ToolStripButton btFind2;
+        private System.Windows.Forms.ToolStripButton toolStripButton15;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel4;
+        private System.Windows.Forms.ToolStripTextBox tbindate;
+        private System.Windows.Forms.ToolStripButton toolStripButton6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewButtonColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn16;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn18;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn19;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn20;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn22;
+        private System.Windows.Forms.DataGridViewTextBoxColumn orderno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn23;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn24;
+        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3;
+        private System.Windows.Forms.ToolStripStatusLabel lbPO;
     }
 }

SubProject/FEQ0000/fItemin.cs

@@ -8,6 +8,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
+using NetOffice;
+using Outlook = NetOffice.OutlookApi;
+using NetOffice.OutlookApi.Enums;
+
 namespace FEQ0000
 {
     public partial class fItemin : Form
@@ -21,6 +25,9 @@ namespace FEQ0000
         private void toolStripButton2_Click(object sender, EventArgs e)
         {
             tbSearch.Text = string.Empty;
+            lbSID.Text = string.Empty;
+            lbCOST.Text = string.Empty;
+            lbPO.Text = string.Empty;
             tbSearch.Focus();
             //tbFind.Text = string.Empty;
             //findText();
@@ -37,7 +44,7 @@ namespace FEQ0000
             try
             {
                 var dt = DateTime.Now.AddYears(-2);
-                this.ta.Fill(this.dsPurchase.Ipkolist, dt.ToShortDateString());
+                this.ta.Fill(this.dsPurchase.Ipkolist, dt.ToShortDateString(), FCOMMON.info.Login.gcode);
                 ipkolistDataGridView.AutoResizeColumn(0);
                 ipkolistDataGridView.AutoResizeColumn(1);
                 ipkolistDataGridView.AutoResizeColumn(2);
@@ -65,7 +72,7 @@ namespace FEQ0000
         void findText()
         {
             var search = tbFind.Text.Trim();
-            if(search.isEmpty())
+            if (search.isEmpty())
             {
                 bs.Filter = string.Empty;
                 tbFind.BackColor = SystemColors.Control;
@@ -74,14 +81,14 @@ namespace FEQ0000
             {
                 try
                 {
-                    var list = new string[] {"sid","pumname","bigo" };
+                    var list = new string[] { "sid", "pumname", "bigo" };
                     var filter = string.Join(" like '%{0}%' or ", list);
                     filter += "  like '%{0}%'";
                     filter = string.Format(filter, search);
                     bs.Filter = filter;
                     tbFind.BackColor = Color.Lime;
                 }
-                catch ( Exception ex)
+                catch (Exception ex)
                 {
                     tbFind.BackColor = Color.Tomato;
                 }
@@ -103,7 +110,38 @@ namespace FEQ0000
             tbFind.SelectAll();
 
         }
+        void findText2()
+        {
+            var search = tbFind2.Text.Trim();
+            if (search.isEmpty())
+            {
+                bs2.Filter = string.Empty;
+                tbFind2.BackColor = SystemColors.Control;
+            }
+            else
+            {
+                try
+                {
+                    var list = new string[] { "sid", "pumname", "bigo" };
+                    var filter = string.Join(" like '%{0}%' or ", list);
+                    filter += "  like '%{0}%'";
+                    filter = string.Format(filter, search);
+                    bs2.Filter = filter;
+                    tbFind2.BackColor = Color.Lime;
+                }
+                catch (Exception ex)
+                {
+                    tbFind2.BackColor = Color.Tomato;
+                }
 
+            }
+
+            dv2.AutoResizeColumns();
+
+            tbFind2.Focus();
+            tbFind2.SelectAll();
+
+        }
         private void tbFind_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -117,6 +155,7 @@ namespace FEQ0000
 
         private void fItemin_Load(object sender, EventArgs e)
         {
+            tbindate.Text = DateTime.Now.ToShortDateString();
             refreshData();
         }
 
@@ -128,6 +167,10 @@ namespace FEQ0000
         }
         void SearchText()
         {
+            lbSID.Text = string.Empty;
+            lbCOST.Text = string.Empty;
+            lbPO.Text = string.Empty;
+
             //입력된데이터에서 값을 추출한다
             var buf = tbSearch.Text.Split('#');
             if (buf.Length > 5)
@@ -136,6 +179,7 @@ namespace FEQ0000
                 var qty = buf[3].Trim();
                 lbCOST.Text = buf[5].Trim();
                 tbFind.Text = lbSID.Text;
+                lbPO.Text = buf[0].Trim();
                 findText();
             }
             else
@@ -174,9 +218,13 @@ namespace FEQ0000
                 }
 
             }
-            if(dr.source == "NR")
+
+            var po = this.lbPO.Text.Trim();
+            if (po.StartsWith("--")) po = string.Empty;
+
+            if (dr.source == "NR")
             {
-                var f = new FEQ0000.Purchase.fPurchaseNR_Ipgo(dr.idx);
+                var f = new FEQ0000.Purchase.fPurchaseNR_Ipgo(dr.idx, po);
                 if (f.ShowDialog() == DialogResult.OK)
                 {
                     refreshData();
@@ -186,7 +234,7 @@ namespace FEQ0000
             }
             else
             {
-                var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx);
+                var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx, po);
                 if (f.ShowDialog() == DialogResult.OK)
                 {
                     refreshData();
@@ -210,17 +258,262 @@ namespace FEQ0000
 
         private void tbSearch_KeyDown(object sender, KeyEventArgs e)
         {
-            if(e.KeyCode == Keys.Enter)
+            if (e.KeyCode == Keys.Enter)
                 SearchText();
         }
 
         private void ipkolistDataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
         {
             if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
-            if(e.ColumnIndex == 0)
+            if (e.ColumnIndex == 0)
             {
                 func_ipgo(); ;
             }
         }
+
+        private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.tabControl1.SelectedIndex == 1)
+                tbindate.Text = DateTime.Now.ToShortDateString();
+        }
+
+        private void btRefreshIn_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                this.ta.FillByTodayIn(this.dsPurchase1.Ipkolist, tbindate.Text, FCOMMON.info.Login.gcode);
+                dv2.AutoResizeColumns();
+            }
+            catch (Exception ex)
+            {
+                FCOMMON.Util.MsgE(ex.Message);
+            }
+        }
+
+        private void toolStripButton13_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void toolStripButton15_Click(object sender, EventArgs e)
+        {
+            tbFind2.Text = string.Empty;
+            btFind2.PerformClick();
+        }
+
+        private void tbFind2_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter) btFind2.PerformClick();
+        }
+        List<string> ChangeMailAddress(List<string> userid)
+        {
+            var db = new DataClasses1DataContext();
+
+            List<string> retval = new List<string>();
+            foreach (var id in userid)
+            {
+                UInt32 userno;
+                if (UInt32.TryParse(id, out userno) == true)
+                {
+                    var user = db.Users.Where(t => t.id == id).FirstOrDefault();
+                    if (user != null)
+                    {
+                        var data = string.Format("{0}<{1}>", user.name, user.email);
+                        if (retval.Contains(data) == false)
+                            retval.Add(data);
+                    }
+                }
+                else
+                {
+                    if (retval.Contains(id) == false)
+                        retval.Add(id);
+                }
+            }
+            return retval;
+        }
+        string getmaxstr(string src, int len = 30)
+        {
+            if (src.Length > len) return src.Substring(0, len) + "...";
+            else return src;
+        }
+
+        private void toolStripButton6_Click(object sender, EventArgs e)
+        {
+
+            //입고품목메일발송
+            var db = new DataClasses1DataContext();
+            var dr = db.MailForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "PE").FirstOrDefault();
+
+            //현재표시데이터중에 수신자목록을 가져온다
+            //var grp_req = new List<string>();
+            //var grp_rec = new List<string>();
+
+            var drows = (dsPurchase.IpkolistRow[])(this.dsPurchase1.Ipkolist.Select(this.bs2.Filter, this.bs2.Sort));
+            var grp_req = drows.Where(t => t.request.isEmpty() == false).GroupBy(t => t.request).Select(t => t.FirstOrDefault().request).ToList();
+            var grp_rec = drows.Where(t => t.receive.isEmpty() == false).GroupBy(t => t.receive).Select(t => t.FirstOrDefault().receive).ToList();
+
+            //var f = new Purchase.fMailForm("PE");
+            //if (f.ShowDialog() != DialogResult.OK) return;
+
+
+
+            var form_subject = string.Empty;// f.tbSubject.Text.Trim();
+            var form_body = string.Empty;// f.htmlEditor1.Html;
+            var form_to =string.Empty;// f.tbTo.Text.Trim();
+            var form_cc = string.Empty;// f.tbCC.Text.Trim();
+            var form_bcc = string.Empty;//f.tbBcc.Text.Trim();
+
+            if (dr.subject != null) form_subject = dr.subject;
+            if (dr.body != null) form_body = dr.body;
+            if (dr.tolist != null) form_to = dr.tolist;
+            if (dr.cc != null) form_cc = dr.cc;
+            if (dr.bcc != null) form_bcc = dr.bcc;
+
+
+            List<string> tolist = new List<string>();   //최종받는사람
+            List<string> cclist = new List<string>();
+            List<string> bcclist = new List<string>();
+
+            //받는사람
+            if (form_to.Contains("{요청}") == true) tolist.AddRange(grp_req);
+            if (form_to.Contains("{수령}") == true) tolist.AddRange(grp_rec);
+            form_to = form_to.Replace("{요청}", "");
+            form_to = form_to.Replace("{수령}", "");
+            tolist.AddRange(form_to.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
+            tolist = ChangeMailAddress(tolist);
+
+            //참조
+            if (form_cc.Contains("{요청}") == true) cclist.AddRange(grp_req);
+            if (form_cc.Contains("{수령}") == true) cclist.AddRange(grp_rec);
+            form_cc = form_cc.Replace("{요청}", "");
+            form_cc = form_cc.Replace("{수령}", "");
+            cclist.AddRange(form_cc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
+            cclist = ChangeMailAddress(cclist);
+
+            //숨은참조
+            if (form_bcc.Contains("{요청}") == true) bcclist.AddRange(grp_req);
+            if (form_bcc.Contains("{수령}") == true) bcclist.AddRange(grp_rec);
+            form_bcc = form_bcc.Replace("{요청}", "");
+            form_bcc = form_bcc.Replace("{수령}", "");
+            bcclist.AddRange(form_bcc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
+            bcclist = ChangeMailAddress(bcclist);
+
+            var datestr = tbindate.Text;
+            //if (dtSD.Text == dtED.Text) datestr = dtSD.Text;
+            //else datestr = dtSD.Text + "~" + dtED.Text;
+            form_subject = form_subject.Replace("{DATE}", datestr);
+
+            try
+            {
+                Outlook.Application outlookApplication = new Outlook.Application();
+                var newMail = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
+                newMail.Display();
+                newMail.Subject = form_subject; // this.tbSubject.Text.Trim(); // dr.title;
+                newMail.To = string.Join(";", tolist.ToArray());
+                newMail.CC = string.Join(";", cclist.ToArray());
+                newMail.BCC = string.Join(";", bcclist.ToArray());
+
+                var datas = this.dsPurchase1.Ipkolist.OrderBy(t => t.source);
+
+                //if (f.chkAttach.Checked)
+                {
+                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\Purchase_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
+                    if (fi.Directory.Exists == false) fi.Directory.Create();
+
+                    var xls = new libxl.XmlBook();
+                    xls.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey);
+
+
+                    var row = 0;
+                    var col = 0;
+
+                    //제목줄 먼저 진행
+                    var sheet = xls.addSheet("data");
+                    foreach (DataGridViewColumn column in this.dv2.Columns)
+                    {
+                        if (column.Visible == false || column.Width < 10) continue;
+                        sheet.writeStr(row, col++, column.HeaderText);
+                    }
+                    row += 1;
+
+                    //데이터를 입력한다
+
+
+                    foreach (dsPurchase.IpkolistRow drow in datas)
+                    {
+                        col = 0;
+                        foreach (DataGridViewColumn column in this.dv2.Columns)
+                        {
+                            if (column.Visible == false || column.Width < 10) continue;
+                            var o_data = drow[column.DataPropertyName];
+                            string value = string.Empty;
+                            if (o_data != null) value = o_data.ToString();
+                            sheet.writeStr(row, col++, value);
+                        }
+
+
+                        row += 1;
+                    }
+                    xls.save(fi.FullName);
+                    newMail.Attachments.Add(fi.FullName);
+                }
+                //if (f.chkList.Checked)
+                {
+                    //목록을 본문에 추가한다
+                    System.Text.StringBuilder sb = new StringBuilder();
+                    sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
+                    sb.AppendLine("<thead>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>위치</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>신청</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수령</td>");
+                    //sb.AppendLine("<td style='text-align:center;background-color: aqua;'>PO</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>CR/CF</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>SID</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>품명</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>규격</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수량</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>단가</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>금액</td>");
+                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>공급</td>");
+                    sb.AppendLine("</thead>");
+                    sb.AppendLine("<tbody>");
+
+                    var htmltable = new System.Text.StringBuilder();
+                    foreach (dsPurchase.IpkolistRow drow in datas)
+                    {
+                        htmltable.AppendLine("<tr>");
+                        htmltable.AppendLine($"<td style='text-align:center'>{drow.source}</td>");
+                        htmltable.AppendLine($"<td style='text-align:center'>{drow.request}</td>");
+                        if (drow.receive.Equals(drow.request))
+                            htmltable.AppendLine($"<td style='text-align:center'>=</td>");
+                        else
+                            htmltable.AppendLine($"<td style='text-align:center'>{drow.receive}</td>");
+                        //htmltable.AppendLine($"<td>{drow.po}</td>");
+                        htmltable.AppendLine($"<td>{drow.orderno}</td>");
+                        htmltable.AppendLine($"<td>{drow.sid}</td>");
+                        htmltable.AppendLine($"<td>{drow.pumname}</td>");
+                        htmltable.AppendLine($"<td>{drow.pumscale}</td>");
+                        htmltable.AppendLine($"<td style='text-align:center'>{drow.pumqty:N0}</td>");
+                        htmltable.AppendLine($"<td style='text-align:right'>{drow.pumprice:N0}</td>");
+                        htmltable.AppendLine($"<td style='text-align:right'>{drow.pumamt:N0}</td>");
+                        htmltable.AppendLine($"<td>{drow.supply}</td>");
+                        htmltable.AppendLine("</tr>");
+                    }
+                    sb.AppendLine(htmltable.ToString());
+                    sb.AppendLine("</tbody>");
+                    sb.AppendLine("</table>");
+                    form_body += sb.ToString();
+                }
+
+                //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
+                form_body = form_body.Replace("{DATE}", datestr);
+                newMail.HTMLBody = form_body + newMail.HTMLBody; //
+            }
+            catch (Exception ex)
+            {
+                FCOMMON.Util.MsgE("전송실패\n\n" + ex.Message + "\n\n" +
+                    "아웃룩의 설정이 정상인지 확인하세요");
+            }
+        }
     }
 }

SubProject/FEQ0000/fItemin.resx

@@ -127,24 +127,24 @@
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAP8SURBVFhH3VhLTxpRGCVpd21/Rh9pm3ZvogjDzABVGyOY
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAPsSURBVFhH3VhLSxtRFA60u9qf0QdtaddmI8lkZpK0pQhG
-        mDQVd+pCrWJXvnXjwtff6L7psolKGXwkNSqFBvtM3FQxYQZcFDP9znBRoFcYXtX0JCchcO/9Dvd+93tc
+        EEqNoC7VauzKt25c+Pob3ZcuuzHNjCJW0HRS6BvcVCOYh4uOTM83nmii12Qmjxr84IOQ3HvOl3vPPefc
-        y38LxWZ7GnQ4RjadznchUfy2arUmg42NaRCfQ07nV/wWFMVhjGXT6ov1hoY7iii+DjkcP0Nut7rb03N6
+        67m20Hy+J4lAYGQ9GHyvy/KPD21tuURrqwnisx4MfsdvCVkexlie1liser23NVl+owcCv/VwOLPZ03O0
-        6Pfr8elpXZuf11MLCwbxGd8djo7qez5fCmMDsvxDcTj8763W22y52oEWvalIkp92Sg13dSWPxsf106Ul
+        G4tZ6elpKzs/b+UXFmziM77bHR21tqPRPMbGVfWXFgjESHwLm6sfyOhNTVFitFKZZFdXbm983DpaWnLO
-        81xc1DEn7PFo9AdV7DzWZMtXh4AkPdiQpM9bnZ3qyewsX0AZxBpbra0qrRldt9nuMzOVQRGE5yRQO+jv
+        xUULc5Lt7Vn6gxmsPGyy+doQV5T7a4ryRe/szBzMzooFuCBsYEXJZmrV57vHbqqDJkkvSGA21d9/LHJW
-        P+MZq4ax3t6zQFOT9sFub2XmykNIELrXmpuT8akproFa8HhyUl+z2ZK0ES+ZWXPAzkHcydwcd+FaEkcO
+        C43e3uO415v96Pc/Z3fuoEtSN4I9PTUldFAP7k9OWvBBC/GK3ToDVg4TD+bmhIbrSWw5fMUl6Rm7Lw/E
-        kQFBaGHmiwM+h2Ot584V8nhiQsdx06ndYzL4wM3ChaiHz5VibHAwTbc7UvR24/pve70J3gL/gjvt7RqF
+        HLa1kSt3nvsTExa2m3btLssQAycLB6IRMVeJxuCgSafbgAaWcxE4/huRyKHIwP/gFqUhSmXDLKcUSMLI
-        smEmJx8IwohzpkLJ8nKGvN94NDn+ZGZGpySQ4AZzZAgEYd7EPJKhdDisp/f2TItM7+zo6WhUP11Z4f6e
+        c45SyfLyCUW/iehw/MHMjEVF4JBW8WIyR4VAEhZNLCE5MpNJy9zedizS3NqyzFTKOlpZEf5eTDuZU8Vh
-        y3BHh4aMw2RdAOnriJyVN+mcTFwWZkRCXBZmRCLjBGX5O5OVAZI58iVSEm9SLnMNAsVEljP2nKQh4HZr
+        WWdA+dqjYBVNOiWLK8CJSIgrwIlIVJyEqv5kWSdAMUd2R0kSTSpmsUOgnEg3Y09JGuLhcDYuy49YHgmk
-        AVF8zOSRQNpSJH7uBA7NGK5IHCMKDNI0xORZLCiLUJXwBl/GYgKqEQdCS0iS3jJ55H9Uz6E84g0uRp6Q
+        JUXhF04Q0InjqsQx0WCQpiGW5/GgLUJXIhp8GcsJqEUcCC26orxjeRR/1M+hPRINLkeRkFrFgWkqgeuq
-        asWBcUqBm7J8wOQZ2UNDDccbXIqFgnJRiThQJS1U3qlMHgVoqoJTJi7IZeSJrFQcmKSil3zwN5NXJ4H7
+        +pXl2dUjix5ONLgSzwsqRjXiwAxpofYuw/IoQVMXnHdwQC6jSGS14sAcNb0Ug39ZXoME7uzUT2DTb3HT
-        +7UTeO2P+NpfEiPMUIPDG3wZiwmpVuThyEh+mEEVs+vzXZ9A3d2dIk2DTB4JtNufXKtU53JpIZvtEZOX
+        HxI7zdAFRzT4MpYTUqvI3ZGR0jSDLmYzGm2eRN3dnSdNgyyPBPr9j5uq1IVCWd3ne8jyToA4rHidJOM4
-        AfywZDtJi+N2ZmHGYK7IdCRSslj4NTb2d7EAIB+jb+VNyiMTWc6RQaQZcSDKLbgck3UBFIloqq+yYI1T
+        nQU4cVgs0jSMis3Cn7Gxi80CgHqMVkc0qYQs0s2WQaQTcSA0IORY1hnQJOJSfZUNa5oaVlqow0+yfItl
-        wUoblfgoireYrHwEBWF42+O5mpKffA8lP8W/iyqmEKxpiqKp5i5SR8YGBtKKLH964/XeYHL4wHMEWkA0
+        lSIhScMbHR1X0/JT7KHlp/x31sWcB1+aUrhUC400kMbAgKmp6ue3kcgNliMGniNwBcSlWmSoEUQnj2pG
-        1byF6kFU8shm5Ht3mYziwHPEKjXTtXiLKUWjUZKklCIIz5h5c8BzBDp+NNW8hWtB7BxsBEXxBTNbHvAc
+        sXeHZZQHniNoNXP1eIupRPuipCh5TZKesntnwHMEROJSLTJcD2Ll4CMhyy/ZrTvgOQLbbfT11Tcm6UAg
-        geOO9fXV1ifpQsDncKxl71wh8BxBvhHZbGtTcRxcg2UQoWSjpUXFhTDtc6WA203/9BWaagRzI+OUUz/S
+        5rCtrlfuPPAcQbFhoNJgO4QOXRCpBLZwIBzHXCXgdNM/fY1LNRKpXXHc9I809vQBk2ygzlY8rdWAhLag
-        WOMBM9PzJpBnS97WSmAEc8o4SEUhl0tF92U8AdONN56ASQhoPAHTd6hKkPjRRiKVIkNwXw3qASRzEjuE
+        4qAU6aFQBrcv+wmYTrz9BExCQPsJmL5DV4LCj2skSikqBGywucYCxZzEDqEtWlPVb4jVwiM6PuM7/IYx
-        smhDlr/AV7OP6PiM7/Abxih2+0M27X+DxfIHcqjzCOBlb7UAAAAASUVORK5CYII=
+        mt//gKddN3g8/wAwLfHib7GLOwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -160,17 +160,32 @@
   </data>
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAWOSURBVFhH3VjZU1pXGGem20OXl65/QBc79aHLc6dN20yd
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        Nlqxw2okg4lommaiUafikquyKRqMOCbtqNG82EySSYwCYlJAhAgqRqdTMVBbyUQb0Yp2eWlSQ89XjnDv
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        9QJGhIf8Zr4Z7ny/e86Pc863nMt6ZJH1jeEdoXJYfUB9w3Dw1LhTop2YKWyb/FWidXmRTQlV1lFMTR2y
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        yvueFaosDfkap6u8x/OHcmAl2DS4zmhFbTfn8WvJxweE5XG+0qJAq+SVXVl6wCSIbikTyCWG0vPUdlfd
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        pcX7TEKiGZNAXr15AW3/fDQTyC3L7BPXGjE9PgRyk+hw+9RttWGNUQSYSrcarDrv2yjt9ga+PvPjnSPI
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        jp/1BNDZXMLDhAGimcYAqzp/+2+BwtaKqfEhUJiPlXTO+pkGUxsCweJO97JYM+YQKq2nc2p0e7KqB9/Y
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        Wzr0dMZRw1OZ0qsvf1E18CEeKoxoAkPirNsXx6s15SFxd+kDqQ3rwbJz3lVRo93Iq772JqZvG9EEFne4
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        /bx6Uw6mxQacOdhW+iANukBQfNL5E69u8H1MfWjE2uKitsl5HnH9dUxlBkQrBAT9zMn6/P/ub7Tbsisu
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        P4+pOwJVIHUOtX4tmNdod3I4Fx7D9K2AVEKPVli5vAbbiETiegLTdoxNgZXf+/7KVVnnYGzyXMSlxXt8
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+        haUa06mAJAx5jvwC/EvY1kRXbhMgEMShCqTdR/S/cKhlfJY633qwoHXiFgQbfiUCqBD0JFzW41lN5MzR
+        gYQtgzj8yOLKzZ+W9XhXyHPKrtzdQDtZhykR5GvGXGQipBKR2j6A3bsCdo1RjX+GIVLbjPQzj3ZtArtD
+        gMIPtZVMKuma9e8klTws2MQP75Z2eyirCEmfLR1KxxSoGJZmeuEXa5wp60bymx0O8tzK/pWgQDGsxG4W
+        60DTqJ5MgPIFFQK7kw6hYqSjUU+NaFHzqA670T9oGRsjO1GkbbCr9B9hd9KBzubeyl4fJb0dbBl3YDeL
+        JWl1ucnO0h5vILtCHzur7yI+rx54DUXzKlkDaMJuFquw7eYc2XnkzPQdDmF5BruTDpgL5iRrAE3YjVZQ
+        O/kL2ZlqgRmE4bmvTk8vkjWg60NEYEHrJCWjo7BfzawwvordSQe0asVd7nWyhgKtawa7GYPkfg4x+Al2
+        Jx2ZKEikvb4NsoaDmjEndqM0g25mZCcUcaFypAO7kw5U/r6lNw6oikXSDOqem1QoOZIJYo0jZYkaVos8
+        dyhRmyOJmkMMvV12zrNGJh3v8vyeXWN+D1OSBq5iKL20a5Za6no8a2zUOGNKCFubhTW0zDYjdofBVPAT
+        wf6GkevQmJDnFjc7qM0CgIeWVHaZ2m6Vd3tX+DJLBqbAWdFCy4QfEwavzvwxStAB8pzQboEWTIkAGlaU
+        bjxkMtihUxO30HK/BOKg2YSmE7+SEDKkhhfRrs3ARYw8X9SGFcCXW+pqGVr+XKV1DsTB824I5BAXnkT3
+        D/uWlv/iwj2ezFqLaVsRujTZxrde1CPPiQqElQNxij4/Je+FLk228ZiXJkCOwph2uH06xvVw5wLhzMG2
+        0lcODNVeXw5hTMPU2ODUm7jQUdMHAduJwC+rB9/KbRjRQ0DQzxzYsU63nysz52J6fAhkltbK3vk/6QOB
+        MQnMkur2fFamewU+e0CTsU/anwblK1dh/Q6tmLPk7OwKPZVsWnHnzBJXYTqKh4qPWOLAmATChyL4YAQf
+        jlBXslDS6V5HYzxg2spNgzMH28qXmQR4mPiAT18ocf5W1D71czTjyS0+TA8DRDOJiGYnLi78AwGx7TOX
+        KLYrEJIw5Dm+fJiIG627iVgCFVeX/6+t4pOOCagQqWyEw4AP5hKtawqZtxB15/BBPR9dekRNN/RCpVkF
+        UYypjxpYrP8AVUyhVNNGtiwAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="dvc_in.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -182,6 +197,9 @@
   <metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>240, 17</value>
   </metadata>
+  <metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>240, 17</value>
+  </metadata>
   <metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>553, 17</value>
   </metadata>
@@ -268,4 +286,160 @@
   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>480, 17</value>
   </metadata>
+  <metadata name="dataGridViewButtonColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="orderno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bs2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>846, 17</value>
+  </metadata>
+  <metadata name="dsPurchase1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>725, 17</value>
+  </metadata>
+  <metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>917, 17</value>
+  </metadata>
+  <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripButton10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+        oAc0QjgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripButton12.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btFind2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1
+        qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO
+        b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY
+        hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1
+        9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon
+        GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButton15.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEYSURBVEhL7ZZLCsIwEIZ7MQXBE8SaXEFBMbrRW/Ri6qLd
+        +li0IC7EpUt1JD9CqGleUhA/mEVe8zElHZL8IXIhJgVjPTX0hnJQLjU0U6Tp+LxaXcrF4rjlvK+mndkw
+        1q3m8/1pubwWnEs1XQ+ktyy7U/jKIUUeozznfEobsBlRSnlw+ey0l87oeSg3OdS2N+vBoFNJudMPUNhW
+        rldqnSNE7i0FPvJgKXCRR5MCG3l0Kfh0Q1+Jn/OmteAGZKq8LoIq1bGVR5WCJvlXpITpIlF8RdwkRUSV
+        20oRUeSt/E42zcGlw1nh0pGiyV2kIFjuIwXe8hAp8JK39vQh8uFwFOOxp1f+euwJMVPL9UDuKwWQW0lB
+        Kw/6HydJHj5byGPQIkKNAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAM/SURBVFhH7ZZpSFRRFMeHiqC+9VGScR3N2XMGfVam40Km
+        SUqFiqUkOZlGgakVaBB9qMzct1yjNHIjNQktTKNExBYNiRkXTJ1BxRnHJZdcOnWfb6bGeeU4Ovnl/eEH
+        957z3pw/956579IoUaJEiRIlHe215pjaWLNPYywsCWM73KJbMt1otFPbifTWydQU2/XLVI2nvYsy2T98
+        qSo0BoqCLsIlj5Pf+LaCYd4+Bx/i0S2Qi8sOIcuhqyT48vL0jVxAlIVEgzQ6ER9/jUsGEe/QFNuC70m8
+        ob/odM4euhVHsBEYlpzYBO/gGbU5hJfAFRrF8Zp5T0wSCFmOUqKsfjp6zD/K3cN7KjY2bn4jeB3xXaoL
+        u6YxgxC7+uGm/ow5sbARorR+wpxEquycTOjp7oQfyyqDqap8CokBYi0zqSfOwURCjmY+EJcCAjvhulZw
+        m5uH9wQqUF1TAS9f1ZEW14eF72MQ5B8IDed/b6kqIVszHr6eDh78w0pLS7Y3UVsvaQwiOjpaobAoHxYW
+        FDoG1mJyQgbJKffBGROBMj4LpzXyJlSEXoGrXoEKezthv40V5zhRV29pGUQoFP2QnpEGoyN9Wgb+RV/f
+        Z0BtMjszCm4H3KEqLA58RT5gzeDO2DH23zYzs/NjMpk7iZrrko5BxOKCEh49Lob29rdacTJaWhqhvLwU
+        H6NtjhJHwr27d0AukwKXh3UTdQwWqUE1zc31UFL6EJaXxknzqG+bmupJcwijG0TIhiSQkZmO95g6hnq0
+        oDAPuqUdWs+u5r8YRNuGeisnNwt6ezpBMbbSoxOqITxH9o4aoxpcWlRCfkEuDA580cSeVZdDUXE+3qNo
+        Xvu8Etra3mjyqzGawfm5UXyV5PJurTgZja9fQENDLWnOKAanp+SQlZ2h1XNr8eH9OygrL9GJb7rBkeFe
+        SEtPhbnZEZ1iayGRfIQHedl4a6hjm2pQKvmEf0X+dqToAzr70Oqr/zxc7sYN0rCDolF0llVUPNEpaAiq
+        8cGV/pVJFhm2+7uIMoZL6OgcwOU7TYaLI+QRF6Jkm8GZkLNDDFveJN2CvTk3aBMTwW4zMyaf7CJqCObm
+        LB66/hM/T4kSJUqUKBlNNNpPVMCXEkuTmYQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>619, 17</value>
+  </metadata>
+  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAPsSURBVFhH3VhLSxtRFA60u9qf0QdtabfqRpLJzCRpSxGM
+        IJQaUbdqNXblu25c+Pob3ZcuuzHNjCJW0DwKfYObagTzcNGR6fnGE03iNZnJowY/+CAk957z5d5zzzn3
+        uq4tNLf7SdTrHdvw+T7osvzjY0dHNtraaoD4rPt83/FbVJZHMZanNRZr7e23NVl+o3u9v/VAIL3V13e8
+        Fw6bqdlZM7OwYOYWFy3iM77bGx83d0KhHMZGVPWX5vWGSXwLm6sfyOhNTVHCtFLpWE9Pdn9y0jxeXrbP
+        pSUTc2KdnRn6g2msPGyy+doQUZT764ryRe/uTh++fSsW4ICwgRUlm8k1t/seu6kOmiS9IIGZxODgichZ
+        LYz3959E2toynzye5+zOGXRJ6kWwp2ZmhA7qwYPpaRM+aCFesVt7wMph4uH8vNBwPYkth6+IJD1j9+WB
+        mMO2NnLlSnkwNWViu2nX7rIMMXCycCAaEXOVGB8eNuh0J6CB5VwEjv9mMHgkMvA/uE1piFLZKMspBpIw
+        8pytVLKyckrRbyLaHH84N2dSETiiVbyYzFEhkIRFE4tIjoxYzDR2dmyLNLa3TSOZNI9XV4W/F9JK5lRx
+        WNY5UL72KVhFk87I4vKwIxLi8rAjEhUnqqo/WdYpUMyR3VGSRJMKWegQKCfSydgzkoZIIJCJyPIjlkcC
+        aUlR+IUTBLTjuCpxTDQYpGmE5blcaIvQlYgGX8ZyAmoRB0KLrijvWR7FH/VzaI9Eg8tRJKRWcWCKSuCG
+        qn5leVb1yKCHEw2uxFJBhahGHJgmLdTepVkeJWjqgnM2DshlFImsVhyYpaaXYvAvy2uQwN3d+gls+i1u
+        +kNipRm64IgGX8ZyQmoVuTc2Vpxm0MVshULNk6h7e3OkaZjlkUCP53FTlTq/P6O73Q9Z3ikQhxWvk2Qc
+        pzMPOw4LRRqJRMVm4c/ExMVmAUA9RqsjmlREFulkyyDSjjgQGhByLOscaBJxqb7KhjVFDSst1NFnWb7F
+        sooRlaTRza6uq2n5KfbQ8lP+O+9iSsGXpiQu1UIjDWR8aMjQVDX+Lhi8wXLEwHMEroC4VIsMNYLo5FHN
+        KPbusIzywHMErWa2Hm8xlWhdlBQlp0nSU3ZvD3iOgEhcqkWG60GsHHxEZfklu3UGPEdgu+MDA/WNSToQ
+        iDlsq+OVKwWeIyg2Eqg02A6hQwdEKoEtHAjbMVcJON30T1/jUo1EalUcJ/0jjT17wCQbqLMVT2s1IKEt
+        qDgoRbrfn8bty3oCphNvPQGTENB6Aqbv0JWg8OMaiVKKCgEbbK6xQDEnsSNoi9ZV9RtiNf+Ijs/4Dr9h
+        jObxPOBp1w0u1z85pPG4SVXqnwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btRefreshIn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAWOSURBVFhH3VjZU1pXGGem20OXl65/QBc79aHLc6dN20yd
+        Nlqxw2okg4lommaiUafikquyKRqMOCbtqNG82EySSYwCYlJAhAgqRqdTMVBbyUQb0Yp2eWlSQ89XjnDv
+        9QJGhIf8Zr4Z7ny/e86Pc863nMt6ZJH1jeEdoXJYfUB9w3Dw1LhTop2YKWyb/FWidXmRTQlV1lFMTR2y
+        yvueFaosDfkap6u8x/OHcmAl2DS4zmhFbTfn8WvJxweE5XG+0qJAq+SVXVl6wCSIbikTyCWG0vPUdlfd
+        pcX7TEKiGZNAXr15AW3/fDQTyC3L7BPXGjE9PgRyk+hw+9RttWGNUQSYSrcarDrv2yjt9ga+PvPjnSPI
+        jp/1BNDZXMLDhAGimcYAqzp/+2+BwtaKqfEhUJiPlXTO+pkGUxsCweJO97JYM+YQKq2nc2p0e7KqB9/Y
+        Wzr0dMZRw1OZ0qsvf1E18CEeKoxoAkPirNsXx6s15SFxd+kDqQ3rwbJz3lVRo93Iq772JqZvG9EEFne4
+        /bx6Uw6mxQacOdhW+iANukBQfNL5E69u8H1MfWjE2uKitsl5HnH9dUxlBkQrBAT9zMn6/P/ub7Tbsisu
+        P4+pOwJVIHUOtX4tmNdod3I4Fx7D9K2AVEKPVli5vAbbiETiegLTdoxNgZXf+/7KVVnnYGzyXMSlxXt8
+        haUa06mAJAx5jvwC/EvY1kRXbhMgEMShCqTdR/S/cKhlfJY633qwoHXiFgQbfiUCqBD0JFzW41lN5MzR
+        gYQtgzj8yOLKzZ+W9XhXyHPKrtzdQDtZhykR5GvGXGQipBKR2j6A3bsCdo1RjX+GIVLbjPQzj3ZtArtD
+        gMIPtZVMKuma9e8klTws2MQP75Z2eyirCEmfLR1KxxSoGJZmeuEXa5wp60bymx0O8tzK/pWgQDGsxG4W
+        60DTqJ5MgPIFFQK7kw6hYqSjUU+NaFHzqA670T9oGRsjO1GkbbCr9B9hd9KBzubeyl4fJb0dbBl3YDeL
+        JWl1ucnO0h5vILtCHzur7yI+rx54DUXzKlkDaMJuFquw7eYc2XnkzPQdDmF5BruTDpgL5iRrAE3YjVZQ
+        O/kL2ZlqgRmE4bmvTk8vkjWg60NEYEHrJCWjo7BfzawwvordSQe0asVd7nWyhgKtawa7GYPkfg4x+Al2
+        Jx2ZKEikvb4NsoaDmjEndqM0g25mZCcUcaFypAO7kw5U/r6lNw6oikXSDOqem1QoOZIJYo0jZYkaVos8
+        dyhRmyOJmkMMvV12zrNGJh3v8vyeXWN+D1OSBq5iKL20a5Za6no8a2zUOGNKCFubhTW0zDYjdofBVPAT
+        wf6GkevQmJDnFjc7qM0CgIeWVHaZ2m6Vd3tX+DJLBqbAWdFCy4QfEwavzvwxStAB8pzQboEWTIkAGlaU
+        bjxkMtihUxO30HK/BOKg2YSmE7+SEDKkhhfRrs3ARYw8X9SGFcCXW+pqGVr+XKV1DsTB824I5BAXnkT3
+        D/uWlv/iwj2ezFqLaVsRujTZxrde1CPPiQqElQNxij4/Je+FLk228ZiXJkCOwph2uH06xvVw5wLhzMG2
+        0lcODNVeXw5hTMPU2ODUm7jQUdMHAduJwC+rB9/KbRjRQ0DQzxzYsU63nysz52J6fAhkltbK3vk/6QOB
+        MQnMkur2fFamewU+e0CTsU/anwblK1dh/Q6tmLPk7OwKPZVsWnHnzBJXYTqKh4qPWOLAmATChyL4YAQf
+        jlBXslDS6V5HYzxg2spNgzMH28qXmQR4mPiAT18ocf5W1D71czTjyS0+TA8DRDOJiGYnLi78AwGx7TOX
+        KLYrEJIw5Dm+fJiIG627iVgCFVeX/6+t4pOOCagQqWyEw4AP5hKtawqZtxB15/BBPR9dekRNN/RCpVkF
+        UYypjxpYrP8AVUyhVNNGtiwAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="dsPurchase1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>725, 17</value>
+  </metadata>
 </root>