diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 0d8f6d4..2e9f1f0 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.10.15.2033")] -[assembly: AssemblyFileVersion("23.10.15.2033")] +[assembly: AssemblyVersion("23.10.18.1130")] +[assembly: AssemblyFileVersion("23.10.18.1130")] diff --git a/SubProject/FCM0000/Item/fItemAdd.Designer.cs b/SubProject/FCM0000/Item/fItemAdd.Designer.cs index 6787c15..64c669d 100644 --- a/SubProject/FCM0000/Item/fItemAdd.Designer.cs +++ b/SubProject/FCM0000/Item/fItemAdd.Designer.cs @@ -173,6 +173,26 @@ label3.TabIndex = 15; label3.Text = "보관소"; // + // label4 + // + label4.AutoSize = true; + label4.Location = new System.Drawing.Point(357, 268); + label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(55, 30); + label4.TabIndex = 23; + label4.Text = "분류"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(31, 358); + label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(76, 30); + label5.TabIndex = 25; + label5.Text = "바코드"; + // // ta // this.ta.ClearBeforeFill = true; @@ -198,7 +218,6 @@ // // tbModel // - this.tbModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128))))); this.tbModel.Location = new System.Drawing.Point(111, 94); this.tbModel.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); this.tbModel.Name = "tbModel"; @@ -306,16 +325,6 @@ this.checkBox1.UseVisualStyleBackColor = true; this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); // - // label4 - // - label4.AutoSize = true; - label4.Location = new System.Drawing.Point(357, 268); - label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); - label4.Name = "label4"; - label4.Size = new System.Drawing.Size(55, 30); - label4.TabIndex = 23; - label4.Text = "분류"; - // // tbCate // this.tbCate.Location = new System.Drawing.Point(416, 266); @@ -326,16 +335,6 @@ this.tbCate.Text = "--"; this.tbCate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // label5 - // - label5.AutoSize = true; - label5.Location = new System.Drawing.Point(31, 358); - label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); - label5.Name = "label5"; - label5.Size = new System.Drawing.Size(76, 30); - label5.TabIndex = 25; - label5.Text = "바코드"; - // // tbBarcode // this.tbBarcode.Location = new System.Drawing.Point(111, 355); @@ -348,7 +347,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(669, 518); + this.ClientSize = new System.Drawing.Size(669, 526); this.Controls.Add(label5); this.Controls.Add(this.tbBarcode); this.Controls.Add(label4); diff --git a/SubProject/FCM0000/Item/fItemAdd.cs b/SubProject/FCM0000/Item/fItemAdd.cs index e76d2a9..20d8ec2 100644 --- a/SubProject/FCM0000/Item/fItemAdd.cs +++ b/SubProject/FCM0000/Item/fItemAdd.cs @@ -65,12 +65,13 @@ namespace FCM0000.Item tbName.Focus(); return; } - if (tbModel.Text.Trim() == "") - { - FCOMMON.Util.MsgE("모델은 필수 입니다"); - tbModel.Focus(); - return; - } + + //if (tbModel.Text.Trim() == "") + //{ + // FCOMMON.Util.MsgE("모델은 필수 입니다"); + // tbModel.Focus(); + // return; + //} if (tbSid.Text.StartsWith("신규")) tbSid.Text = "신규"; else diff --git a/SubProject/FCM0000/Item/fItemAdd.resx b/SubProject/FCM0000/Item/fItemAdd.resx index 4e6cc1e..8079119 100644 --- a/SubProject/FCM0000/Item/fItemAdd.resx +++ b/SubProject/FCM0000/Item/fItemAdd.resx @@ -147,16 +147,16 @@ False - - 122, 17 - - - 17, 17 - False False + + 122, 17 + + + 17, 17 + \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs index 7e878b4..3a2edba 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs @@ -857,7 +857,7 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); - this.fpSpread1.SetViewportLeftColumn(0, 0, 2); + this.fpSpread1.SetViewportLeftColumn(0, 0, 9); // // label1 // @@ -923,7 +923,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "*"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "프로젝트"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "비고\r\n(요청자)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "비고(구매사유)\r\n(요청자)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "입고예정"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "입고일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "입고수량"; @@ -980,11 +980,13 @@ this.fpSpread1_Sheet1.Columns.Get(6).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "requestName"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "costcenter"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "Cost Center"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "linecode"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -1157,10 +1159,10 @@ this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(30).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(30).Label = "비고\r\n(요청자)"; + this.fpSpread1_Sheet1.Columns.Get(30).Label = "비고(구매사유)\r\n(요청자)"; this.fpSpread1_Sheet1.Columns.Get(30).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(30).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(30).Width = 96F; this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType20; this.fpSpread1_Sheet1.Columns.Get(31).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -1193,11 +1195,13 @@ this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(35).Label = "비고\r\n(담당자)"; this.fpSpread1_Sheet1.Columns.Get(35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(36).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(36).DataField = "purchase_manager"; this.fpSpread1_Sheet1.Columns.Get(36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(36).Label = "구매담당"; this.fpSpread1_Sheet1.Columns.Get(36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(37).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(37).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(37).DataField = "purchase_admin"; this.fpSpread1_Sheet1.Columns.Get(37).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs index 249c6ac..9354f86 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs @@ -122,20 +122,27 @@ namespace FEQ0000 this.cmbState.SelectedIndex = 0; //all기본 - 양진원 //this.cmbCr.SelectedIndex = 1; - //구매-담당 - stList = FCOMMON.DBM.getCodeList("65"); - this.cmbManager.Items.Clear(); - cmbManager.Items.Add("-- 전체 --"); - foreach (var item in stList) - cmbManager.Items.Add(item.Value); - this.cmbManager.SelectedIndex = 0; + //구매담당자목록 + using (var tauser = new dsPurchaseTableAdapters.Purchase_ManagerlistTableAdapter()) + { + var lst_man = tauser.GetByManager(FCOMMON.info.Login.gcode); + var lat_adm = tauser.GetByAdmin(FCOMMON.info.Login.gcode); - //구매-승인 - stList = FCOMMON.DBM.getCodeList("66"); - this.cmbAdmin.Items.Clear(); - cmbAdmin.Items.Add("-- 전체 --"); - foreach (var item in stList) - cmbAdmin.Items.Add(item.Value); + cmbManager.Items.Clear(); + cmbAdmin.Items.Clear(); + cmbManager.Items.Add("-- 전체 --"); + cmbAdmin.Items.Add("-- 전체 --"); + + foreach (dsPurchase.Purchase_ManagerlistRow dr in lst_man) + { + cmbManager.Items.Add(dr.username); + } + foreach (dsPurchase.Purchase_ManagerlistRow dr in lat_adm) + { + cmbAdmin.Items.Add(dr.username); + } + } + this.cmbManager.SelectedIndex = 0; this.cmbAdmin.SelectedIndex = 0; @@ -795,7 +802,11 @@ namespace FEQ0000 | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered | FarPoint.Excel.ExcelSaveFlags.NoFormulas | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); - FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); + var a = FCOMMON.Util.MsgQ("다음 파일이 생성 되었습니다.\n\n" + sd.FileName + "\n파일을 확인 할까요?"); + if(a == DialogResult.Yes) + { + FCOMMON.Util.RunExplorer(sd.FileName); + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index c807288..b28c086 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -85,6 +85,7 @@ this.chkExp = new System.Windows.Forms.CheckBox(); this.btSaveAdd = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.cmbRemark = new System.Windows.Forms.ComboBox(); this.cmbCurrency = new System.Windows.Forms.ComboBox(); this.tbQtyReal = new System.Windows.Forms.TextBox(); this.tbBigoChk = new System.Windows.Forms.TextBox(); @@ -114,7 +115,6 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components); - this.cmbRemark = new System.Windows.Forms.ComboBox(); this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -444,6 +444,16 @@ label9.TabIndex = 20; label9.Text = "해외물품은\r\n좌측 단가를 입력"; // + // label18 + // + label18.AutoSize = true; + label18.Location = new System.Drawing.Point(277, 177); + label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label18.Name = "label18"; + label18.Size = new System.Drawing.Size(20, 20); + label18.TabIndex = 51; + label18.Text = "\\"; + // // tbSC // this.tbSC.Location = new System.Drawing.Point(112, 430); @@ -772,8 +782,19 @@ this.groupBox1.Text = "필수입력"; this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); // + // cmbRemark + // + this.cmbRemark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbRemark.FormattingEnabled = true; + this.cmbRemark.Location = new System.Drawing.Point(94, 368); + this.cmbRemark.Margin = new System.Windows.Forms.Padding(4); + this.cmbRemark.Name = "cmbRemark"; + this.cmbRemark.Size = new System.Drawing.Size(380, 28); + this.cmbRemark.TabIndex = 50; + // // cmbCurrency // + this.cmbCurrency.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCurrency.FormattingEnabled = true; this.cmbCurrency.Items.AddRange(new object[] { "USD"}); @@ -782,7 +803,6 @@ this.cmbCurrency.Name = "cmbCurrency"; this.cmbCurrency.Size = new System.Drawing.Size(89, 28); this.cmbCurrency.TabIndex = 50; - this.cmbCurrency.Text = "USD"; // // tbQtyReal // @@ -1101,16 +1121,6 @@ this.timer1.Interval = 250; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // - // cmbRemark - // - this.cmbRemark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbRemark.FormattingEnabled = true; - this.cmbRemark.Location = new System.Drawing.Point(94, 368); - this.cmbRemark.Margin = new System.Windows.Forms.Padding(4); - this.cmbRemark.Name = "cmbRemark"; - this.cmbRemark.Size = new System.Drawing.Size(380, 28); - this.cmbRemark.TabIndex = 50; - // // dsPurchase // this.dsPurchase.DataSetName = "dsPurchase"; @@ -1125,16 +1135,6 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // - // label18 - // - label18.AutoSize = true; - label18.Location = new System.Drawing.Point(277, 177); - label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label18.Name = "label18"; - label18.Size = new System.Drawing.Size(20, 20); - label18.TabIndex = 51; - label18.Text = "\\"; - // // fPurchase_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 1565be8..528d67c 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -51,6 +51,14 @@ namespace FEQ0000 ctl.KeyDown += ctl_KeyDown; } } + + //필수로 + if(FCOMMON.info.Login.gcode == "K4PM") + { + tbCostCenter.BackColor = Color.FromArgb(255, 255, 192); + tbLineCode.BackColor = Color.FromArgb(255, 255, 192); + tbManager.BackColor = Color.FromArgb(255, 255, 192); + } } Boolean advInput = false; @@ -546,6 +554,28 @@ namespace FEQ0000 } + if (FCOMMON.info.Login.gcode == "K4PM") + { + if(tbCostCenter.Text.isEmpty()) + { + FCOMMON.Util.MsgE("CostCenter 를 입력하세요"); + tbCostCenter.Focus(); + return false; + } + if (tbLineCode.Text.isEmpty()) + { + FCOMMON.Util.MsgE("LineCode 를 입력하세요"); + tbLineCode.Focus(); + return false; + } + if (tbManager.Text.isEmpty()) + { + FCOMMON.Util.MsgE("구매담당자 를 입력하세요"); + tbManager.Focus(); + return false; + } + } + //if (cbProcess.Text.Trim() == "") //{ diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx index 6753587..f286013 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx @@ -227,6 +227,9 @@ False + + False + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) @@ -234,9 +237,6 @@ * 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) - - False - * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index d9ca74f..ccb3dd7 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -30,6 +30,8 @@ namespace FEQ0000 { private IpkolistDataTable tableIpkolist; + private Purchase_ManagerlistDataTable tablePurchase_Managerlist; + private PurchaseCheckDataTable tablePurchaseCheck; private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; @@ -73,6 +75,9 @@ namespace FEQ0000 { if ((ds.Tables["Ipkolist"] != null)) { base.Tables.Add(new IpkolistDataTable(ds.Tables["Ipkolist"])); } + if ((ds.Tables["Purchase_Managerlist"] != null)) { + base.Tables.Add(new Purchase_ManagerlistDataTable(ds.Tables["Purchase_Managerlist"])); + } if ((ds.Tables["PurchaseCheck"] != null)) { base.Tables.Add(new PurchaseCheckDataTable(ds.Tables["PurchaseCheck"])); } @@ -125,6 +130,16 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public Purchase_ManagerlistDataTable Purchase_Managerlist { + get { + return this.tablePurchase_Managerlist; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -212,6 +227,9 @@ namespace FEQ0000 { if ((ds.Tables["Ipkolist"] != null)) { base.Tables.Add(new IpkolistDataTable(ds.Tables["Ipkolist"])); } + if ((ds.Tables["Purchase_Managerlist"] != null)) { + base.Tables.Add(new Purchase_ManagerlistDataTable(ds.Tables["Purchase_Managerlist"])); + } if ((ds.Tables["PurchaseCheck"] != null)) { base.Tables.Add(new PurchaseCheckDataTable(ds.Tables["PurchaseCheck"])); } @@ -266,6 +284,12 @@ namespace FEQ0000 { this.tableIpkolist.InitVars(); } } + this.tablePurchase_Managerlist = ((Purchase_ManagerlistDataTable)(base.Tables["Purchase_Managerlist"])); + if ((initTable == true)) { + if ((this.tablePurchase_Managerlist != null)) { + this.tablePurchase_Managerlist.InitVars(); + } + } this.tablePurchaseCheck = ((PurchaseCheckDataTable)(base.Tables["PurchaseCheck"])); if ((initTable == true)) { if ((this.tablePurchaseCheck != null)) { @@ -288,6 +312,8 @@ namespace FEQ0000 { base.Tables.Add(this.tableEETGW_PurchaseCR); this.tableIpkolist = new IpkolistDataTable(); base.Tables.Add(this.tableIpkolist); + this.tablePurchase_Managerlist = new Purchase_ManagerlistDataTable(); + base.Tables.Add(this.tablePurchase_Managerlist); this.tablePurchaseCheck = new PurchaseCheckDataTable(); base.Tables.Add(this.tablePurchaseCheck); } @@ -310,6 +336,12 @@ namespace FEQ0000 { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private bool ShouldSerializePurchase_Managerlist() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private bool ShouldSerializePurchaseCheck() { @@ -387,6 +419,9 @@ namespace FEQ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void IpkolistRowChangeEventHandler(object sender, IpkolistRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public delegate void Purchase_ManagerlistRowChangeEventHandler(object sender, Purchase_ManagerlistRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void PurchaseCheckRowChangeEventHandler(object sender, PurchaseCheckRowChangeEvent e); @@ -2759,6 +2794,10 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnsortkey; + private global::System.Data.DataColumn columnpurchase_manager; + + private global::System.Data.DataColumn columnpurchase_admin; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public IpkolistDataTable() { @@ -2968,6 +3007,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn purchase_managerColumn { + get { + return this.columnpurchase_manager; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn purchase_adminColumn { + get { + return this.columnpurchase_admin; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3027,7 +3082,9 @@ namespace FEQ0000 { string sc, string po, string orderno, - int sortkey) { + int sortkey, + string purchase_manager, + string purchase_admin) { IpkolistRow rowIpkolistRow = ((IpkolistRow)(this.NewRow())); object[] columnValuesArray = new object[] { source, @@ -3051,7 +3108,9 @@ namespace FEQ0000 { sc, po, orderno, - sortkey}; + sortkey, + purchase_manager, + purchase_admin}; rowIpkolistRow.ItemArray = columnValuesArray; this.Rows.Add(rowIpkolistRow); return rowIpkolistRow; @@ -3104,6 +3163,8 @@ namespace FEQ0000 { this.columnpo = base.Columns["po"]; this.columnorderno = base.Columns["orderno"]; this.columnsortkey = base.Columns["sortkey"]; + this.columnpurchase_manager = base.Columns["purchase_manager"]; + this.columnpurchase_admin = base.Columns["purchase_admin"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3153,6 +3214,10 @@ namespace FEQ0000 { base.Columns.Add(this.columnorderno); this.columnsortkey = new global::System.Data.DataColumn("sortkey", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnsortkey); + this.columnpurchase_manager = new global::System.Data.DataColumn("purchase_manager", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpurchase_manager); + this.columnpurchase_admin = new global::System.Data.DataColumn("purchase_admin", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpurchase_admin); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnsource, this.columnidx}, true)); @@ -3192,6 +3257,10 @@ namespace FEQ0000 { this.columnorderno.ReadOnly = true; this.columnorderno.MaxLength = 50; this.columnsortkey.ReadOnly = true; + this.columnpurchase_manager.ReadOnly = true; + this.columnpurchase_manager.MaxLength = 50; + this.columnpurchase_admin.ReadOnly = true; + this.columnpurchase_admin.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3318,6 +3387,265 @@ namespace FEQ0000 { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class Purchase_ManagerlistDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnusername; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Purchase_ManagerlistDataTable() { + this.TableName = "Purchase_Managerlist"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal Purchase_ManagerlistDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected Purchase_ManagerlistDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn usernameColumn { + get { + return this.columnusername; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Purchase_ManagerlistRow this[int index] { + get { + return ((Purchase_ManagerlistRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event Purchase_ManagerlistRowChangeEventHandler Purchase_ManagerlistRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event Purchase_ManagerlistRowChangeEventHandler Purchase_ManagerlistRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event Purchase_ManagerlistRowChangeEventHandler Purchase_ManagerlistRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event Purchase_ManagerlistRowChangeEventHandler Purchase_ManagerlistRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void AddPurchase_ManagerlistRow(Purchase_ManagerlistRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Purchase_ManagerlistRow AddPurchase_ManagerlistRow(string username) { + Purchase_ManagerlistRow rowPurchase_ManagerlistRow = ((Purchase_ManagerlistRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + username}; + rowPurchase_ManagerlistRow.ItemArray = columnValuesArray; + this.Rows.Add(rowPurchase_ManagerlistRow); + return rowPurchase_ManagerlistRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Purchase_ManagerlistRow FindByusername(string username) { + return ((Purchase_ManagerlistRow)(this.Rows.Find(new object[] { + username}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public override global::System.Data.DataTable Clone() { + Purchase_ManagerlistDataTable cln = ((Purchase_ManagerlistDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new Purchase_ManagerlistDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal void InitVars() { + this.columnusername = base.Columns["username"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitClass() { + this.columnusername = new global::System.Data.DataColumn("username", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnusername); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnusername}, true)); + this.columnusername.AllowDBNull = false; + this.columnusername.Unique = true; + this.columnusername.MaxLength = 50; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Purchase_ManagerlistRow NewPurchase_ManagerlistRow() { + return ((Purchase_ManagerlistRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new Purchase_ManagerlistRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(Purchase_ManagerlistRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.Purchase_ManagerlistRowChanged != null)) { + this.Purchase_ManagerlistRowChanged(this, new Purchase_ManagerlistRowChangeEvent(((Purchase_ManagerlistRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.Purchase_ManagerlistRowChanging != null)) { + this.Purchase_ManagerlistRowChanging(this, new Purchase_ManagerlistRowChangeEvent(((Purchase_ManagerlistRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.Purchase_ManagerlistRowDeleted != null)) { + this.Purchase_ManagerlistRowDeleted(this, new Purchase_ManagerlistRowChangeEvent(((Purchase_ManagerlistRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.Purchase_ManagerlistRowDeleting != null)) { + this.Purchase_ManagerlistRowDeleting(this, new Purchase_ManagerlistRowChangeEvent(((Purchase_ManagerlistRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void RemovePurchase_ManagerlistRow(Purchase_ManagerlistRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + dsPurchase ds = new dsPurchase(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "Purchase_ManagerlistDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents the strongly named DataTable class. /// @@ -6898,6 +7226,38 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string purchase_manager { + get { + if (this.Ispurchase_managerNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableIpkolist.purchase_managerColumn])); + } + } + set { + this[this.tableIpkolist.purchase_managerColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string purchase_admin { + get { + if (this.Ispurchase_adminNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableIpkolist.purchase_adminColumn])); + } + } + set { + this[this.tableIpkolist.purchase_adminColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -7137,6 +7497,56 @@ namespace FEQ0000 { public void SetsortkeyNull() { this[this.tableIpkolist.sortkeyColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Ispurchase_managerNull() { + return this.IsNull(this.tableIpkolist.purchase_managerColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setpurchase_managerNull() { + this[this.tableIpkolist.purchase_managerColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Ispurchase_adminNull() { + return this.IsNull(this.tableIpkolist.purchase_adminColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setpurchase_adminNull() { + this[this.tableIpkolist.purchase_adminColumn] = global::System.Convert.DBNull; + } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class Purchase_ManagerlistRow : global::System.Data.DataRow { + + private Purchase_ManagerlistDataTable tablePurchase_Managerlist; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal Purchase_ManagerlistRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tablePurchase_Managerlist = ((Purchase_ManagerlistDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string username { + get { + return ((string)(this[this.tablePurchase_Managerlist.usernameColumn])); + } + set { + this[this.tablePurchase_Managerlist.usernameColumn] = value; + } + } } /// @@ -7726,6 +8136,40 @@ namespace FEQ0000 { } } + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public class Purchase_ManagerlistRowChangeEvent : global::System.EventArgs { + + private Purchase_ManagerlistRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Purchase_ManagerlistRowChangeEvent(Purchase_ManagerlistRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Purchase_ManagerlistRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } + /// ///Row event argument class /// @@ -12934,6 +13378,8 @@ ORDER BY pdate DESC, idx DESC"; tableMapping.ColumnMappings.Add("po", "po"); tableMapping.ColumnMappings.Add("orderno", "orderno"); tableMapping.ColumnMappings.Add("sortkey", "sortkey"); + tableMapping.ColumnMappings.Add("purchase_manager", "purchase_manager"); + tableMapping.ColumnMappings.Add("purchase_admin", "purchase_admin"); this._adapter.TableMappings.Add(tableMapping); } @@ -12951,40 +13397,48 @@ ORDER BY pdate DESC, idx DESC"; 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, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin FROM Purchase -WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND + (ISNULL(purchase_admin, '') LIKE @search_admin) 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, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin FROM EETGW_PurchaseCR -WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND + (ISNULL(purchase_admin, '') LIKE @search_admin) ORDER BY sortkey, 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[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search_manager", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search_admin", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; this._commandCollection[1].CommandText = @"SELECT '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, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin FROM Purchase -WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') + LIKE @search_admin) 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, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin FROM EETGW_PurchaseCR -WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') + LIKE @search_admin) 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, 0, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + 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, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search_manager", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search_admin", global::System.Data.SqlDbType.VarChar, 1024, 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", "17.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, string gcode) { + public virtual int Fill(dsPurchase.IpkolistDataTable dataTable, string pdate, string gcode, string search_manager, string search_admin) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((pdate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -12998,6 +13452,18 @@ ORDER BY source DESC, request, wdate DESC"; else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } + if ((search_manager == null)) { + throw new global::System.ArgumentNullException("search_manager"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(search_manager)); + } + if ((search_admin == null)) { + throw new global::System.ArgumentNullException("search_admin"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search_admin)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -13009,7 +13475,7 @@ ORDER BY source DESC, request, wdate DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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, string gcode) { + public virtual dsPurchase.IpkolistDataTable GetData(string pdate, string gcode, string search_manager, string search_admin) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((pdate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -13023,6 +13489,18 @@ ORDER BY source DESC, request, wdate DESC"; else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } + if ((search_manager == null)) { + throw new global::System.ArgumentNullException("search_manager"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(search_manager)); + } + if ((search_admin == null)) { + throw new global::System.ArgumentNullException("search_admin"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search_admin)); + } dsPurchase.IpkolistDataTable dataTable = new dsPurchase.IpkolistDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -13032,10 +13510,10 @@ ORDER BY source DESC, request, wdate DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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) { + public virtual int FillByTodayIn(dsPurchase.IpkolistDataTable dataTable, string pdate, string gcode, string search_manager, string search_admin) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((pdate == null)) { - throw new global::System.ArgumentNullException("pdate"); + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); @@ -13046,6 +13524,18 @@ ORDER BY source DESC, request, wdate DESC"; else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } + if ((search_manager == null)) { + throw new global::System.ArgumentNullException("search_manager"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(search_manager)); + } + if ((search_admin == null)) { + throw new global::System.ArgumentNullException("search_admin"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search_admin)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -13057,10 +13547,10 @@ ORDER BY source DESC, request, wdate DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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) { + public virtual dsPurchase.IpkolistDataTable GetByTodayIn(string pdate, string gcode, string search_manager, string search_admin) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((pdate == null)) { - throw new global::System.ArgumentNullException("pdate"); + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); @@ -13071,12 +13561,261 @@ ORDER BY source DESC, request, wdate DESC"; else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } + if ((search_manager == null)) { + throw new global::System.ArgumentNullException("search_manager"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(search_manager)); + } + if ((search_admin == null)) { + throw new global::System.ArgumentNullException("search_admin"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search_admin)); + } dsPurchase.IpkolistDataTable dataTable = new dsPurchase.IpkolistDataTable(); this.Adapter.Fill(dataTable); return dataTable; } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class Purchase_ManagerlistTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Purchase_ManagerlistTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "Purchase_Managerlist"; + tableMapping.ColumnMappings.Add("username", "username"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::FEQ0000.Properties.Settings.Default.gwcs; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitCommandCollection() { + 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 purchase_manager AS username +FROM Purchase WITH (nolock) +WHERE (gcode = @gcode) AND (ISNULL(purchase_manager, '') <> '') +GROUP BY purchase_manager +UNION +SELECT purchase_manager +FROM EETGW_PurchaseCR WITH (nolock) +WHERE (gcode = @gcode) AND (ISNULL(purchase_manager, '') <> '') +GROUP BY purchase_manager"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + 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 purchase_admin AS username +FROM Purchase WITH (nolock) +WHERE (gcode = @gcode) AND (ISNULL(purchase_admin, '') <> '') +GROUP BY purchase_admin +UNION +SELECT purchase_admin +FROM EETGW_PurchaseCR WITH (nolock) +WHERE (gcode = @gcode) AND (ISNULL(purchase_admin, '') <> '') +GROUP BY purchase_admin"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; + 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", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int FillByManager(dsPurchase.Purchase_ManagerlistDataTable dataTable, string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].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", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual dsPurchase.Purchase_ManagerlistDataTable GetByManager(string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + dsPurchase.Purchase_ManagerlistDataTable dataTable = new dsPurchase.Purchase_ManagerlistDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByAdmin(dsPurchase.Purchase_ManagerlistDataTable dataTable, string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].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", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsPurchase.Purchase_ManagerlistDataTable GetByAdmin(string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + dsPurchase.Purchase_ManagerlistDataTable dataTable = new dsPurchase.Purchase_ManagerlistDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/SubProject/FEQ0000/dsPurchase.cs b/SubProject/FEQ0000/dsPurchase.cs index 999e230..cb1e1b4 100644 --- a/SubProject/FEQ0000/dsPurchase.cs +++ b/SubProject/FEQ0000/dsPurchase.cs @@ -4,6 +4,9 @@ partial class dsPurchase { + partial class Purchase_crlistDataTable + { + } } } diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index c81915e..fd8b225 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -871,18 +871,22 @@ 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, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin FROM Purchase -WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND + (ISNULL(purchase_admin, '') LIKE @search_admin) 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, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin FROM EETGW_PurchaseCR -WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND + (ISNULL(purchase_admin, '') LIKE @search_admin) ORDER BY sortkey, wdate DESC + + @@ -911,24 +915,75 @@ ORDER BY sortkey, 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, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin FROM Purchase -WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') + LIKE @search_admin) 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, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin FROM EETGW_PurchaseCR -WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') + LIKE @search_admin) ORDER BY source DESC, request, wdate DESC - - + + + + + + + + + + + + + + + + SELECT purchase_manager AS username +FROM Purchase WITH (nolock) +WHERE (gcode = @gcode) AND (ISNULL(purchase_manager, '') <> '') +GROUP BY purchase_manager +UNION +SELECT purchase_manager +FROM EETGW_PurchaseCR WITH (nolock) +WHERE (gcode = @gcode) AND (ISNULL(purchase_manager, '') <> '') +GROUP BY purchase_manager + + + + + + + + + + + + + + + SELECT purchase_admin AS username +FROM Purchase WITH (nolock) +WHERE (gcode = @gcode) AND (ISNULL(purchase_admin, '') <> '') +GROUP BY purchase_admin +UNION +SELECT purchase_admin +FROM EETGW_PurchaseCR WITH (nolock) +WHERE (gcode = @gcode) AND (ISNULL(purchase_admin, '') <> '') +GROUP BY purchase_admin + + @@ -1441,7 +1496,7 @@ ORDER BY source DESC, request, wdate DESC - + @@ -1548,6 +1603,20 @@ ORDER BY source DESC, request, wdate DESC + + + + + + + + + + + + + + @@ -1641,6 +1710,19 @@ ORDER BY source DESC, request, wdate DESC + + + + + + + + + + + + + @@ -1660,5 +1742,9 @@ ORDER BY source DESC, request, wdate DESC + + + + \ No newline at end of file diff --git a/SubProject/FEQ0000/fItemin.Designer.cs b/SubProject/FEQ0000/fItemin.Designer.cs index ca8ff56..8de8e37 100644 --- a/SubProject/FEQ0000/fItemin.Designer.cs +++ b/SubProject/FEQ0000/fItemin.Designer.cs @@ -31,20 +31,24 @@ namespace FEQ0000 { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItemin)); - 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 dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = 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(); this.lbSID = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel4 = new System.Windows.Forms.ToolStripStatusLabel(); this.lbCOST = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lbPO = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.tbSearch = new System.Windows.Forms.TextBox(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); @@ -53,21 +57,6 @@ namespace FEQ0000 this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); 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); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -86,14 +75,12 @@ namespace FEQ0000 this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.label3 = new System.Windows.Forms.Label(); - this.ta = new FEQ0000.dsPurchaseTableAdapters.IpkolistTableAdapter(); - this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager(); 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.dataGridViewButtonColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.orderno = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); @@ -115,8 +102,31 @@ namespace FEQ0000 this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.tbindate = new System.Windows.Forms.ToolStripTextBox(); this.btRefreshIn = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); + this.lbSum = new System.Windows.Forms.ToolStripLabel(); + this.dvc_in = new System.Windows.Forms.DataGridViewButtonColumn(); + this.dvc_manager = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_admin = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.tbadm = new System.Windows.Forms.ToolStripComboBox(); + this.tbman = new System.Windows.Forms.ToolStripComboBox(); + 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.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(); @@ -126,16 +136,15 @@ namespace FEQ0000 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.bs2 = new System.Windows.Forms.BindingSource(this.components); + this.dsPurchase1 = new FEQ0000.dsPurchase(); + this.ta = new FEQ0000.dsPurchaseTableAdapters.IpkolistTableAdapter(); + this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager(); this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ipkolistDataGridView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.panel2.SuspendLayout(); @@ -144,18 +153,20 @@ namespace FEQ0000 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(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPurchase1)).BeginInit(); 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(1005, 0); + this.button1.Location = new System.Drawing.Point(1160, 0); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(122, 51); this.button1.TabIndex = 0; @@ -175,7 +186,7 @@ namespace FEQ0000 this.toolStripStatusLabel1}); this.statusStrip1.Location = new System.Drawing.Point(0, 676); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1127, 22); + this.statusStrip1.Size = new System.Drawing.Size(1282, 22); this.statusStrip1.TabIndex = 1; this.statusStrip1.Text = "statusStrip1"; // @@ -205,6 +216,19 @@ namespace FEQ0000 this.lbCOST.Size = new System.Drawing.Size(17, 17); this.lbCOST.Text = "--"; // + // 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 = "--"; + // // toolStripStatusLabel1 // this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; @@ -220,7 +244,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(1005, 29); + this.tbSearch.Size = new System.Drawing.Size(1160, 29); this.tbSearch.TabIndex = 2; this.tbSearch.Text = "4520286819#00020#109007296#1#EA#K115232311329759#001"; this.tbSearch.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -232,11 +256,15 @@ namespace FEQ0000 this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButton1, this.toolStripButton2, - this.toolStripButton3, - this.toolStripSeparator2}); + this.toolStripSeparator2, + this.toolStripLabel6, + this.tbman, + this.toolStripLabel7, + this.tbadm, + this.toolStripButton3}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1127, 47); + this.toolStrip1.Size = new System.Drawing.Size(1282, 47); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -283,6 +311,8 @@ namespace FEQ0000 this.ipkolistDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.ipkolistDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dvc_in, + this.dvc_manager, + this.dvc_admin, this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn3, this.dataGridViewTextBoxColumn4, @@ -296,129 +326,26 @@ namespace FEQ0000 this.dataGridViewTextBoxColumn13, this.dataGridViewTextBoxColumn12}); this.ipkolistDataGridView.DataSource = this.bs; - 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; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle14.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle14.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5); + dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.ipkolistDataGridView.DefaultCellStyle = dataGridViewCellStyle14; this.ipkolistDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; 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(1127, 539); + this.ipkolistDataGridView.Size = new System.Drawing.Size(1282, 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"; - this.bs.DataSource = this.dsPurchase; - // - // dsPurchase - // - this.dsPurchase.DataSetName = "dsPurchase"; - this.dsPurchase.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // bn // this.bn.AddNewItem = null; @@ -441,7 +368,10 @@ namespace FEQ0000 this.tbFind, this.btFind, this.toolStripButton4, - this.toolStripButton5}); + this.toolStripButton5, + this.toolStripSeparator1, + this.toolStripLabel5, + this.lbSum}); this.bn.Location = new System.Drawing.Point(0, 637); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -449,7 +379,7 @@ namespace FEQ0000 this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1127, 39); + this.bn.Size = new System.Drawing.Size(1282, 39); this.bn.TabIndex = 6; this.bn.Text = "bindingNavigator1"; // @@ -575,7 +505,7 @@ namespace FEQ0000 this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(3, 3); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1127, 698); + this.panel2.Size = new System.Drawing.Size(1282, 698); this.panel2.TabIndex = 5; // // panel3 @@ -587,7 +517,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(1127, 51); + this.panel3.Size = new System.Drawing.Size(1282, 51); this.panel3.TabIndex = 6; // // label3 @@ -597,23 +527,11 @@ 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(1005, 22); + this.label3.Size = new System.Drawing.Size(1160, 22); this.label3.TabIndex = 3; this.label3.Text = "QR CODE 값을 입력하세요"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // ta - // - this.ta.ClearBeforeFill = true; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.Connection = null; - this.tam.EETGW_PurchaseCRTableAdapter = null; - this.tam.PurchaseTableAdapter = null; - this.tam.UpdateOrder = FEQ0000.dsPurchaseTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage1); @@ -622,7 +540,7 @@ namespace FEQ0000 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.Size = new System.Drawing.Size(1296, 730); this.tabControl1.TabIndex = 5; this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // @@ -632,7 +550,7 @@ namespace FEQ0000 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.Size = new System.Drawing.Size(1288, 704); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "미 입고 자료"; this.tabPage1.UseVisualStyleBackColor = true; @@ -645,7 +563,7 @@ namespace FEQ0000 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.Size = new System.Drawing.Size(1288, 704); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "금일 입고 내역"; this.tabPage2.UseVisualStyleBackColor = true; @@ -674,33 +592,39 @@ namespace FEQ0000 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; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle20.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle20.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5); + dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv2.DefaultCellStyle = dataGridViewCellStyle20; 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.Size = new System.Drawing.Size(1282, 612); this.dv2.TabIndex = 8; // - // bs2 + // dataGridViewButtonColumn1 // - this.bs2.DataMember = "Ipkolist"; - this.bs2.DataSource = this.dsPurchase1; + 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; // - // dsPurchase1 + // orderno // - this.dsPurchase1.DataSetName = "dsPurchase"; - this.dsPurchase1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + this.orderno.DataPropertyName = "orderno"; + this.orderno.HeaderText = "SCR/CF"; + this.orderno.Name = "orderno"; + this.orderno.ReadOnly = true; // // bindingNavigator1 // @@ -733,7 +657,7 @@ namespace FEQ0000 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.Size = new System.Drawing.Size(1282, 39); this.bindingNavigator1.TabIndex = 7; this.bindingNavigator1.Text = "bindingNavigator1"; // @@ -864,7 +788,7 @@ namespace FEQ0000 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.Size = new System.Drawing.Size(1282, 47); this.toolStrip2.TabIndex = 4; this.toolStrip2.Text = "toolStrip2"; // @@ -899,6 +823,171 @@ namespace FEQ0000 this.btRefreshIn.Text = "새로고침"; this.btRefreshIn.Click += new System.EventHandler(this.btRefreshIn_Click); // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39); + // + // toolStripLabel5 + // + this.toolStripLabel5.Name = "toolStripLabel5"; + this.toolStripLabel5.Size = new System.Drawing.Size(55, 36); + this.toolStripLabel5.Text = "합계금액"; + // + // lbSum + // + this.lbSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F, System.Drawing.FontStyle.Bold); + this.lbSum.Name = "lbSum"; + this.lbSum.Size = new System.Drawing.Size(30, 36); + this.lbSum.Text = "0"; + // + // dvc_in + // + this.dvc_in.DataPropertyName = "request"; + this.dvc_in.HeaderText = "요청자"; + this.dvc_in.Name = "dvc_in"; + this.dvc_in.ReadOnly = true; + // + // dvc_manager + // + this.dvc_manager.DataPropertyName = "purchase_manager"; + this.dvc_manager.HeaderText = "구매담당"; + this.dvc_manager.Name = "dvc_manager"; + this.dvc_manager.ReadOnly = true; + // + // dvc_admin + // + this.dvc_admin.DataPropertyName = "purchase_admin"; + this.dvc_admin.HeaderText = "구매승인"; + this.dvc_admin.Name = "dvc_admin"; + this.dvc_admin.ReadOnly = true; + // + // toolStripLabel6 + // + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(55, 44); + this.toolStripLabel6.Text = "구매담당"; + this.toolStripLabel6.Click += new System.EventHandler(this.toolStripLabel6_Click); + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(55, 44); + this.toolStripLabel7.Text = "구매승인"; + this.toolStripLabel7.Click += new System.EventHandler(this.toolStripLabel7_Click); + // + // tbadm + // + this.tbadm.Font = new System.Drawing.Font("맑은 고딕", 17F); + this.tbadm.Name = "tbadm"; + this.tbadm.Size = new System.Drawing.Size(150, 47); + // + // tbman + // + this.tbman.Font = new System.Drawing.Font("맑은 고딕", 17F); + this.tbman.Name = "tbman"; + this.tbman.Size = new System.Drawing.Size(150, 47); + // + // 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"; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle11; + 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"; + dataGridViewCellStyle12.Format = "N0"; + this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle12; + this.dataGridViewTextBoxColumn9.HeaderText = "단가"; + this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; + this.dataGridViewTextBoxColumn9.ReadOnly = true; + // + // dataGridViewTextBoxColumn10 + // + this.dataGridViewTextBoxColumn10.DataPropertyName = "pumamt"; + dataGridViewCellStyle13.Format = "N0"; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle13; + 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"; + this.bs.DataSource = this.dsPurchase; + // + // dsPurchase + // + this.dsPurchase.DataSetName = "dsPurchase"; + this.dsPurchase.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // dataGridViewTextBoxColumn2 // this.dataGridViewTextBoxColumn2.DataPropertyName = "source"; @@ -906,15 +995,6 @@ namespace FEQ0000 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"; @@ -939,8 +1019,8 @@ namespace FEQ0000 // dataGridViewTextBoxColumn17 // this.dataGridViewTextBoxColumn17.DataPropertyName = "pumname"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewTextBoxColumn17.HeaderText = "품명"; this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17"; this.dataGridViewTextBoxColumn17.ReadOnly = true; @@ -948,8 +1028,8 @@ namespace FEQ0000 // dataGridViewTextBoxColumn18 // this.dataGridViewTextBoxColumn18.DataPropertyName = "pumscale"; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle16; this.dataGridViewTextBoxColumn18.HeaderText = "모델"; this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18"; this.dataGridViewTextBoxColumn18.ReadOnly = true; @@ -957,9 +1037,9 @@ namespace FEQ0000 // dataGridViewTextBoxColumn19 // this.dataGridViewTextBoxColumn19.DataPropertyName = "pumqty"; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle13.Format = "N0"; - this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle17.Format = "N0"; + this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle17; this.dataGridViewTextBoxColumn19.HeaderText = "수량"; this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19"; this.dataGridViewTextBoxColumn19.ReadOnly = true; @@ -967,9 +1047,9 @@ namespace FEQ0000 // dataGridViewTextBoxColumn20 // this.dataGridViewTextBoxColumn20.DataPropertyName = "pumprice"; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle14.Format = "N0"; - this.dataGridViewTextBoxColumn20.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle18.Format = "N0"; + this.dataGridViewTextBoxColumn20.DefaultCellStyle = dataGridViewCellStyle18; this.dataGridViewTextBoxColumn20.HeaderText = "단가"; this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20"; this.dataGridViewTextBoxColumn20.ReadOnly = true; @@ -977,9 +1057,9 @@ namespace FEQ0000 // dataGridViewTextBoxColumn21 // this.dataGridViewTextBoxColumn21.DataPropertyName = "pumamt"; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle15.Format = "N0"; - this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle19.Format = "N0"; + this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle19; this.dataGridViewTextBoxColumn21.HeaderText = "금액"; this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21"; this.dataGridViewTextBoxColumn21.ReadOnly = true; @@ -991,13 +1071,6 @@ namespace FEQ0000 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"; @@ -1012,24 +1085,33 @@ namespace FEQ0000 this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24"; this.dataGridViewTextBoxColumn24.ReadOnly = true; // - // toolStripStatusLabel3 + // bs2 // - this.toolStripStatusLabel3.Name = "toolStripStatusLabel3"; - this.toolStripStatusLabel3.Size = new System.Drawing.Size(23, 17); - this.toolStripStatusLabel3.Text = "PO"; + this.bs2.DataMember = "Ipkolist"; + this.bs2.DataSource = this.dsPurchase1; // - // lbPO + // dsPurchase1 // - 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 = "--"; + this.dsPurchase1.DataSetName = "dsPurchase"; + this.dsPurchase1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.Connection = null; + this.tam.EETGW_PurchaseCRTableAdapter = null; + this.tam.PurchaseTableAdapter = null; + this.tam.UpdateOrder = FEQ0000.dsPurchaseTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // // 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.ClientSize = new System.Drawing.Size(1296, 730); this.Controls.Add(this.tabControl1); this.Name = "fItemin"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; @@ -1040,8 +1122,6 @@ namespace FEQ0000 this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ipkolistDataGridView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); @@ -1054,13 +1134,15 @@ namespace FEQ0000 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(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPurchase1)).EndInit(); this.ResumeLayout(false); } @@ -1101,19 +1183,6 @@ namespace FEQ0000 private System.Windows.Forms.ToolStripStatusLabel lbSID; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel4; private System.Windows.Forms.ToolStripStatusLabel lbCOST; - private System.Windows.Forms.DataGridViewButtonColumn dvc_in; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; - 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; @@ -1158,5 +1227,27 @@ namespace FEQ0000 private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn24; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3; private System.Windows.Forms.ToolStripStatusLabel lbPO; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripLabel toolStripLabel5; + private System.Windows.Forms.ToolStripLabel lbSum; + private System.Windows.Forms.DataGridViewButtonColumn dvc_in; + private System.Windows.Forms.DataGridViewTextBoxColumn dvc_manager; + private System.Windows.Forms.DataGridViewTextBoxColumn dvc_admin; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12; + private System.Windows.Forms.ToolStripLabel toolStripLabel6; + private System.Windows.Forms.ToolStripComboBox tbman; + private System.Windows.Forms.ToolStripLabel toolStripLabel7; + private System.Windows.Forms.ToolStripComboBox tbadm; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/fItemin.cs b/SubProject/FEQ0000/fItemin.cs index f13757a..eba7486 100644 --- a/SubProject/FEQ0000/fItemin.cs +++ b/SubProject/FEQ0000/fItemin.cs @@ -11,6 +11,7 @@ using System.Windows.Forms; using NetOffice; using Outlook = NetOffice.OutlookApi; using NetOffice.OutlookApi.Enums; +using System.Security.Cryptography.X509Certificates; namespace FEQ0000 { @@ -43,8 +44,17 @@ namespace FEQ0000 { try { + var search_mananger = tbman.Text.Trim(); + var search_admin = tbadm.Text.Trim(); + if (search_mananger.isEmpty() ) search_mananger = "%"; + if (search_admin.isEmpty() ) search_admin = "%"; + var dt = DateTime.Now.AddYears(-2); - this.ta.Fill(this.dsPurchase.Ipkolist, dt.ToShortDateString(), FCOMMON.info.Login.gcode); + this.ta.Fill(this.dsPurchase.Ipkolist, + dt.ToShortDateString(), + FCOMMON.info.Login.gcode, + search_mananger, search_admin); + ipkolistDataGridView.AutoResizeColumn(0); ipkolistDataGridView.AutoResizeColumn(1); ipkolistDataGridView.AutoResizeColumn(2); @@ -62,7 +72,18 @@ namespace FEQ0000 { System.Windows.Forms.MessageBox.Show(ex.Message); } + UpdateSum(); + } + void UpdateSum() + { + decimal sum = 0; + var drs = this.dsPurchase.Ipkolist.Select(this.bs.Filter); + foreach(dsPurchase.IpkolistRow dr in drs) + { + if (dr.IspumamtNull() == false) sum += dr.pumamt; + } + this.lbSum.Text = $"{sum:N0}"; } private void btFind_Click(object sender, EventArgs e) @@ -108,7 +129,7 @@ namespace FEQ0000 tbFind.Focus(); tbFind.SelectAll(); - + UpdateSum(); } void findText2() { @@ -155,6 +176,27 @@ namespace FEQ0000 private void fItemin_Load(object sender, EventArgs e) { + //구매담당자목록 + using (var tauser = new dsPurchaseTableAdapters.Purchase_ManagerlistTableAdapter()) + { + var lst_man = tauser.GetByManager(FCOMMON.info.Login.gcode); + var lat_adm = tauser.GetByAdmin(FCOMMON.info.Login.gcode); + + tbman.Items.Clear(); + tbadm.Items.Clear(); + + + foreach(dsPurchase.Purchase_ManagerlistRow dr in lst_man) + { + tbman.Items.Add(dr.username); + } + foreach (dsPurchase.Purchase_ManagerlistRow dr in lat_adm) + { + tbadm.Items.Add(dr.username); + } + } + + tbindate.Text = DateTime.Now.ToShortDateString(); refreshData(); } @@ -290,7 +332,16 @@ namespace FEQ0000 { try { - this.ta.FillByTodayIn(this.dsPurchase1.Ipkolist, tbindate.Text, FCOMMON.info.Login.gcode); + var search_mananger = tbman.Text.Trim(); + var search_admin = tbadm.Text.Trim(); ; + if (search_mananger.isEmpty() ) search_mananger = "%"; + if (search_admin.isEmpty() ) search_admin = "%"; + + this.ta.FillByTodayIn(this.dsPurchase1.Ipkolist, tbindate.Text, + FCOMMON.info.Login.gcode, + search_mananger, + search_admin); + dv2.AutoResizeColumns(); } catch (Exception ex) @@ -524,5 +575,17 @@ namespace FEQ0000 "아웃룩의 설정이 정상인지 확인하세요"); } } + + private void toolStripLabel6_Click(object sender, EventArgs e) + { + if (tbman.Text.isEmpty() == false) + tbman.Text = string.Empty; + } + + private void toolStripLabel7_Click(object sender, EventArgs e) + { + if (tbadm.Text.isEmpty() == false) + tbadm.Text = string.Empty; + } } } diff --git a/SubProject/FEQ0000/fItemin.resx b/SubProject/FEQ0000/fItemin.resx index 23d35d9..693460b 100644 --- a/SubProject/FEQ0000/fItemin.resx +++ b/SubProject/FEQ0000/fItemin.resx @@ -127,24 +127,24 @@ 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 @@ -161,52 +161,55 @@ 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= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAWCSURBVFhH3VhZTxtXFB6p20OXl64/oAtVeejyXLVpGxW1 + gWIqvIITSDCkEgQVQ1g7gHdDWUyL0gQakkgpgqolgI1JsI1tAgabgBqWQEhJBLQJlKXLS5MSd0442OPx + 2AaMecgnHcmj8829n+/cs9xLPLSIO254S6js1R7UXDYcrhl0HNE5x9PrXL8e1jmnJTrXiFBl7Ufq3iEu + t+1pocqiTqlyuHIbxv9Udiy5K7rWWC2jzjmLr0Ue75GWR/lKiwJWh2ydv88miGl7JpBLdkcnafpcZc23 + 7rEJCWRsAnmkeZ76k7OBTFDas8j56qIG6aEhkJvER78ZuaU1rLKKAFN1LruPN8+sZzdOrWTU/zIHBr/F + WtttHMYDEM02BlhR841/BAp7LVJDQ6AwH8tqmLjDNpjWsOLOPjG2mFI1OCBUWusTSjr3xRV3vbY/p/vJ + mEzDE7EFF178rKjjfRzKg0ACN8RZty6OV2pKPnZy8nfmQFrDmlt6ZnpZrLEbecUXX0f6lhFIYNapiTu8 + clMC0oID9hx8VuYg6s4Vd0pF/xivrOtdpG4bwT4x+HjkpVeRyg6IVggI5p4j2xb+E2n67PH5Pz2L1B3B + V6DvHFr9qjtZ3edITGx5BOn+gFTCjFZYuWSVzSaRuB5D2o6xKTDv3OzfIqV1Bsamz0X+uHCXr7AUI90X + kISpUJ+mvwD/Ej5ruCu3CRAI4qgKpDtAtj+XWu2Y9J1vzZ1W67wGwYaveAEVgpmEpU1Ty+HsOSaEyp5F + EIePBFdu/lh6enqJPqfs57l16kuWIcULKmW46ERIJWJtXwe6dwWcEqMWf3og1tqNzD1/sKLfie4NQOGH + 2konQQ7cSSrZLjhkz9s5p6d8VhESPaegOxopVFKWWSqZhf9Q5cCedSMp2v4B+tzK9iW3QNGrRDe1zBX9 + ejoByhdUCHRHHEKF7ZRG7xvRyZX9negmiEPVjkG6M++HmXVOkf4DdEcc1N7cn3d21ie9pVQPDaCbICS1 + QxN0J+yB+Hx98Ky+i/i0uOMVadP0Ml0DaEI3QaTXXZmhOzPqXXOJpOUpdEccMBfMSdcAmtBNEGm64Rt0 + 514LjCENz0jqRxfoGtLrhr0CU6uHfTI6FfbLsfnGl9EdcUCrltU4tkbXAGccdLMEybnZewlk10fojjhi + qSDJPT+zTtdw+OtBB7oJAk5mdCcUcQh9dEccQqXlBLNxSNbYvWlGIDdXqKjkSCfsZaKG1aLPvZGozd5E + nUh2vyk9M7lKJ315cuqP+BLzO0iJGLiK7uicxqs+pS6naXKVQzXOSNmAf7OwSjULdiO6PWAr+OFApLZe + gsaEPrdfswDgUUtKtvi2W7lUK8SXWWKQQu2VXh20TPgYNnhl5g+hKNDnhHYLtCDFC2hY02pcU3Qy2JEa + 5zVquV8AcdBsQtOJr4SFmALD86lVg+NwEKPPF7BhBfDllrJSlpYf2nMQB8+7ITCRbHk8Sd3X59fyt87f + 5cmspUjzBxyakjW2If+Duvc5XIGwciBO0bbgk/ceHJqouYMemgAJCmPU0brRoMdDpG4bsOfgszJXDkxS + feVmAmmMQmpwJJabuIFuFXYi8PPirjdEapseAoK558BgLq7MLEJ6aAjKLbWF52f/Yg4ExiYwrqBz3yfS + zpfg2gOajAMF7VFQvkQK63epVBLO/P7qEjOVbFp2w/htrsKUiUOFRjBxYGwC4aIIVgcujr7Qjc5nNYyt + FZ69fp/tU24a7Dn4rHyZSYDDhAZcfSWpbb9Jvh25Hsi4cstNpHsAotlEBLLC1vl/ISC2vOfCxVYFQhKG + PMeX95Iho3U3EUyg4sLig9oK5QsqxF42wh7AhTlcnMPVCXTn0GzCoUdccVkvVJpVEMVIfdhAEP8Dh+Ge + 81qy7MgAAAAASUVORK5CYII= True + + True + + + True + 354, 17 240, 17 - - 240, 17 - 553, 17 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/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 @@ -217,7 +220,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -226,7 +229,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -235,7 +238,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/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 @@ -280,11 +283,11 @@ Kw/6HydJHj5byGPQIkKNAAAAAElFTkSuQmCC - - 418, 17 + + 917, 17 - - 480, 17 + + 619, 17 True @@ -304,7 +307,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/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 @@ -315,7 +318,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -324,7 +327,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -333,7 +336,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/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 @@ -366,21 +369,21 @@ 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 @@ -389,57 +392,66 @@ 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 - UYypjxpYrP8AVUyhVNNGtiwAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAWCSURBVFhH3VhZTxtXFB6p20OXl64/oAtVeejyXLVpGxW1 + gWIqvIITSDCkEgQVQ1g7gHdDWUyL0gQakkgpgqolgI1JsI1tAgabgBqWQEhJBLQJlKXLS5MSd0442OPx + 2AaMecgnHcmj8829n+/cs9xLPLSIO254S6js1R7UXDYcrhl0HNE5x9PrXL8e1jmnJTrXiFBl7Ufq3iEu + t+1pocqiTqlyuHIbxv9Udiy5K7rWWC2jzjmLr0Ue75GWR/lKiwJWh2ydv88miGl7JpBLdkcnafpcZc23 + 7rEJCWRsAnmkeZ76k7OBTFDas8j56qIG6aEhkJvER78ZuaU1rLKKAFN1LruPN8+sZzdOrWTU/zIHBr/F + WtttHMYDEM02BlhR841/BAp7LVJDQ6AwH8tqmLjDNpjWsOLOPjG2mFI1OCBUWusTSjr3xRV3vbY/p/vJ + mEzDE7EFF178rKjjfRzKg0ACN8RZty6OV2pKPnZy8nfmQFrDmlt6ZnpZrLEbecUXX0f6lhFIYNapiTu8 + clMC0oID9hx8VuYg6s4Vd0pF/xivrOtdpG4bwT4x+HjkpVeRyg6IVggI5p4j2xb+E2n67PH5Pz2L1B3B + V6DvHFr9qjtZ3edITGx5BOn+gFTCjFZYuWSVzSaRuB5D2o6xKTDv3OzfIqV1Bsamz0X+uHCXr7AUI90X + kISpUJ+mvwD/Ej5ruCu3CRAI4qgKpDtAtj+XWu2Y9J1vzZ1W67wGwYaveAEVgpmEpU1Ty+HsOSaEyp5F + EIePBFdu/lh6enqJPqfs57l16kuWIcULKmW46ERIJWJtXwe6dwWcEqMWf3og1tqNzD1/sKLfie4NQOGH + 2konQQ7cSSrZLjhkz9s5p6d8VhESPaegOxopVFKWWSqZhf9Q5cCedSMp2v4B+tzK9iW3QNGrRDe1zBX9 + ejoByhdUCHRHHEKF7ZRG7xvRyZX9negmiEPVjkG6M++HmXVOkf4DdEcc1N7cn3d21ie9pVQPDaCbICS1 + QxN0J+yB+Hx98Ky+i/i0uOMVadP0Ml0DaEI3QaTXXZmhOzPqXXOJpOUpdEccMBfMSdcAmtBNEGm64Rt0 + 514LjCENz0jqRxfoGtLrhr0CU6uHfTI6FfbLsfnGl9EdcUCrltU4tkbXAGccdLMEybnZewlk10fojjhi + qSDJPT+zTtdw+OtBB7oJAk5mdCcUcQh9dEccQqXlBLNxSNbYvWlGIDdXqKjkSCfsZaKG1aLPvZGozd5E + nUh2vyk9M7lKJ315cuqP+BLzO0iJGLiK7uicxqs+pS6naXKVQzXOSNmAf7OwSjULdiO6PWAr+OFApLZe + gsaEPrdfswDgUUtKtvi2W7lUK8SXWWKQQu2VXh20TPgYNnhl5g+hKNDnhHYLtCDFC2hY02pcU3Qy2JEa + 5zVquV8AcdBsQtOJr4SFmALD86lVg+NwEKPPF7BhBfDllrJSlpYf2nMQB8+7ITCRbHk8Sd3X59fyt87f + 5cmspUjzBxyakjW2If+Duvc5XIGwciBO0bbgk/ceHJqouYMemgAJCmPU0brRoMdDpG4bsOfgszJXDkxS + feVmAmmMQmpwJJabuIFuFXYi8PPirjdEapseAoK558BgLq7MLEJ6aAjKLbWF52f/Yg4ExiYwrqBz3yfS + zpfg2gOajAMF7VFQvkQK63epVBLO/P7qEjOVbFp2w/htrsKUiUOFRjBxYGwC4aIIVgcujr7Qjc5nNYyt + FZ69fp/tU24a7Dn4rHyZSYDDhAZcfSWpbb9Jvh25Hsi4cstNpHsAotlEBLLC1vl/ISC2vOfCxVYFQhKG + PMeX95Iho3U3EUyg4sLig9oK5QsqxF42wh7AhTlcnMPVCXTn0GzCoUdccVkvVJpVEMVIfdhAEP8Dh+Ge + 81qy7MgAAAAASUVORK5CYII= + + 240, 17 + 725, 17 + + 418, 17 + + + 480, 17 + \ No newline at end of file