diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index d055dd1..fd494d9 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.04.24.1000")] -[assembly: AssemblyFileVersion("23.04.24.1000")] +[assembly: AssemblyVersion("23.04.24.1350")] +[assembly: AssemblyFileVersion("23.04.24.1350")] diff --git a/SubProject/FEQ0000/Purchase/fMailForm.cs b/SubProject/FEQ0000/Purchase/fMailForm.cs index 8e16643..56d263d 100644 --- a/SubProject/FEQ0000/Purchase/fMailForm.cs +++ b/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"; diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs index 4e5b432..aebc464 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs +++ b/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(); diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs index a55f268..59081c2 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs +++ b/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); diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs index 9fc821d..ca1217f 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs +++ b/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; diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx index 4490b08..6166a53 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx @@ -159,6 +159,12 @@ False + + False + + + False + False @@ -171,10 +177,4 @@ False - - False - - - False - \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs index 0cbca24..f28a0d5 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs +++ b/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(); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.Designer.cs index 19074ee..451e240 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.Designer.cs +++ b/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); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs index 70b2d20..dfc74ea 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs +++ b/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; diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.resx index 55190d0..21a6fc4 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.resx @@ -168,13 +168,13 @@ False - + False False - + False \ No newline at end of file diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 80abede..848ee1b 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -440,6 +440,10 @@ namespace FEQ0000 { private global::System.Data.DataColumn columninremark; + private global::System.Data.DataColumn columnwinuid; + + private global::System.Data.DataColumn columnwindate; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public PurchaseDataTable() : @@ -794,6 +798,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn winuidColumn { + get { + return this.columnwinuid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn windateColumn { + get { + return this.columnwindate; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -869,7 +889,9 @@ namespace FEQ0000 { int inqty, string bigo2, decimal pumpriceD, - string inremark) { + string inremark, + string winuid, + System.DateTime windate) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -910,7 +932,9 @@ namespace FEQ0000 { inqty, bigo2, pumpriceD, - inremark}; + inremark, + winuid, + windate}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -955,7 +979,9 @@ namespace FEQ0000 { string place, int inqty, decimal pumpriceD, - string inremark) { + string inremark, + string winuid, + System.DateTime windate) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -996,7 +1022,9 @@ namespace FEQ0000 { inqty, null, pumpriceD, - inremark}; + inremark, + winuid, + windate}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -1065,6 +1093,8 @@ namespace FEQ0000 { this.columnbigo2 = base.Columns["bigo2"]; this.columnpumpriceD = base.Columns["pumpriceD"]; this.columninremark = base.Columns["inremark"]; + this.columnwinuid = base.Columns["winuid"]; + this.columnwindate = base.Columns["windate"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1148,6 +1178,10 @@ namespace FEQ0000 { base.Columns.Add(this.columnpumpriceD); this.columninremark = new global::System.Data.DataColumn("inremark", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columninremark); + this.columnwinuid = new global::System.Data.DataColumn("winuid", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwinuid); + this.columnwindate = new global::System.Data.DataColumn("windate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwindate); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1188,6 +1222,7 @@ namespace FEQ0000 { this.columnplace.MaxLength = 20; this.columnbigo2.ReadOnly = true; this.columninremark.MaxLength = 500; + this.columnwinuid.MaxLength = 20; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1405,6 +1440,10 @@ namespace FEQ0000 { private global::System.Data.DataColumn columninremark; + private global::System.Data.DataColumn columnwinuid; + + private global::System.Data.DataColumn columnwindate; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EETGW_PurchaseCRDataTable() : @@ -1759,6 +1798,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn winuidColumn { + get { + return this.columnwinuid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn windateColumn { + get { + return this.columnwindate; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1834,7 +1889,9 @@ namespace FEQ0000 { int inqty, string bigo2, decimal pumpriceD, - string inremark) { + string inremark, + string winuid, + System.DateTime windate) { EETGW_PurchaseCRRow rowEETGW_PurchaseCRRow = ((EETGW_PurchaseCRRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1875,7 +1932,9 @@ namespace FEQ0000 { inqty, bigo2, pumpriceD, - inremark}; + inremark, + winuid, + windate}; rowEETGW_PurchaseCRRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_PurchaseCRRow); return rowEETGW_PurchaseCRRow; @@ -1920,7 +1979,9 @@ namespace FEQ0000 { string place, int inqty, decimal pumpriceD, - string inremark) { + string inremark, + string winuid, + System.DateTime windate) { EETGW_PurchaseCRRow rowEETGW_PurchaseCRRow = ((EETGW_PurchaseCRRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1961,7 +2022,9 @@ namespace FEQ0000 { inqty, null, pumpriceD, - inremark}; + inremark, + winuid, + windate}; rowEETGW_PurchaseCRRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_PurchaseCRRow); return rowEETGW_PurchaseCRRow; @@ -2030,6 +2093,8 @@ namespace FEQ0000 { this.columnbigo2 = base.Columns["bigo2"]; this.columnpumpriceD = base.Columns["pumpriceD"]; this.columninremark = base.Columns["inremark"]; + this.columnwinuid = base.Columns["winuid"]; + this.columnwindate = base.Columns["windate"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2113,6 +2178,10 @@ namespace FEQ0000 { base.Columns.Add(this.columnpumpriceD); this.columninremark = new global::System.Data.DataColumn("inremark", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columninremark); + this.columnwinuid = new global::System.Data.DataColumn("winuid", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwinuid); + this.columnwindate = new global::System.Data.DataColumn("windate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwindate); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -2153,6 +2222,7 @@ namespace FEQ0000 { this.columnplace.MaxLength = 20; this.columnbigo2.ReadOnly = true; this.columninremark.MaxLength = 500; + this.columnwinuid.MaxLength = 20; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2322,6 +2392,18 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnrequest; + private global::System.Data.DataColumn columnindate; + + private global::System.Data.DataColumn columninqty; + + private global::System.Data.DataColumn columnreceive; + + private global::System.Data.DataColumn columnsc; + + private global::System.Data.DataColumn columnpo; + + private global::System.Data.DataColumn columnorderno; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public IpkolistDataTable() { @@ -2475,6 +2557,54 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn indateColumn { + get { + return this.columnindate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn inqtyColumn { + get { + return this.columninqty; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn receiveColumn { + get { + return this.columnreceive; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn scColumn { + get { + return this.columnsc; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn poColumn { + get { + return this.columnpo; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ordernoColumn { + get { + return this.columnorderno; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2512,7 +2642,28 @@ namespace FEQ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public IpkolistRow AddIpkolistRow(string source, int idx, string pdate, string state, string sid, string pumname, string pumscale, int pumqty, decimal pumprice, decimal pumamt, string supply, string project, string bigo, System.DateTime wdate, string request) { + public IpkolistRow AddIpkolistRow( + string source, + int idx, + string pdate, + string state, + string sid, + string pumname, + string pumscale, + int pumqty, + decimal pumprice, + decimal pumamt, + string supply, + string project, + string bigo, + System.DateTime wdate, + string request, + string indate, + int inqty, + string receive, + string sc, + string po, + string orderno) { IpkolistRow rowIpkolistRow = ((IpkolistRow)(this.NewRow())); object[] columnValuesArray = new object[] { source, @@ -2529,7 +2680,13 @@ namespace FEQ0000 { project, bigo, wdate, - request}; + request, + indate, + inqty, + receive, + sc, + po, + orderno}; rowIpkolistRow.ItemArray = columnValuesArray; this.Rows.Add(rowIpkolistRow); return rowIpkolistRow; @@ -2575,6 +2732,12 @@ namespace FEQ0000 { this.columnbigo = base.Columns["bigo"]; this.columnwdate = base.Columns["wdate"]; this.columnrequest = base.Columns["request"]; + this.columnindate = base.Columns["indate"]; + this.columninqty = base.Columns["inqty"]; + this.columnreceive = base.Columns["receive"]; + this.columnsc = base.Columns["sc"]; + this.columnpo = base.Columns["po"]; + this.columnorderno = base.Columns["orderno"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2610,6 +2773,18 @@ namespace FEQ0000 { base.Columns.Add(this.columnwdate); this.columnrequest = new global::System.Data.DataColumn("request", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnrequest); + this.columnindate = new global::System.Data.DataColumn("indate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnindate); + this.columninqty = new global::System.Data.DataColumn("inqty", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columninqty); + this.columnreceive = new global::System.Data.DataColumn("receive", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnreceive); + this.columnsc = new global::System.Data.DataColumn("sc", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsc); + this.columnpo = new global::System.Data.DataColumn("po", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpo); + this.columnorderno = new global::System.Data.DataColumn("orderno", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnorderno); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnsource, this.columnidx}, true)); @@ -2637,6 +2812,17 @@ namespace FEQ0000 { this.columnwdate.ReadOnly = true; this.columnrequest.ReadOnly = true; this.columnrequest.MaxLength = 200; + this.columnindate.ReadOnly = true; + this.columnindate.MaxLength = 10; + this.columninqty.ReadOnly = true; + this.columnreceive.ReadOnly = true; + this.columnreceive.MaxLength = 200; + this.columnsc.ReadOnly = true; + this.columnsc.MaxLength = 30; + this.columnpo.ReadOnly = true; + this.columnpo.MaxLength = 50; + this.columnorderno.ReadOnly = true; + this.columnorderno.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3381,6 +3567,38 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string winuid { + get { + try { + return ((string)(this[this.tablePurchase.winuidColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Purchase\' 테이블의 \'winuid\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablePurchase.winuidColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public System.DateTime windate { + get { + try { + return ((global::System.DateTime)(this[this.tablePurchase.windateColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Purchase\' 테이블의 \'windate\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablePurchase.windateColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -3800,6 +4018,30 @@ namespace FEQ0000 { public void SetinremarkNull() { this[this.tablePurchase.inremarkColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswinuidNull() { + return this.IsNull(this.tablePurchase.winuidColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwinuidNull() { + this[this.tablePurchase.winuidColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswindateNull() { + return this.IsNull(this.tablePurchase.windateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwindateNull() { + this[this.tablePurchase.windateColumn] = global::System.Convert.DBNull; + } } /// @@ -4420,6 +4662,38 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string winuid { + get { + try { + return ((string)(this[this.tableEETGW_PurchaseCR.winuidColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_PurchaseCR\' 테이블의 \'winuid\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_PurchaseCR.winuidColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public System.DateTime windate { + get { + try { + return ((global::System.DateTime)(this[this.tableEETGW_PurchaseCR.windateColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_PurchaseCR\' 테이블의 \'windate\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_PurchaseCR.windateColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -4839,6 +5113,30 @@ namespace FEQ0000 { public void SetinremarkNull() { this[this.tableEETGW_PurchaseCR.inremarkColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswinuidNull() { + return this.IsNull(this.tableEETGW_PurchaseCR.winuidColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwinuidNull() { + this[this.tableEETGW_PurchaseCR.winuidColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswindateNull() { + return this.IsNull(this.tableEETGW_PurchaseCR.windateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwindateNull() { + this[this.tableEETGW_PurchaseCR.windateColumn] = global::System.Convert.DBNull; + } } /// @@ -5085,6 +5383,102 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string indate { + get { + try { + return ((string)(this[this.tableIpkolist.indateColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Ipkolist\' 테이블의 \'indate\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableIpkolist.indateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int inqty { + get { + try { + return ((int)(this[this.tableIpkolist.inqtyColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Ipkolist\' 테이블의 \'inqty\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableIpkolist.inqtyColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string receive { + get { + try { + return ((string)(this[this.tableIpkolist.receiveColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Ipkolist\' 테이블의 \'receive\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableIpkolist.receiveColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string sc { + get { + if (this.IsscNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableIpkolist.scColumn])); + } + } + set { + this[this.tableIpkolist.scColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string po { + get { + if (this.IspoNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableIpkolist.poColumn])); + } + } + set { + this[this.tableIpkolist.poColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string orderno { + get { + if (this.IsordernoNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableIpkolist.ordernoColumn])); + } + } + set { + this[this.tableIpkolist.ordernoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -5240,6 +5634,78 @@ namespace FEQ0000 { public void SetrequestNull() { this[this.tableIpkolist.requestColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsindateNull() { + return this.IsNull(this.tableIpkolist.indateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetindateNull() { + this[this.tableIpkolist.indateColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsinqtyNull() { + return this.IsNull(this.tableIpkolist.inqtyColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetinqtyNull() { + this[this.tableIpkolist.inqtyColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsreceiveNull() { + return this.IsNull(this.tableIpkolist.receiveColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetreceiveNull() { + this[this.tableIpkolist.receiveColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsscNull() { + return this.IsNull(this.tableIpkolist.scColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetscNull() { + this[this.tableIpkolist.scColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IspoNull() { + return this.IsNull(this.tableIpkolist.poColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetpoNull() { + this[this.tableIpkolist.poColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsordernoNull() { + return this.IsNull(this.tableIpkolist.ordernoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetordernoNull() { + this[this.tableIpkolist.ordernoColumn] = global::System.Convert.DBNull; + } } /// @@ -5507,6 +5973,8 @@ namespace FEQ0000.dsPurchaseTableAdapters { tableMapping.ColumnMappings.Add("inqty", "inqty"); tableMapping.ColumnMappings.Add("pumpriceD", "pumpriceD"); tableMapping.ColumnMappings.Add("inremark", "inremark"); + tableMapping.ColumnMappings.Add("winuid", "winuid"); + tableMapping.ColumnMappings.Add("windate", "windate"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -5543,7 +6011,9 @@ namespace FEQ0000.dsPurchaseTableAdapters { "lace)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqt" + "y)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Orig" + "inal_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremar" + - "k] = @Original_inremark)))"; + "k] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([wi" + + "nuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR (" + + "[windate] = @Original_windate)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -5611,10 +6081,14 @@ namespace FEQ0000.dsPurchaseTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumpriceD", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 2, "pumpriceD", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_inremark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_inremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_winuid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_winuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_windate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_windate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.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); -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"; + this._adapter.InsertCommand.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, winuid, windate FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -5651,6 +6125,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inqty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inqty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumpriceD", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 2, "pumpriceD", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@winuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@windate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [" + @@ -5661,46 +6137,49 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN "e] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wd" + "ate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] " + "= @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place]" + - " = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark WH" + - "ERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([p" + - "date] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([stat" + - "e] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([pro" + - "cess] = @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] = @Ori" + - "ginal_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Or" + - "iginal_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscal" + - "e] = @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 NUL" + - "L) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] I" + - "S NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] " + - "IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supp" + - "lyidx] 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 ((@IsN" + - "ull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull" + - "_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNul" + - "l_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 ([manu" + - "proc] = @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_inq" + - "ty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpri" + - "ceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@" + - "IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)" + - "));\r\nSELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS rec" + - "eiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pu" + - "mscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectid" + - "x, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, man" + - "uproc, orderno, gcode, place, inqty, pumpriceD, inremark FROM Purchase WHERE (id" + - "x = @idx) ORDER BY pdate DESC, idx DESC"; + " = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [" + + "winuid] = @winuid, [windate] = @windate WHERE (([idx] = @Original_idx) AND ((@Is" + + "Null_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNul" + + "l_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_p" + + "rocess = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsN" + + "ull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND (" + + "(@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_reques" + + "t = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_s" + + "id = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 " + + "AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscal" + + "e = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNul" + + "l_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_pumam" + + "t)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supp" + + "ly)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Ori" + + "ginal_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([pr" + + "ojectidx] = @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 ((@IsN" + + "ull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@Is" + + "Null_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@I" + + "sNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNu" + + "ll_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manu" + + "proc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@Is" + + "Null_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND " + + "([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([pl" + + "ace] = @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 [wind" + + "ate] IS NULL) OR ([windate] = @Original_windate)));\r\nSELECT idx, pdate, state, p" + + "rocess, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUs" + + "erName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumpric" + + "e, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dep" + + "t, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, in" + + "qty, pumpriceD, inremark, winuid, windate FROM Purchase WHERE (idx = @idx) ORDER" + + " BY pdate DESC, idx DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -5737,6 +6216,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inqty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inqty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumpriceD", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 2, "pumpriceD", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@winuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@windate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -5803,6 +6284,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumpriceD", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 2, "pumpriceD", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_inremark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_inremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_winuid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_winuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_windate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_windate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -5820,8 +6305,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].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 + 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 (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; @@ -5847,23 +6332,19 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].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) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received')) -ORDER BY pdate DESC, idx DESC"; + this._commandCollection[3].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"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].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)"; + this._commandCollection[4].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)"; this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].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"; + this._commandCollection[5].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"; this._commandCollection[5].CommandType = global::System.Data.CommandType.Text; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6120,7 +6601,9 @@ ORDER BY pdate DESC, idx DESC"; string Original_place, global::System.Nullable Original_inqty, global::System.Nullable Original_pumpriceD, - string Original_inremark) { + string Original_inremark, + string Original_winuid, + global::System.Nullable Original_windate) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_pdate == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -6383,6 +6866,22 @@ ORDER BY pdate DESC, idx DESC"; this.Adapter.DeleteCommand.Parameters[64].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[65].Value = ((string)(Original_inremark)); } + if ((Original_winuid == null)) { + this.Adapter.DeleteCommand.Parameters[66].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[67].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[67].Value = ((string)(Original_winuid)); + } + if ((Original_windate.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[69].Value = ((System.DateTime)(Original_windate.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[68].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[69].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -6438,7 +6937,9 @@ ORDER BY pdate DESC, idx DESC"; string place, global::System.Nullable inqty, global::System.Nullable pumpriceD, - string inremark) { + string inremark, + string winuid, + global::System.Nullable windate) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -6644,6 +7145,18 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.InsertCommand.Parameters[34].Value = ((string)(inremark)); } + if ((winuid == null)) { + this.Adapter.InsertCommand.Parameters[35].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[35].Value = ((string)(winuid)); + } + if ((windate.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[36].Value = ((System.DateTime)(windate.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[36].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -6700,6 +7213,8 @@ ORDER BY pdate DESC, idx DESC"; global::System.Nullable inqty, global::System.Nullable pumpriceD, string inremark, + string winuid, + global::System.Nullable windate, int Original_idx, string Original_pdate, string Original_state, @@ -6735,6 +7250,8 @@ ORDER BY pdate DESC, idx DESC"; global::System.Nullable Original_inqty, global::System.Nullable Original_pumpriceD, string Original_inremark, + string Original_winuid, + global::System.Nullable Original_windate, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -6941,269 +7458,297 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(inremark)); } - this.Adapter.UpdateCommand.Parameters[35].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + if ((winuid == null)) { + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(winuid)); } - if ((Original_state == null)) { + if ((windate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[36].Value = ((System.DateTime)(windate.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[37].Value = ((int)(Original_idx)); + if ((Original_pdate == null)) { this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_state)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_pdate)); } - if ((Original_process == null)) { + if ((Original_state == null)) { this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_state)); } - if ((Original_receive == null)) { + if ((Original_process == null)) { this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_receive)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_process)); } - if ((Original_sc == null)) { + if ((Original_receive == null)) { this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_sc)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_receive)); } - if ((Original_request == null)) { + if ((Original_sc == null)) { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_sc)); } - if ((Original_sid == null)) { + if ((Original_request == null)) { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_request)); } - if ((Original_pumname == null)) { + if ((Original_sid == null)) { this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_pumname)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_sid)); } - if ((Original_pumscale == null)) { + if ((Original_pumname == null)) { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_pumscale)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_pumname)); } - if ((Original_pumunit == null)) { + if ((Original_pumscale == null)) { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_pumunit)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_pumscale)); } - if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_pumqty.Value)); - } - else { + if ((Original_pumunit == null)) { this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } - if ((Original_pumprice.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_pumunit)); + } + if ((Original_pumqty.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((decimal)(Original_pumprice.Value)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(Original_pumqty.Value)); } else { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } - if ((Original_pumamt.HasValue == true)) { + if ((Original_pumprice.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((decimal)(Original_pumamt.Value)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((decimal)(Original_pumprice.Value)); } else { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } - if ((Original_supply == null)) { + if ((Original_pumamt.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((decimal)(Original_pumamt.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_supply)); - } - if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((int)(Original_supplyidx.Value)); - } - else { + if ((Original_supply == null)) { this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; } - if ((Original_projectidx.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_supply)); + } + if ((Original_supplyidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_projectidx.Value)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_supplyidx.Value)); } else { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } - if ((Original_asset == null)) { + if ((Original_projectidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((int)(Original_projectidx.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_asset)); - } - if ((Original_edate == null)) { + if ((Original_asset == null)) { this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_asset)); } - if ((Original_indate == null)) { + if ((Original_edate == null)) { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_indate)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_edate)); } - if ((Original_po == null)) { + if ((Original_indate == null)) { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((string)(Original_po)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((string)(Original_indate)); } - if ((Original_dept == null)) { + if ((Original_po == null)) { this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_po)); + } + if ((Original_dept == null)) { + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_dept)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[79].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((System.DateTime)(Original_wdate)); if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((bool)(Original_import.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; - } - if ((Original_pumidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((int)(Original_pumidx.Value)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((bool)(Original_import.Value)); } else { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; } - if ((Original_isdel.HasValue == true)) { + if ((Original_pumidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[85].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((int)(Original_pumidx.Value)); } else { this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; } - if ((Original_bigo == null)) { + if ((Original_isdel.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((bool)(Original_isdel.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[87].Value = ((string)(Original_bigo)); - } - if ((Original_manuproc == null)) { + if ((Original_bigo == null)) { this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[89].Value = ((string)(Original_manuproc)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((string)(Original_bigo)); } - if ((Original_orderno == null)) { + if ((Original_manuproc == null)) { this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[91].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[91].Value = ((string)(Original_orderno)); + this.Adapter.UpdateCommand.Parameters[91].Value = ((string)(Original_manuproc)); + } + if ((Original_orderno == null)) { + this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[93].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[93].Value = ((string)(Original_orderno)); } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[92].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[94].Value = ((string)(Original_gcode)); } if ((Original_place == null)) { - this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[94].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[94].Value = ((string)(Original_place)); - } - if ((Original_inqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[95].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[96].Value = ((int)(Original_inqty.Value)); - } - else { this.Adapter.UpdateCommand.Parameters[95].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[96].Value = global::System.DBNull.Value; } - if ((Original_pumpriceD.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[95].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[96].Value = ((string)(Original_place)); + } + if ((Original_inqty.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[98].Value = ((decimal)(Original_pumpriceD.Value)); + this.Adapter.UpdateCommand.Parameters[98].Value = ((int)(Original_inqty.Value)); } else { this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[98].Value = global::System.DBNull.Value; } - if ((Original_inremark == null)) { + if ((Original_pumpriceD.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[100].Value = ((decimal)(Original_pumpriceD.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[100].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[100].Value = ((string)(Original_inremark)); + if ((Original_inremark == null)) { + this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[102].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[101].Value = ((int)(idx)); + else { + this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[102].Value = ((string)(Original_inremark)); + } + if ((Original_winuid == null)) { + this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[104].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[104].Value = ((string)(Original_winuid)); + } + if ((Original_windate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[106].Value = ((System.DateTime)(Original_windate.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[106].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[107].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -7260,6 +7805,8 @@ ORDER BY pdate DESC, idx DESC"; global::System.Nullable inqty, global::System.Nullable pumpriceD, string inremark, + string winuid, + global::System.Nullable windate, int Original_idx, string Original_pdate, string Original_state, @@ -7294,8 +7841,10 @@ ORDER BY pdate DESC, idx DESC"; string Original_place, global::System.Nullable Original_inqty, global::System.Nullable Original_pumpriceD, - string Original_inremark) { - return this.Update(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, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_idx); + string Original_inremark, + string Original_winuid, + global::System.Nullable Original_windate) { + return this.Update(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, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_winuid, Original_windate, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7556,6 +8105,8 @@ ORDER BY pdate DESC, idx DESC"; tableMapping.ColumnMappings.Add("inqty", "inqty"); tableMapping.ColumnMappings.Add("pumpriceD", "pumpriceD"); tableMapping.ColumnMappings.Add("inremark", "inremark"); + tableMapping.ColumnMappings.Add("winuid", "winuid"); + tableMapping.ColumnMappings.Add("windate", "windate"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -7592,7 +8143,9 @@ ORDER BY pdate DESC, idx DESC"; "iginal_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Origi" + "nal_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)))"; + "[inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL)" + + " OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NU" + + "LL) OR ([windate] = @Original_windate)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -7660,10 +8213,14 @@ ORDER BY pdate DESC, idx DESC"; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumpriceD", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 2, "pumpriceD", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_inremark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_inremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_winuid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_winuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_windate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_windate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.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); -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"; + this._adapter.InsertCommand.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, winuid, windate FROM EETGW_PurchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7700,6 +8257,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inqty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inqty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumpriceD", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 2, "pumpriceD", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@winuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@windate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE [EETGW_PurchaseCR] SET [pdate] = @pdate, [state] = @state, [process] = @pr" + @@ -7711,45 +8270,48 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN "uid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel," + " [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode," + " [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inr" + - "emark WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL" + - ") OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) O" + - "R ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) " + - "OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS N" + - "ULL) 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 ([pumnam" + - "e] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR (" + - "[pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NUL" + - "L) 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 [p" + - "umamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [" + - "supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 A" + - "ND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_pr" + - "ojectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx))" + - " AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AN" + - "D ((@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_wu" + - "id) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NUL" + - "L) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NU" + - "LL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NUL" + - "L) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR" + - " ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) O" + - "R ([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 ((@Is" + - "Null_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNul" + - "l_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD))" + - " AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_i" + - "nremark)));\r\nSELECT idx, pdate, state, process, receive, dbo.getUserName(receive" + - ") AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pum" + - "name, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, p" + - "rojectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, b" + - "igo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark FROM EETGW_Purc" + - "haseCR WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC"; + "emark, [winuid] = @winuid, [windate] = @windate WHERE (([idx] = @Original_idx) A" + + "ND ((@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)) AN" + + "D ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive" + + ")) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNul" + + "l_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@" + + "IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumn" + + "ame = 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] = @Origin" + + "al_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Origi" + + "nal_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] I" + + "S NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS N" + + "ULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NU" + + "LL) 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) AN" + + "D ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) A" + + "ND ((@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 ((@IsN" + + "ull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) A" + + "ND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_ordern" + + "o)) 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 NUL" + + "L) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inrem" + + "ark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND" + + " [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 A" + + "ND [windate] IS NULL) OR ([windate] = @Original_windate)));\r\nSELECT idx, pdate, " + + "state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, d" + + "bo.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, p" + + "lace, inqty, pumpriceD, inremark, winuid, windate FROM EETGW_PurchaseCR WHERE (i" + + "dx = @idx) ORDER BY pdate DESC, idx DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7786,6 +8348,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inqty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inqty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumpriceD", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 2, "pumpriceD", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@winuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@windate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -7852,6 +8416,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumpriceD", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 2, "pumpriceD", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_inremark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_inremark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inremark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_winuid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_winuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "winuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_windate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_windate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "windate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -7869,8 +8437,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].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 + 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 (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; @@ -7896,17 +8464,14 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].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 -FROM EETGW_PurchaseCR -WHERE idx = @idx"; + this._commandCollection[3].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)"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; this._commandCollection[4].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"; @@ -8106,7 +8671,9 @@ ORDER BY pdate DESC, idx DESC"; string Original_place, global::System.Nullable Original_inqty, global::System.Nullable Original_pumpriceD, - string Original_inremark) { + string Original_inremark, + string Original_winuid, + global::System.Nullable Original_windate) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_pdate == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -8369,6 +8936,22 @@ ORDER BY pdate DESC, idx DESC"; this.Adapter.DeleteCommand.Parameters[64].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[65].Value = ((string)(Original_inremark)); } + if ((Original_winuid == null)) { + this.Adapter.DeleteCommand.Parameters[66].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[67].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[67].Value = ((string)(Original_winuid)); + } + if ((Original_windate.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[69].Value = ((System.DateTime)(Original_windate.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[68].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[69].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -8424,7 +9007,9 @@ ORDER BY pdate DESC, idx DESC"; string place, global::System.Nullable inqty, global::System.Nullable pumpriceD, - string inremark) { + string inremark, + string winuid, + global::System.Nullable windate) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -8630,6 +9215,18 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.InsertCommand.Parameters[34].Value = ((string)(inremark)); } + if ((winuid == null)) { + this.Adapter.InsertCommand.Parameters[35].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[35].Value = ((string)(winuid)); + } + if ((windate.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[36].Value = ((System.DateTime)(windate.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[36].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -8686,6 +9283,8 @@ ORDER BY pdate DESC, idx DESC"; global::System.Nullable inqty, global::System.Nullable pumpriceD, string inremark, + string winuid, + global::System.Nullable windate, int Original_idx, string Original_pdate, string Original_state, @@ -8721,6 +9320,8 @@ ORDER BY pdate DESC, idx DESC"; global::System.Nullable Original_inqty, global::System.Nullable Original_pumpriceD, string Original_inremark, + string Original_winuid, + global::System.Nullable Original_windate, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -8927,269 +9528,297 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(inremark)); } - this.Adapter.UpdateCommand.Parameters[35].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + if ((winuid == null)) { + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(winuid)); } - if ((Original_state == null)) { + if ((windate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[36].Value = ((System.DateTime)(windate.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[37].Value = ((int)(Original_idx)); + if ((Original_pdate == null)) { this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_state)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_pdate)); } - if ((Original_process == null)) { + if ((Original_state == null)) { this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_state)); } - if ((Original_receive == null)) { + if ((Original_process == null)) { this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_receive)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_process)); } - if ((Original_sc == null)) { + if ((Original_receive == null)) { this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_sc)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_receive)); } - if ((Original_request == null)) { + if ((Original_sc == null)) { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_sc)); } - if ((Original_sid == null)) { + if ((Original_request == null)) { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_request)); } - if ((Original_pumname == null)) { + if ((Original_sid == null)) { this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_pumname)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_sid)); } - if ((Original_pumscale == null)) { + if ((Original_pumname == null)) { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_pumscale)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_pumname)); } - if ((Original_pumunit == null)) { + if ((Original_pumscale == null)) { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_pumunit)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_pumscale)); } - if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_pumqty.Value)); - } - else { + if ((Original_pumunit == null)) { this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } - if ((Original_pumprice.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_pumunit)); + } + if ((Original_pumqty.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((decimal)(Original_pumprice.Value)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(Original_pumqty.Value)); } else { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } - if ((Original_pumamt.HasValue == true)) { + if ((Original_pumprice.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((decimal)(Original_pumamt.Value)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((decimal)(Original_pumprice.Value)); } else { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } - if ((Original_supply == null)) { + if ((Original_pumamt.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((decimal)(Original_pumamt.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_supply)); - } - if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((int)(Original_supplyidx.Value)); - } - else { + if ((Original_supply == null)) { this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; } - if ((Original_projectidx.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_supply)); + } + if ((Original_supplyidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_projectidx.Value)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_supplyidx.Value)); } else { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } - if ((Original_asset == null)) { + if ((Original_projectidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((int)(Original_projectidx.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_asset)); - } - if ((Original_edate == null)) { + if ((Original_asset == null)) { this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_asset)); } - if ((Original_indate == null)) { + if ((Original_edate == null)) { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_indate)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_edate)); } - if ((Original_po == null)) { + if ((Original_indate == null)) { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((string)(Original_po)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((string)(Original_indate)); } - if ((Original_dept == null)) { + if ((Original_po == null)) { this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_po)); + } + if ((Original_dept == null)) { + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_dept)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[79].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((System.DateTime)(Original_wdate)); if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((bool)(Original_import.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; - } - if ((Original_pumidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((int)(Original_pumidx.Value)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((bool)(Original_import.Value)); } else { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; } - if ((Original_isdel.HasValue == true)) { + if ((Original_pumidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[85].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((int)(Original_pumidx.Value)); } else { this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; } - if ((Original_bigo == null)) { + if ((Original_isdel.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((bool)(Original_isdel.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[87].Value = ((string)(Original_bigo)); - } - if ((Original_manuproc == null)) { + if ((Original_bigo == null)) { this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[89].Value = ((string)(Original_manuproc)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((string)(Original_bigo)); } - if ((Original_orderno == null)) { + if ((Original_manuproc == null)) { this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[91].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[91].Value = ((string)(Original_orderno)); + this.Adapter.UpdateCommand.Parameters[91].Value = ((string)(Original_manuproc)); + } + if ((Original_orderno == null)) { + this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[93].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[93].Value = ((string)(Original_orderno)); } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[92].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[94].Value = ((string)(Original_gcode)); } if ((Original_place == null)) { - this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[94].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[94].Value = ((string)(Original_place)); - } - if ((Original_inqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[95].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[96].Value = ((int)(Original_inqty.Value)); - } - else { this.Adapter.UpdateCommand.Parameters[95].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[96].Value = global::System.DBNull.Value; } - if ((Original_pumpriceD.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[95].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[96].Value = ((string)(Original_place)); + } + if ((Original_inqty.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[98].Value = ((decimal)(Original_pumpriceD.Value)); + this.Adapter.UpdateCommand.Parameters[98].Value = ((int)(Original_inqty.Value)); } else { this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[98].Value = global::System.DBNull.Value; } - if ((Original_inremark == null)) { + if ((Original_pumpriceD.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[100].Value = ((decimal)(Original_pumpriceD.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[100].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[100].Value = ((string)(Original_inremark)); + if ((Original_inremark == null)) { + this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[102].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[101].Value = ((int)(idx)); + else { + this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[102].Value = ((string)(Original_inremark)); + } + if ((Original_winuid == null)) { + this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[104].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[104].Value = ((string)(Original_winuid)); + } + if ((Original_windate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[106].Value = ((System.DateTime)(Original_windate.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[106].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[107].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -9246,6 +9875,8 @@ ORDER BY pdate DESC, idx DESC"; global::System.Nullable inqty, global::System.Nullable pumpriceD, string inremark, + string winuid, + global::System.Nullable windate, int Original_idx, string Original_pdate, string Original_state, @@ -9280,8 +9911,10 @@ ORDER BY pdate DESC, idx DESC"; string Original_place, global::System.Nullable Original_inqty, global::System.Nullable Original_pumpriceD, - string Original_inremark) { - return this.Update(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, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_idx); + string Original_inremark, + string Original_winuid, + global::System.Nullable Original_windate) { + return this.Update(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, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_winuid, Original_windate, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9519,6 +10152,12 @@ ORDER BY pdate DESC, idx DESC"; tableMapping.ColumnMappings.Add("bigo", "bigo"); tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("request", "request"); + tableMapping.ColumnMappings.Add("indate", "indate"); + tableMapping.ColumnMappings.Add("inqty", "inqty"); + tableMapping.ColumnMappings.Add("receive", "receive"); + tableMapping.ColumnMappings.Add("sc", "sc"); + tableMapping.ColumnMappings.Add("po", "po"); + tableMapping.ColumnMappings.Add("orderno", "orderno"); this._adapter.TableMappings.Add(tableMapping); } @@ -9532,26 +10171,44 @@ ORDER BY pdate DESC, idx DESC"; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request + this._commandCollection[0].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 >= @pdate) AND (ISNULL(isdel, 0) = 0) +WHERE (state IN ('PO', 'PR')) AND (pdate >= @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 >= @pdate) AND (ISNULL(isdel, 0) = 0) +WHERE (state IN ('PO', 'PR')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY state, wdate DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = @"SELECT '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"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsPurchase.IpkolistDataTable dataTable, string pdate) { + public virtual int Fill(dsPurchase.IpkolistDataTable dataTable, string pdate, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((pdate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -9559,6 +10216,12 @@ ORDER BY state, wdate DESC"; else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -9570,7 +10233,7 @@ ORDER BY state, wdate DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsPurchase.IpkolistDataTable GetData(string pdate) { + public virtual dsPurchase.IpkolistDataTable GetData(string pdate, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((pdate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -9578,6 +10241,60 @@ ORDER BY state, wdate DESC"; else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } + dsPurchase.IpkolistDataTable dataTable = new dsPurchase.IpkolistDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByTodayIn(dsPurchase.IpkolistDataTable dataTable, string pdate, string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((pdate == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); + } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsPurchase.IpkolistDataTable GetByTodayIn(string pdate, string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((pdate == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); + } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } dsPurchase.IpkolistDataTable dataTable = new dsPurchase.IpkolistDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index da2cd28..25d3d49 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -12,7 +12,7 @@ - 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))) + 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))) @@ -80,13 +80,17 @@ + + + + - 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); -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 + 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, winuid, windate FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC @@ -123,14 +127,16 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + 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 + 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 (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -141,8 +147,8 @@ ORDER BY pdate DESC, idx DESC - 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))); -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 + 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, winuid, windate FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC @@ -179,6 +185,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -245,6 +253,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + + + @@ -290,6 +302,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -329,11 +343,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - 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) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received')) -ORDER BY pdate DESC, idx DESC + 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 @@ -345,7 +355,7 @@ ORDER BY pdate DESC, idx DESC - 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) + 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) @@ -355,7 +365,7 @@ ORDER BY pdate DESC, idx DESC - 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 + 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 @@ -371,7 +381,7 @@ ORDER BY pdate DESC, idx DESC - 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))) + 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))) @@ -439,13 +449,17 @@ ORDER BY pdate DESC, idx DESC + + + + - 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); -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 + 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, winuid, windate FROM EETGW_PurchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC @@ -482,14 +496,16 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + 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 + 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 (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -500,8 +516,8 @@ ORDER BY pdate DESC, idx DESC - 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))); -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 + 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, winuid, windate FROM EETGW_PurchaseCR WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC @@ -538,6 +554,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -604,6 +622,10 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + + + @@ -649,6 +671,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -689,11 +713,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - 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 + 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) @@ -704,7 +724,8 @@ WHERE idx = @idx 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 @@ -723,16 +744,19 @@ ORDER BY pdate DESC, idx DESC - SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request + 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 >= @pdate) AND (ISNULL(isdel, 0) = 0) +WHERE (state IN ('PO', 'PR')) AND (pdate >= @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 >= @pdate) AND (ISNULL(isdel, 0) = 0) +WHERE (state IN ('PO', 'PR')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY state, wdate DESC + @@ -754,8 +778,35 @@ ORDER BY state, wdate DESC + + + + + + - + + + + + 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 + + + + + + + + @@ -765,7 +816,7 @@ ORDER BY state, wdate DESC - + @@ -963,10 +1014,18 @@ ORDER BY state, wdate DESC + + + + + + + + - + @@ -1164,20 +1223,28 @@ ORDER BY state, wdate DESC + + + + + + + + - + - + - + @@ -1227,6 +1294,42 @@ ORDER BY state, wdate DESC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SubProject/FEQ0000/dsPurchase.xss b/SubProject/FEQ0000/dsPurchase.xss index 46ca8bd..62b1248 100644 --- a/SubProject/FEQ0000/dsPurchase.xss +++ b/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. --> - + - + \ No newline at end of file diff --git a/SubProject/FEQ0000/fItemin.Designer.cs b/SubProject/FEQ0000/fItemin.Designer.cs index 7f0b3b5..ca8ff56 100644 --- a/SubProject/FEQ0000/fItemin.Designer.cs +++ b/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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = 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.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.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.dv2 = new System.Windows.Forms.DataGridView(); + this.bs2 = new System.Windows.Forms.BindingSource(this.components); + this.dsPurchase1 = new FEQ0000.dsPurchase(); + this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton10 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripTextBox1 = new System.Windows.Forms.ToolStripTextBox(); + 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.groupBox1.Controls.Add(this.bn); - 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 = "미입고 자료"; + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47); // // ipkolistDataGridView // @@ -243,26 +296,119 @@ namespace FEQ0000 this.dataGridViewTextBoxColumn13, this.dataGridViewTextBoxColumn12}); this.ipkolistDataGridView.DataSource = this.bs; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5); - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.ipkolistDataGridView.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle10.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5); + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + 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(1141, 610); + this.panel2.Size = new System.Drawing.Size(1127, 698); 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.dvc_in.HeaderText = "담당자"; - this.dvc_in.Name = "dvc_in"; - this.dvc_in.ReadOnly = true; + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + 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.dataGridViewTextBoxColumn1.HeaderText = "위치"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; + this.tabPage1.Controls.Add(this.panel2); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + 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.dataGridViewTextBoxColumn3.HeaderText = "등록일"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.ReadOnly = true; + this.tabPage2.Controls.Add(this.dv2); + this.tabPage2.Controls.Add(this.bindingNavigator1); + this.tabPage2.Controls.Add(this.toolStrip2); + 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.dataGridViewTextBoxColumn4.HeaderText = "상태"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.ReadOnly = true; + this.dv2.AllowUserToAddRows = false; + this.dv2.AllowUserToDeleteRows = false; + this.dv2.AutoGenerateColumns = false; + 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.dataGridViewTextBoxColumn5.HeaderText = "SID"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.ReadOnly = true; + this.bs2.DataMember = "Ipkolist"; + this.bs2.DataSource = this.dsPurchase1; // - // dataGridViewTextBoxColumn6 + // dsPurchase1 // - this.dataGridViewTextBoxColumn6.DataPropertyName = "pumname"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewTextBoxColumn6.HeaderText = "품명"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.ReadOnly = true; + this.dsPurchase1.DataSetName = "dsPurchase"; + this.dsPurchase1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // dataGridViewTextBoxColumn7 + // bindingNavigator1 // - this.dataGridViewTextBoxColumn7.DataPropertyName = "pumscale"; - this.dataGridViewTextBoxColumn7.HeaderText = "모델"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.ReadOnly = true; + this.bindingNavigator1.AddNewItem = null; + this.bindingNavigator1.BindingSource = this.bs2; + this.bindingNavigator1.CountItem = this.toolStripLabel2; + 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.dataGridViewTextBoxColumn8.HeaderText = "수량"; - this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; - this.dataGridViewTextBoxColumn8.ReadOnly = true; + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(27, 36); + this.toolStripLabel2.Text = "/{0}"; + this.toolStripLabel2.ToolTipText = "전체 항목 수"; // - // dataGridViewTextBoxColumn9 + // toolStripButton8 // - this.dataGridViewTextBoxColumn9.DataPropertyName = "pumprice"; - this.dataGridViewTextBoxColumn9.HeaderText = "단가"; - this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; - this.dataGridViewTextBoxColumn9.ReadOnly = true; + this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.RightToLeftAutoMirrorImage = true; + this.toolStripButton8.Size = new System.Drawing.Size(36, 36); + this.toolStripButton8.Text = "처음으로 이동"; // - // dataGridViewTextBoxColumn10 + // toolStripButton10 // - this.dataGridViewTextBoxColumn10.DataPropertyName = "pumamt"; - this.dataGridViewTextBoxColumn10.HeaderText = "금액"; - this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; - this.dataGridViewTextBoxColumn10.ReadOnly = true; + this.toolStripButton10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton10.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton10.Image"))); + this.toolStripButton10.Name = "toolStripButton10"; + this.toolStripButton10.RightToLeftAutoMirrorImage = true; + this.toolStripButton10.Size = new System.Drawing.Size(36, 36); + this.toolStripButton10.Text = "이전으로 이동"; // - // dataGridViewTextBoxColumn11 + // toolStripSeparator4 // - this.dataGridViewTextBoxColumn11.DataPropertyName = "supply"; - this.dataGridViewTextBoxColumn11.HeaderText = "공급"; - this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; - this.dataGridViewTextBoxColumn11.ReadOnly = true; + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39); // - // dataGridViewTextBoxColumn13 + // toolStripTextBox1 // - this.dataGridViewTextBoxColumn13.DataPropertyName = "bigo"; - this.dataGridViewTextBoxColumn13.HeaderText = "비고"; - this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; - this.dataGridViewTextBoxColumn13.ReadOnly = true; + this.toolStripTextBox1.AccessibleName = "위치"; + this.toolStripTextBox1.AutoSize = false; + this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F); + 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.dataGridViewTextBoxColumn12.HeaderText = "연관프로젝트"; - this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; - this.dataGridViewTextBoxColumn12.ReadOnly = true; + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 39); + // + // 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.panel3); - this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.tabControl1); 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; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/fItemin.cs b/SubProject/FEQ0000/fItemin.cs index bd14582..35a778f 100644 --- a/SubProject/FEQ0000/fItemin.cs +++ b/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; } @@ -101,12 +108,43 @@ namespace FEQ0000 tbFind.Focus(); 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) + if (e.KeyCode == Keys.Enter) findText(); } @@ -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,9 +179,10 @@ namespace FEQ0000 var qty = buf[3].Trim(); lbCOST.Text = buf[5].Trim(); tbFind.Text = lbSID.Text; + lbPO.Text = buf[0].Trim(); findText(); } - else + else { lbCOST.Text = string.Empty; lbSID.Text = tbSearch.Text; @@ -172,11 +216,15 @@ namespace FEQ0000 FCOMMON.Util.MsgE("PO 상태의 자료만 입고처리가 가능 합니다"); return; } - + } - 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(); @@ -194,7 +242,7 @@ namespace FEQ0000 tbSearch.SelectAll(); } } - + } private void toolStripButton5_Click(object sender, EventArgs e) @@ -210,17 +258,262 @@ namespace FEQ0000 private void tbSearch_KeyDown(object sender, KeyEventArgs e) { - if(e.KeyCode == Keys.Enter) - SearchText(); + 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 ChangeMailAddress(List userid) + { + var db = new DataClasses1DataContext(); + + List retval = new List(); + 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(); + //var grp_rec = new List(); + + 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 tolist = new List(); //최종받는사람 + List cclist = new List(); + List bcclist = new List(); + + //받는사람 + 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(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + //sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + + var htmltable = new System.Text.StringBuilder(); + foreach (dsPurchase.IpkolistRow drow in datas) + { + htmltable.AppendLine(""); + htmltable.AppendLine($""); + htmltable.AppendLine($""); + if (drow.receive.Equals(drow.request)) + htmltable.AppendLine($""); + else + htmltable.AppendLine($""); + //htmltable.AppendLine($""); + htmltable.AppendLine($""); + htmltable.AppendLine($""); + htmltable.AppendLine($""); + htmltable.AppendLine($""); + htmltable.AppendLine($""); + htmltable.AppendLine($""); + htmltable.AppendLine($""); + htmltable.AppendLine($""); + htmltable.AppendLine(""); + } + sb.AppendLine(htmltable.ToString()); + sb.AppendLine(""); + sb.AppendLine("
위치신청수령POCR/CFSID품명규격수량단가금액공급
{drow.source}{drow.request}={drow.receive}{drow.po}{drow.orderno}{drow.sid}{drow.pumname}{drow.pumscale}{drow.pumqty:N0}{drow.pumprice:N0}{drow.pumamt:N0}{drow.supply}
"); + 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" + + "아웃룩의 설정이 정상인지 확인하세요"); + } + } } } diff --git a/SubProject/FEQ0000/fItemin.resx b/SubProject/FEQ0000/fItemin.resx index e0e50e0..23d35d9 100644 --- a/SubProject/FEQ0000/fItemin.resx +++ b/SubProject/FEQ0000/fItemin.resx @@ -127,24 +127,24 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAP8SURBVFhH3VhLTxpRGCVpd21/Rh9pm3ZvogjDzABVGyOY - mDQVd+pCrWJXvnXjwtff6L7psolKGXwkNSqFBvtM3FQxYQZcFDP9znBRoFcYXtX0JCchcO/9Dvd+93tc - y38LxWZ7GnQ4RjadznchUfy2arUmg42NaRCfQ07nV/wWFMVhjGXT6ov1hoY7iii+DjkcP0Nut7rb03N6 - 6Pfr8elpXZuf11MLCwbxGd8djo7qez5fCmMDsvxDcTj8763W22y52oEWvalIkp92Sg13dSWPxsf106Ul - 81xc1DEn7PFo9AdV7DzWZMtXh4AkPdiQpM9bnZ3qyewsX0AZxBpbra0qrRldt9nuMzOVQRGE5yRQO+jv - P+MZq4ax3t6zQFOT9sFub2XmykNIELrXmpuT8akproFa8HhyUl+z2ZK0ES+ZWXPAzkHcydwcd+FaEkcO - kQFBaGHmiwM+h2Ot584V8nhiQsdx06ndYzL4wM3ChaiHz5VibHAwTbc7UvR24/pve70J3gL/gjvt7RqF - smEmJx8IwohzpkLJ8nKGvN94NDn+ZGZGpySQ4AZzZAgEYd7EPJKhdDisp/f2TItM7+zo6WhUP11Z4f6e - y3BHh4aMw2RdAOnriJyVN+mcTFwWZkRCXBZmRCLjBGX5O5OVAZI58iVSEm9SLnMNAsVEljP2nKQh4HZr - AVF8zOSRQNpSJH7uBA7NGK5IHCMKDNI0xORZLCiLUJXwBl/GYgKqEQdCS0iS3jJ55H9Uz6E84g0uRp6Q - asWBcUqBm7J8wOQZ2UNDDccbXIqFgnJRiThQJS1U3qlMHgVoqoJTJi7IZeSJrFQcmKSil3zwN5NXJ4H7 - +7UTeO2P+NpfEiPMUIPDG3wZiwmpVuThyEh+mEEVs+vzXZ9A3d2dIk2DTB4JtNufXKtU53JpIZvtEZOX - AfywZDtJi+N2ZmHGYK7IdCRSslj4NTb2d7EAIB+jb+VNyiMTWc6RQaQZcSDKLbgck3UBFIloqq+yYI1T - wUoblfgoireYrHwEBWF42+O5mpKffA8lP8W/iyqmEKxpiqKp5i5SR8YGBtKKLH964/XeYHL4wHMEWkA0 - 1byF6kFU8shm5Ht3mYziwHPEKjXTtXiLKUWjUZKklCIIz5h5c8BzBDp+NNW8hWtB7BxsBEXxBTNbHvAc - geOO9fXV1ifpQsDncKxl71wh8BxBvhHZbGtTcRxcg2UQoWSjpUXFhTDtc6WA203/9BWaagRzI+OUUz/S - WOMBM9PzJpBnS97WSmAEc8o4SEUhl0tF92U8AdONN56ASQhoPAHTd6hKkPjRRiKVIkNwXw3qASRzEjuE - smhDlr/AV7OP6PiM7/Abxih2+0M27X+DxfIHcqjzCOBlb7UAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAPsSURBVFhH3VhLSxtRFA60u9qf0QdtaddmI8lkZpK0pQhG + EEqNoC7VauzKt25c+Pob3ZcuuzHNjCJW0HRS6BvcVCOYh4uOTM83nmii12Qmjxr84IOQ3HvOl3vPPefc + 67m20Hy+J4lAYGQ9GHyvy/KPD21tuURrqwnisx4MfsdvCVkexlie1liser23NVl+owcCv/VwOLPZ03O0 + G4tZ6elpKzs/b+UXFmziM77bHR21tqPRPMbGVfWXFgjESHwLm6sfyOhNTVFitFKZZFdXbm983DpaWnLO + xUULc5Lt7Vn6gxmsPGyy+doQV5T7a4ryRe/szBzMzooFuCBsYEXJZmrV57vHbqqDJkkvSGA21d9/LHJW + C43e3uO415v96Pc/Z3fuoEtSN4I9PTUldFAP7k9OWvBBC/GK3ToDVg4TD+bmhIbrSWw5fMUl6Rm7Lw/E + HLa1kSt3nvsTExa2m3btLssQAycLB6IRMVeJxuCgSafbgAaWcxE4/huRyKHIwP/gFqUhSmXDLKcUSMLI + c45SyfLyCUW/iehw/MHMjEVF4JBW8WIyR4VAEhZNLCE5MpNJy9zedizS3NqyzFTKOlpZEf5eTDuZU8Vh + WWdA+dqjYBVNOiWLK8CJSIgrwIlIVJyEqv5kWSdAMUd2R0kSTSpmsUOgnEg3Y09JGuLhcDYuy49YHgmk + JUXhF04Q0InjqsQx0WCQpiGW5/GgLUJXIhp8GcsJqEUcCC26orxjeRR/1M+hPRINLkeRkFrFgWkqgeuq + +pXl2dUjix5ONLgSzwsqRjXiwAxpofYuw/IoQVMXnHdwQC6jSGS14sAcNb0Ug39ZXoME7uzUT2DTb3HT + HxI7zdAFRzT4MpYTUqvI3ZGR0jSDLmYzGm2eRN3dnSdNgyyPBPr9j5uq1IVCWd3ne8jyToA4rHidJOM4 + nQU4cVgs0jSMis3Cn7Gxi80CgHqMVkc0qYQs0s2WQaQTcSA0IORY1hnQJOJSfZUNa5oaVlqow0+yfItl + lSIhScMbHR1X0/JT7KHlp/x31sWcB1+aUrhUC400kMbAgKmp6ue3kcgNliMGniNwBcSlWmSoEUQnj2pG + sXeHZZQHniNoNXP1eIupRPuipCh5TZKesntnwHMEROJSLTJcD2Ll4CMhyy/ZrTvgOQLbbfT11Tcm6UAg + 5rCtrlfuPPAcQbFhoNJgO4QOXRCpBLZwIBzHXCXgdNM/fY1LNRKpXXHc9I809vQBk2ygzlY8rdWAhLag + 4qAU6aFQBrcv+wmYTrz9BExCQPsJmL5DV4LCj2skSikqBGywucYCxZzEDqEtWlPVb4jVwiM6PuM7/IYx + mt//gKddN3g8/wAwLfHib7GLOwAAAABJRU5ErkJggg== @@ -160,17 +160,32 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== + 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= @@ -182,6 +197,9 @@ 240, 17 + + 240, 17 + 553, 17 @@ -268,4 +286,160 @@ 480, 17 + + True + + + True + + + 846, 17 + + + 725, 17 + + + 917, 17 + + + + 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= + + + + + 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 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + 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== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 + qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO + b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY + hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 + 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon + GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEYSURBVEhL7ZZLCsIwEIZ7MQXBE8SaXEFBMbrRW/Ri6qLd + +li0IC7EpUt1JD9CqGleUhA/mEVe8zElHZL8IXIhJgVjPTX0hnJQLjU0U6Tp+LxaXcrF4rjlvK+mndkw + 1q3m8/1pubwWnEs1XQ+ktyy7U/jKIUUeozznfEobsBlRSnlw+ey0l87oeSg3OdS2N+vBoFNJudMPUNhW + rldqnSNE7i0FPvJgKXCRR5MCG3l0Kfh0Q1+Jn/OmteAGZKq8LoIq1bGVR5WCJvlXpITpIlF8RdwkRUSV + 20oRUeSt/E42zcGlw1nh0pGiyV2kIFjuIwXe8hAp8JK39vQh8uFwFOOxp1f+euwJMVPL9UDuKwWQW0lB + Kw/6HydJHj5byGPQIkKNAAAAAElFTkSuQmCC + + + + + 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= + + + + 619, 17 + + + + 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== + + + + + 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= + + + + 725, 17 + \ No newline at end of file