From 487d2ebe7620d1c73e55c7d01c4312de1c78edc6 Mon Sep 17 00:00:00 2001 From: chi Date: Sun, 11 Jul 2021 13:26:26 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EA=B0=80($)=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- Project/Setting.cs | 4 +- Project/fMain.cs | 4 +- SubProject/FCM0000/Item/fItemAdd.Designer.cs | 37 +- SubProject/FCM0000/Item/fItemAdd.cs | 32 +- SubProject/FCM0000/Item/fItemAdd.resx | 3 + SubProject/FCM0000/Item/fItems.Designer.cs | 299 +++++++-------- SubProject/FCM0000/Item/fItems.resx | 94 +++-- SubProject/FCM0000/Item/fLovItem.Designer.cs | 68 +++- SubProject/FCM0000/Item/fLovItem.cs | 27 +- SubProject/FCM0000/Item/fLovItem.resx | 29 +- SubProject/FCM0000/dsMSSQL.Designer.cs | 140 +++++-- SubProject/FCM0000/dsMSSQL.xsd | 146 ++++---- SubProject/FCM0000/dsMSSQL.xss | 2 +- SubProject/FCOMMON/Info.cs | 1 + .../FEQ0000/Purchase/fPurchase.Designer.cs | 345 +++++++++--------- SubProject/FEQ0000/Purchase/fPurchase.resx | 44 +-- .../Purchase/fPurchase_Add.Designer.cs | 91 +++-- SubProject/FEQ0000/Purchase/fPurchase_Add.cs | 51 ++- .../FEQ0000/Purchase/fPurchase_Add.resx | 38 +- SubProject/FEQ0000/dsPurchase.Designer.cs | 92 ++++- SubProject/FEQ0000/dsPurchase.xsd | 20 +- .../FPJ0000/Project/fProjectList.Designer.cs | 3 - SubProject/FPJ0000/Project/fProjectList.resx | 40 +- 24 files changed, 988 insertions(+), 626 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 154a7f9..29e6421 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("21.07.09.1100")] -[assembly: AssemblyFileVersion("21.07.09.1100")] +[assembly: AssemblyVersion("21.07.11.1300")] +[assembly: AssemblyFileVersion("21.07.11.1300")] diff --git a/Project/Setting.cs b/Project/Setting.cs index 50be9bd..b0a26fa 100644 --- a/Project/Setting.cs +++ b/Project/Setting.cs @@ -33,7 +33,8 @@ namespace Project #endregion - + [DisplayName("원달러환율")] + public double wondoller { get; set; } [Description("시작 화면")] public eFormList startForm { get; set; } @@ -90,6 +91,7 @@ namespace Project public override void AfterLoad() { + if (wondoller < 1) wondoller = 1200; if (Language.isEmpty()) Language = "Kor"; if (Password_Setup.isEmpty()) Password_Setup = "0000"; if (Password_User.isEmpty()) Password_User = "9999"; diff --git a/Project/fMain.cs b/Project/fMain.cs index a3dabcb..b550d3b 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -133,6 +133,7 @@ namespace Project Update_Site(); bw.RunWorkerAsync(); //background worker + UpdateControls(); //사용기록추적 Pub.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion); @@ -323,7 +324,8 @@ namespace Project void UpdateControls() { - + //환율재적용 - 210711 + FCOMMON.info.dollertowon = Pub.setting.wondoller; } #endregion diff --git a/SubProject/FCM0000/Item/fItemAdd.Designer.cs b/SubProject/FCM0000/Item/fItemAdd.Designer.cs index 8ccc9ee..d64e0c6 100644 --- a/SubProject/FCM0000/Item/fItemAdd.Designer.cs +++ b/SubProject/FCM0000/Item/fItemAdd.Designer.cs @@ -36,6 +36,7 @@ System.Windows.Forms.Label memoLabel; System.Windows.Forms.Label priceLabel; System.Windows.Forms.Label label1; + System.Windows.Forms.Label label2; this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter(); this.tbName = new System.Windows.Forms.TextBox(); this.tbSid = new System.Windows.Forms.TextBox(); @@ -48,6 +49,7 @@ this.tbUnit = new System.Windows.Forms.TextBox(); this.btOK = new System.Windows.Forms.Button(); this.dsMSSQL = new FCM0000.dsMSSQL(); + this.tbPriceD = new System.Windows.Forms.TextBox(); nameLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); modelLabel = new System.Windows.Forms.Label(); @@ -56,6 +58,7 @@ memoLabel = new System.Windows.Forms.Label(); priceLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.SuspendLayout(); // @@ -122,7 +125,7 @@ // priceLabel // priceLabel.AutoSize = true; - priceLabel.Location = new System.Drawing.Point(34, 188); + priceLabel.Location = new System.Drawing.Point(34, 189); priceLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); priceLabel.Name = "priceLabel"; priceLabel.Size = new System.Drawing.Size(55, 30); @@ -198,10 +201,10 @@ // // tbPrice // - this.tbPrice.Location = new System.Drawing.Point(97, 185); + this.tbPrice.Location = new System.Drawing.Point(97, 187); this.tbPrice.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); this.tbPrice.Name = "tbPrice"; - this.tbPrice.Size = new System.Drawing.Size(561, 35); + this.tbPrice.Size = new System.Drawing.Size(241, 35); this.tbPrice.TabIndex = 9; this.tbPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -231,7 +234,7 @@ // this.btOK.Location = new System.Drawing.Point(97, 357); this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(561, 40); + this.btOK.Size = new System.Drawing.Size(561, 66); this.btOK.TabIndex = 17; this.btOK.Text = "확인"; this.btOK.UseVisualStyleBackColor = true; @@ -242,11 +245,34 @@ this.dsMSSQL.DataSetName = "dsMSSQL"; this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // + // label2 + // + label2.AutoSize = true; + label2.ForeColor = System.Drawing.Color.Blue; + label2.Location = new System.Drawing.Point(348, 189); + label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(25, 30); + label2.TabIndex = 18; + label2.Text = "$"; + // + // tbPriceD + // + this.tbPriceD.ForeColor = System.Drawing.Color.Blue; + this.tbPriceD.Location = new System.Drawing.Point(383, 187); + this.tbPriceD.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); + this.tbPriceD.Name = "tbPriceD"; + this.tbPriceD.Size = new System.Drawing.Size(275, 35); + this.tbPriceD.TabIndex = 19; + this.tbPriceD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // fItemAdd // this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(669, 409); + this.ClientSize = new System.Drawing.Size(669, 436); + this.Controls.Add(label2); + this.Controls.Add(this.tbPriceD); this.Controls.Add(this.btOK); this.Controls.Add(nameLabel); this.Controls.Add(this.tbName); @@ -293,5 +319,6 @@ public System.Windows.Forms.TextBox tbPrice; public System.Windows.Forms.TextBox tbSupplyIdx; public System.Windows.Forms.TextBox tbUnit; + public System.Windows.Forms.TextBox tbPriceD; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Item/fItemAdd.cs b/SubProject/FCM0000/Item/fItemAdd.cs index 1cb747c..1f35bde 100644 --- a/SubProject/FCM0000/Item/fItemAdd.cs +++ b/SubProject/FCM0000/Item/fItemAdd.cs @@ -43,13 +43,13 @@ namespace FCM0000.Item private void btOK_Click(object sender, EventArgs e) { - if(tbName.Text.Trim()=="") + if (tbName.Text.Trim() == "") { - FCOMMON.Util.MsgE("품명은 필수 입니다"); + FCOMMON.Util.MsgE("품명은 필수 입니다"); tbName.Focus(); return; } - if(tbModel.Text.Trim() == "") + if (tbModel.Text.Trim() == "") { FCOMMON.Util.MsgE("모델은 필수 입니다"); tbModel.Focus(); @@ -59,7 +59,7 @@ namespace FCM0000.Item var pumModel = tbModel.Text.Trim(); var searchKey = pumName + pumModel; var cnt = (int)(ta.ExistCheck(FCOMMON.info.Login.gcode, searchKey)); - if(cnt > 0) + if (cnt > 0) { FCOMMON.Util.MsgE("동일 품명 모델의 정보가 존재 합니다"); return; @@ -77,14 +77,36 @@ namespace FCM0000.Item newdr.supplyidx = int.Parse(tbSupplyIdx.Text.Trim()); newdr.memo = tbMemo.Text.Trim(); newdr.cate = "--"; + + + //21711 + if (tbPriceD.Text.isEmpty() == false) + { + if (decimal.TryParse(tbPriceD.Text, out decimal priced)) + { + newdr.priceD = priced; + if(decimal.TryParse(tbPrice.Text,out decimal priceWon)==false) + { + var ConvertedPrice = (decimal)((double)priced * FCOMMON.info.dollertowon); + tbPrice.Text = ConvertedPrice.ToString(); + } + } + else + { + FCOMMON.Util.MsgE("입력값이 숫자가 아닙니다. 단가($)를 사용할 수 없습니다"); + } + } + + int price; int.TryParse(tbPrice.Text, out price); newdr.price = price; + newdr.scale = 1; newdr.unit = tbUnit.Text.Trim(); if (newdr.unit == "") newdr.unit = "EA"; newdr.disable = false; - newdr.import = ""; + newdr.import = ""; this.dsMSSQL.Items.AddItemsRow(newdr); try { diff --git a/SubProject/FCM0000/Item/fItemAdd.resx b/SubProject/FCM0000/Item/fItemAdd.resx index e3f9fe1..b4313f3 100644 --- a/SubProject/FCM0000/Item/fItemAdd.resx +++ b/SubProject/FCM0000/Item/fItemAdd.resx @@ -147,4 +147,7 @@ 17, 17 + + False + \ No newline at end of file diff --git a/SubProject/FCM0000/Item/fItems.Designer.cs b/SubProject/FCM0000/Item/fItems.Designer.cs index a42ca56..a346042 100644 --- a/SubProject/FCM0000/Item/fItems.Designer.cs +++ b/SubProject/FCM0000/Item/fItems.Designer.cs @@ -30,17 +30,18 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItems)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CurrencyCellType currencyCellType3 = new FarPoint.Win.Spread.CellType.CurrencyCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.ComboBoxCellType comboBoxCellType3 = new FarPoint.Win.Spread.CellType.ComboBoxCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CurrencyCellType currencyCellType1 = new FarPoint.Win.Spread.CellType.CurrencyCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.ComboBoxCellType comboBoxCellType1 = new FarPoint.Win.Spread.CellType.ComboBoxCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -78,10 +79,11 @@ this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.cmbSort = new System.Windows.Forms.ToolStripComboBox(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); + this.tbSearch = new System.Windows.Forms.ToolStripTextBox(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.panel1 = new System.Windows.Forms.Panel(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.memoTextBox = new System.Windows.Forms.TextBox(); @@ -115,8 +117,7 @@ this.taPurchase = new FCM0000.dsMSSQLTableAdapters.PurchaseTableAdapter(); this.bsStaff = new System.Windows.Forms.BindingSource(this.components); this.taStaff = new FCM0000.dsMSSQLTableAdapters.StaffTableAdapter(); - this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); - this.tbSearch = new System.Windows.Forms.ToolStripTextBox(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -124,12 +125,12 @@ this.cm1.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.groupBox1.SuspendLayout(); this.panIMage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.toolStrip2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -230,6 +231,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -285,6 +287,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 37); this.tbFind.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -458,6 +461,21 @@ this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); // + // toolStripLabel6 + // + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel6.Text = "검색"; + // + // tbSearch + // + this.tbSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbSearch.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbSearch.Name = "tbSearch"; + this.tbSearch.Size = new System.Drawing.Size(100, 37); + this.tbSearch.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSearch_KeyDown); + // // toolStripButton2 // this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); @@ -490,120 +508,6 @@ this.fpSpread1.Size = new System.Drawing.Size(877, 551); this.fpSpread1.TabIndex = 3; // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 11; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "모델명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "매입가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "제조사"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "공급처"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 42F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 88F; - this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "cate"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "분류"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "품명"; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID#"; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "model"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; - currencyCellType3.DecimalPlaces = 0; - currencyCellType3.MaximumValue = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - currencyCellType3.MinimumValue = new decimal(new int[] { - 10000000, - 0, - 0, - -2147483648}); - currencyCellType3.NegativeRed = true; - currencyCellType3.NullDisplay = "--"; - currencyCellType3.Separator = ","; - currencyCellType3.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType3; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "price"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "매입가"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 123F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "manu"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "제조사"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "scale"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "규격"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "unit"; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "단위"; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType21; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "supply"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "supplyname"; - this.fpSpread1_Sheet1.Columns.Get(9).Visible = false; - comboBoxCellType3.AllowEditorVerticalAlign = true; - comboBoxCellType3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - comboBoxCellType3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - comboBoxCellType3.ButtonAlign = FarPoint.Win.ButtonAlign.Right; - comboBoxCellType3.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = comboBoxCellType3; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "supplyidx"; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "공급처"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "supply"; - this.fpSpread1_Sheet1.DataAutoCellTypes = false; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // panel1 // this.panel1.Dock = System.Windows.Forms.DockStyle.Right; @@ -886,19 +790,128 @@ // this.taStaff.ClearBeforeFill = true; // - // toolStripLabel6 + // fpSpread1_Sheet1 // - this.toolStripLabel6.Name = "toolStripLabel6"; - this.toolStripLabel6.Size = new System.Drawing.Size(31, 34); - this.toolStripLabel6.Text = "검색"; - // - // tbSearch - // - this.tbSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbSearch.Name = "tbSearch"; - this.tbSearch.Size = new System.Drawing.Size(100, 37); - this.tbSearch.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.tbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSearch_KeyDown); + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 12; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "품명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "모델명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "단가($)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "제조사"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "규격"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "공급처"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 42F; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX"; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 88F; + this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "cate"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "분류"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "품명"; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID#"; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "model"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명"; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; + currencyCellType1.DecimalPlaces = 0; + currencyCellType1.MaximumValue = new decimal(new int[] { + 10000000, + 0, + 0, + 0}); + currencyCellType1.MinimumValue = new decimal(new int[] { + 10000000, + 0, + 0, + -2147483648}); + currencyCellType1.NegativeRed = true; + currencyCellType1.NullDisplay = "--"; + currencyCellType1.Separator = ","; + currencyCellType1.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType1; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "price"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 123F; + numberCellType2.DecimalPlaces = 3; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "priceD"; + this.fpSpread1_Sheet1.Columns.Get(6).ForeColor = System.Drawing.Color.Blue; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "단가($)"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 94F; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "manu"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "제조사"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 113F; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "scale"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "규격"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 84F; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "unit"; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "supplyname"; + this.fpSpread1_Sheet1.Columns.Get(10).Visible = false; + comboBoxCellType1.AllowEditorVerticalAlign = true; + comboBoxCellType1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + comboBoxCellType1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + comboBoxCellType1.ButtonAlign = FarPoint.Win.ButtonAlign.Right; + comboBoxCellType1.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = comboBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "supplyidx"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "공급처"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "supply"; + this.fpSpread1_Sheet1.DataAutoCellTypes = false; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // // fItems // @@ -922,7 +935,6 @@ this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.panIMage.ResumeLayout(false); @@ -931,6 +943,7 @@ this.toolStrip2.ResumeLayout(false); this.toolStrip2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1011,8 +1024,8 @@ private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripButton toolStripButton6; private System.Windows.Forms.ToolStripButton toolStripButton9; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripLabel toolStripLabel6; private System.Windows.Forms.ToolStripTextBox tbSearch; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Item/fItems.resx b/SubProject/FCM0000/Item/fItems.resx index ee257a8..02c2669 100644 --- a/SubProject/FCM0000/Item/fItems.resx +++ b/SubProject/FCM0000/Item/fItems.resx @@ -223,24 +223,21 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVEhLtVZbTxNBFCZeYrxEjY8++KKiMfHFRAgviv4H - o/4Bn9RoDBETzcQgRmjLtrbQVuyNskBpqKXb2eVSiaHQ3YWHYoAWQpGbCbzU4BMkQtaeZpoYM7S7sP2S - L5OdPfN9mXNmzm6FHnhuChx/ZXRefdvacwdGeCav9Me93t7DjJ9/5uUlITieXo0l17fHln4rMMKzKzfP - dEafIoQOkSUHR7MvVOMdkEU582vne1ZR9qKcye64sZh474vUkKX7B+MXHkYmF1dpRnsxJM6tmFn+AZHQ - DoM7cjMszy/TxEsxNJH52czuY+dQU0gvTVQtIe2aaw4HqVRNS1FayO7AgSOS6uDB4gBNTCu9WBKIZGm8 - MHScDMVTazQhrYSrpvqe1zV9vvJ1amObJqSV0eT6Vl2T+zKRLg7U1nV3bGmTKqSV8R+bCrJ21xLp4qg3 - fqrEyY0tmpBWwo7rTe2XiHRxIOQ8AbWhCWllXyK9oqmXQ++lCWmlR5AwkVQHuH/Qe2liaiktZf+YO/Bj - IqkO0HFcwsE6l4cXxzV3rtyCI0ZP/3C/NE8VLcXwRGZNc69+YrEca+kIc1xiWgnEJpXIxAJVfC/C14np - xveJnDrAiTZ4vwicOK3wckrhEjNKsyccd3EJEXovzahAqCmk1+AKVxM5dUCM52xup/GoOJM3hdHoDg9C - BqBWcODcgsTDFYH7CX8gMIbE9DL0ZDhI2mtqaj9nZfFoVJrNm2JxVmnxc0O0Owhz0GSQvbsWxn3/cyFr - 13lrF5b5gqk8q5jZ6Ciy2U6REP3RYPFetAXwFM4ZgimYmzsjk5ABEqI/Gu3+a/bA4EzeML/TlGJj8RRk - gIToj3eOnhuOYCxVMAXag0ISmX0XSIj+aHB03nL0DS/8Z5rKfb4qSYj+ePnBeaYtGJv/17Q9FEu/tgau - k5Dy4A3jqg6OjO8WTF25naOPbBV5XT48cjqPMn7uW+/I2K6zb2iusZW9TV6VH2COTN4qZPGfJlNlRkXF - XxFnWoqmzzQrAAAAAElFTkSuQmCC + o/4Bn9RoDBETzcQgRmjLtrbQVuydBUpDLd3uLpdKDIXuLiQWA7RgUW4m8AAJPkEiZO1ppokxA92B7Zd8 + mezsme/LnDNzdsv0wFNT8OgLo/Py6+bOWzDCM36lP+50dR1kAsITryCLoZHMYvzr8ubw3G8VRnh25eaZ + tthjhNABvGT/aPSFq7y9iqRk17a+ranqTlSyq1tuXkq+9UWr8NK9gwmI96NjPxZJRjsxLE0vmFnhHpag + h8EdvR5RZuZJ4sUYHp391cjuYedQU0gvSVQrIe3UNYeDVKymxSh/X92CA4cltcHDS70kMVp6eVnEksXx + zOA/Hk6kl0hCtISrpvme1zR8vPQ5tbJJEqIll1reqGlwX8TSuwO1tN8enlsnCtEy8XNdRdaOaiy9O2qN + H8pjqZUNkhAtYce1ptYLWHp3IOQ8BrUhCdGyO5lZoOrl0HtJQrT0iDKPJbUB7h/0XpKYVspzq3/Mfv4h + ltQG6DgucX+dyyNII9SdK7fgkNHTM9AjzxBFizEyOrtE3asfWSxHmvwRjktOqMH4mBodzRLFdyJ8nZgO + /i6W0wY40QbvJ5GTJlRBSatcclJt9EQSLi4pQe8lGRUINYX0GlyRSiynDYjxnM7tNBGTJvOmMBrdkT7I + ANQKDpxblAW4InA/4Q8ExrCUmYeeDAeJvqam1jNWlh+KyVN5U16aUpsCXD/pDsIcNBlk76iGcc//XMja + ftbazitCwVSZUs1sbAjZbCdwiP6os3jP24L8OJ8zBFMwN7dFxyADOER/1NsDV+zBvsm8YX6nadXG8uOQ + ARyiP944Oq85QvF0wRRoD4kpZPadwyH6o87RdsPRPZD9zzSd+3yV4xD98fyd81RLKD7zr2lrOJ55aQ1e + xSGlwSvGVRkaHN4umLpyO0fv2Qr8unR44HQeZgLcl67BxLazu3+6vpm9iV+VHmCOTN4KZAmcxFMlRlnZ + Xz/wWnKhL5THAAAAAElFTkSuQmCC - - 17, 17 - 389, 10 @@ -285,25 +282,25 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQkSURBVEhLtVdbT1NZGD3RMeNP8BITjbfRdy/JPPhq1Ayi - mA4KxdIq1VHwUqmC5GAdkfYA7WgRGayCQKujqEGHSrEBpC0tVYHRiI7SFlS8RCng5c2pXYe96RGqQ+W4 - kp2e5Fv7W92X77KZWLFhw1+Tf9l3Zcb6nPpl63Lqf47Lvj5rBdv4AzGLCwnbsEBW6OK2l3Tad5u6enaZ - Hvaz1b7/DtX0hTLL7n1I1NhXEao4kLCNs+V/eC37zz56o6sLhjjrwJjx++WXoY2ahjVkysQh1TlVqop/ - n3LW6IJ0jBaWalvsGSc7A6NHUr6jd32ONY7QxgJnmKpzleZW970XCmDFmZaewZ2ld13bjO0WhaGtTGHw - mLYY3LUJ7I2lZDrzW0lnvXAehqo88CKZcyYTSnRANK/2yUc6SVc3EFJXPH6WWugpleQ1LCC0L2KscDAk - LWitJebowPYKV6r9uz+UdszbnMQ1zyGU/0W0Fauru9+n5DvTCeVz4CINn2lEVK5vu7RyZ92PhDIuUGG1 - JRDMv9Y/Iq4q7+qNugCFwX2OXiRsb9rxW02xigIQxpkm5bfIlcZ2FxWGT0WRt5LQhrFJY1+IkKEknGks - 2yvEpqOOpiTO+Su+12qaFsEX9asq971I1Njm80RAxrk4Gqf4lRV5ThJTzIhTW2eTTx4Kved0JCTDvsOJ - iJgYBhmJ/qtss39onfBfTRCIhEyzf5D631bcYeMNiFukQWpIL+lw8gYRsePEP27qH1p8bl+ddXXmgQrf - ADUojXfOEb5oUB67c576P1DhH0CRYeJZ2/JDNf6RhJGq95YSvmiAT+ofxSU+y7acQXnLrfF9V+EthrY/ - qf/ci76P8Tl1S/itFh5+mtEr/lYXt1+g/lFSV6muTWO2br01RXi5cBEIXzQIL9eesgd+XGjeoDzRfoMa - Ms2BQTHDKZFt/Cnb3DNE/W8v6WggpvDhF7gLhEGOoCcmHqOTQiyQF3lOCZOTlHNqiYlhEg7aF+6t7H5F - /xXSXMKRm4thQ/pDGuSJMQItk7ry4XPqd09V9+uEvOvziHkYcr3HgkROSeEi4Uw82iTdV/WoD4mf0MaN - cJKYCh8Rn0FUuypijkCis8/dfeb+EyqMkqY2B4L4jlUYojK9uxallfrbe6arVxLuSAnlc6RoHcrcGv9b - SqYjFmFsr9J42yEUZS/63kkLWjIIJTpSCluvRi7a+IUlGtsieaHHhDMVHhnaqBTO8fVql6xtluBMhaIY - QmE0dmjw0Oih4VMWd5xHnB40B4bo7aUDK4XoSNxGA1pPtKDRWlO0rITGoJVFSysUGDuCIVX4TJN1LbvI - tInja8JYMUJGpm+r/uJF+lbguYJnC54vqDTIvRmmrgCy32auVSs5bJ9LqOICRRwPNTzYUNnis6zTWZad - RMzjBMN8Aik29AY1BJE5AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQkSURBVEhLtVdbT1NZGD0ZnehPcJyYaLyNvo+a+OCrUSOi + mA4KxdIq9YqX2o4gOVgdpD1AqxYRsQoCrTfUoFIpNsDQlpY6AmpER0sLKupkhgIzzpvWrsPe9AhVqRxX + stOTfGt/q/vyXTYTL9avvzRp9f7r09fl1C9em1O/NCH79oxlbONkYhYXErZhnqzQzW0r6XTsMXf17DY/ + 6Wer/O8P1fSF1WUP/0/WOlYQqjiQsI0z5cd81l/PP/1HXxcKc7aBMePItTfhDdqGVWTKxCHVu1Sqij9f + cLbYgnSMFpbqWhyZpzqDo0dKvrN3XY4tgdDGAmeYrneX5lb3vRUKYMVqa8/gztIH7q2mdqvC2FamMHrN + m42e2iT2ziIyndle0lkvnIehKg++TuVcqYQSGxDNq+19Ryfp6wbCmopnL9MLvaWSvIZ5hPZJjBUOhaUF + rbXEHBvYXuFKdbf6wxnHfc0pXPMsQvkiYq1YXf3sbVq+axehfAxcpOEzjYrKDW1Xl++sm0Io4wIV1liD + ofyb/SPiqvKu3pgLUBg9F+hFwvZmnLjbFK8oAGGcaUp+i1xpandTYfhUFPkqCW0YG7WO+QgZSsKZxrO9 + Qmw86mxK4Vy/4HuNtmkBfFG/qvLu18la+1yeCMg4N0fjFL+yIu8pYoobCRrbTPLJQ2Hwno2GZMR3JBER + E8MgI9F/lW0JDK0V/qsJApGgtgQGqf+txR123oC4RRqkhl0lHS7eICJ2nLzvof6hxef2lVk3fjxQ0T1A + DUrTvQuELxqUx+9dpP4PVAQGUGSYRNa+5FBN90jCSDf4SglfNMAn9Y/ikphlX8KgvOXW+L+p8GZj22nq + P/eK/11iTt3P/FYLDz/D5BN/q4vbL1P/KKkrVDenMVu23P1eeLlwEQhfNAgv196yxwFcaN6gPNl+hxrU + luCgmOGUzDb+lG3pGaL+t5V0NBBT5PALPAXCIEfQExOP0UkhHsiLvGeEyUnKuXTExDBJBx3z91X6/6L/ + Cmku6bffF8KG9Ic0yBPjBFomTeWTV9Tv3ir/30l5t+cQ8zDkBq8ViZySIkXClXy0Sbq/6mkfEj+hjRuR + JDEVPqI+Q6h2VcQchUTvmL3n3KPnVBglTWMJhvAdrzBEZQZPLUor9bfvXFevJNKREsrHSNM5lbk1gX8p + mY54hLG9StMfTqEoe8X/n7SgJZNQYiOtsPVG9KKNX1iitS+QF3rNOFPhkaGNSuOcn692qbpmCc5UKIoh + FEZjhwYPjR4aPmVxx0XE6UFLcIjeXjqwUoiOxG0soPVECxqrNUXLSmgMWlm0tEKBsSMUVkXONFXfsptM + mzg+J4wVI2RkhrbqT16krwWeK3i24PmCSoPcm2nuCiL7beJadZLDjtmEKi5QxPFQw4MNlS0xy/YDy7Lf + EfM4wTAfAMBc8/dZiGQLAAAAAElFTkSuQmCC @@ -322,9 +319,6 @@ 193, 56 - - 193, 56 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -351,18 +345,18 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKPSURBVDhPzZLbSptBFIX/Nyj0MTxcSAwiihoRBS9EQVQ0 - 5GRiDqhBUREJRqlR8RgSczZJaRpBQREqTRUpXlijIBKlMbFVaPsGpVDohX6d/6f0FdqBxczArLXX2nuk - /2OFQiHP+vp6dmlpKbewsHDtdrtvJycn70dGRr4ODQ19m5iYuF9cXPT+eS719vaqOjs7nyuXSCTyLBwO - c3Fxwfn5OWdnZ5yenhLzu/n15TU/3mvwuOz4/T4GBwd1Wq32uwACT319fWpJVPi8t7fHzc0N+/v7pFIp - kskkmUwGWTiRSHBycsLOzg6jo6PY7XYcDgdWq5WOjo6iJFQ5Pj5ma2tL2R8eHigWi+TzeS4vLxXBubk5 - REwODg6Ix+Osrq4iItHQ0IAkK8rko6MjMtlP2KMf0QXzaAX6Q9e8evOBYDCI6AeyU9mVzWZjdnaWuro6 - JNlKLBajUCjgEGRT5JaBWAHzZgGDOPeHcuzu7qLT6dje3sbn86HX63G5XNTU1CBZLBY2NjbI5XLoQoIc - v8ORvMOeuMMSK6IP35JOp+nq6lLiLC8v093dzfj4ONXV1Ugmk4m1tTWy2awiYBGVZbLj5R3WeBFTtKA4 - bG9vVxrq8Xhoa2tjeHiYqqoqJIPBgJg9h4eHmIM5jNEi1k0BQR4Quy16xcrKCq2trUSjUWZmZmhpaVGm - oVarkeRs09PTirVA+p0QucIQFdlFH2yRK174U4h5o9FoCAQCSvbGxkbMZjMqlQpJzuN0OpW5Tk1NKXbl - Tvv9fubn5+np6VHGJRO8Xi9jY2MYjUbEb6SiogJJ2HGKw09h57G5ufmpqalJqVZfX09tbS2VlZVP5eXl - j2VlZY+lpaV/UVJSIuOt8p3/4ZKk39H70c7Xi4MHAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKSSURBVDhPzZLrSltBFIXPGxT6GF5AiUFEUSOi4A9REBUN + MYmJuaAGRUUkGKVGxWtIzO3EJKVWQUERKrWKFH9YoyASpTFJq9D2DUqh0B/6dc6h9BXagcXMwKy119p7 + pP9jhcNh7+rqamphYSE9Nzd34/F47sbHx++Hhoa+DgwMfBsbG7ufn5/3/XkudXV1adra2p6rl2g0+iwS + iXB5ecnFxQXn5+ecnZ0RC3j49eU1P97r8LodBAJ++vv7DXq9/rsAAk/d3d1aSVT4vLe3x+3tLfv7+2xs + bJBMJjk8PEQRTiQSnJ6esrOzw/DwMA6HA6fTic1mo7W1NScJVU5OTtja2lL3h4cHcrkcmUyGq6srVXBm + ZgYRk4ODA+LxOMvLy4hI1NbWIimKCvn4+JjD1Ccc8kcMoQx6gd7wDa/efCAUCiH6geJUcWW325menqa6 + uhpJsRKLxchmszgF2Ry9oy+WxbKexSjOveE0u7u7GAwGtre38fv99PT04Ha7qaysRLJaraytrZFOpzGE + BTmex5nM40jkscZy9ETu2NzcpL29XY2zuLhIR0cHo6OjVFRUIJnNZlZWVkilUqqAVVRWyM6XeWzxHGY5 + qzpsaWlRG+r1emlubmZwcJDy8nIko9GImD1HR0dYQmlMcg7buoAg94ndLl+ztLREU1MTsiwzNTVFY2Oj + Og2tVoukZJucnFStBTffCZFrjLLILvpgj17zIrCBmDc6nY5gMKhmr6urw2KxoNFokJQ8LpdLnevExIRq + V+l0IBBgdnaWzs5OdVwKwefzMTIygslkQvxGSktLkYQdV0lJyU9h57GhoeGpvr5erVZTU0NVVRVlZWVP + xcXFj0VFRY+FhYV/UVBQoOCt+p3/4ZKk38/E0cs6dqY/AAAAAElFTkSuQmCC diff --git a/SubProject/FCM0000/Item/fLovItem.Designer.cs b/SubProject/FCM0000/Item/fLovItem.Designer.cs index 60e4b49..7fe8ab3 100644 --- a/SubProject/FCM0000/Item/fLovItem.Designer.cs +++ b/SubProject/FCM0000/Item/fLovItem.Designer.cs @@ -36,10 +36,11 @@ System.Windows.Forms.Label label1; System.Windows.Forms.Label label2; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovItem)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + System.Windows.Forms.Label label4; this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FCM0000.dsMSSQL(); @@ -94,12 +95,14 @@ this.dSPMP = new FCM0000.DSPMP(); this.taPMP = new FCM0000.DSPMPTableAdapters.SPMasterTableAdapter(); this.panel2 = new System.Windows.Forms.Panel(); + this.textBox4 = new System.Windows.Forms.TextBox(); manuLabel = new System.Windows.Forms.Label(); supplyLabel = new System.Windows.Forms.Label(); memoLabel = new System.Windows.Forms.Label(); priceLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); + label4 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -154,7 +157,7 @@ priceLabel.AutoSize = true; priceLabel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); priceLabel.ForeColor = System.Drawing.Color.White; - priceLabel.Location = new System.Drawing.Point(24, 388); + priceLabel.Location = new System.Drawing.Point(24, 353); priceLabel.Name = "priceLabel"; priceLabel.Size = new System.Drawing.Size(42, 21); priceLabel.TabIndex = 18; @@ -178,7 +181,7 @@ label2.AutoSize = true; label2.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); label2.ForeColor = System.Drawing.Color.White; - label2.Location = new System.Drawing.Point(24, 357); + label2.Location = new System.Drawing.Point(24, 323); label2.Name = "label2"; label2.Size = new System.Drawing.Size(42, 21); label2.TabIndex = 22; @@ -339,6 +342,8 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.Gray; + this.panel1.Controls.Add(label4); + this.panel1.Controls.Add(this.textBox4); this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(this.pictureBox1); this.panel1.Controls.Add(this.textBox3); @@ -366,7 +371,7 @@ this.linkLabel1.AutoSize = true; this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.linkLabel1.ForeColor = System.Drawing.Color.White; - this.linkLabel1.Location = new System.Drawing.Point(11, 201); + this.linkLabel1.Location = new System.Drawing.Point(11, 167); this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Size = new System.Drawing.Size(58, 21); this.linkLabel1.TabIndex = 27; @@ -380,7 +385,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.pictureBox1.BackColor = System.Drawing.Color.Black; this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox1.Location = new System.Drawing.Point(74, 201); + this.pictureBox1.Location = new System.Drawing.Point(74, 167); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(202, 146); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -391,7 +396,7 @@ // this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "unit", true)); - this.textBox3.Location = new System.Drawing.Point(237, 354); + this.textBox3.Location = new System.Drawing.Point(237, 320); this.textBox3.Name = "textBox3"; this.textBox3.ReadOnly = true; this.textBox3.Size = new System.Drawing.Size(38, 25); @@ -401,7 +406,7 @@ // this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "scale", true)); - this.textBox2.Location = new System.Drawing.Point(75, 354); + this.textBox2.Location = new System.Drawing.Point(75, 320); this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; this.textBox2.Size = new System.Drawing.Size(156, 25); @@ -445,14 +450,14 @@ this.memoTextBox.Multiline = true; this.memoTextBox.Name = "memoTextBox"; this.memoTextBox.ReadOnly = true; - this.memoTextBox.Size = new System.Drawing.Size(200, 111); + this.memoTextBox.Size = new System.Drawing.Size(200, 83); this.memoTextBox.TabIndex = 13; // // priceTextBox // this.priceTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.priceTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "price", true)); - this.priceTextBox.Location = new System.Drawing.Point(75, 386); + this.priceTextBox.Location = new System.Drawing.Point(75, 351); this.priceTextBox.Name = "priceTextBox"; this.priceTextBox.ReadOnly = true; this.priceTextBox.Size = new System.Drawing.Size(200, 25); @@ -546,24 +551,24 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "모델"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 27F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType2; + numberCellType6.DecimalPlaces = 0; + numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType6.MaximumValue = 2147483647D; + numberCellType6.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX"; this.fpSpread1_Sheet1.Columns.Get(0).Visible = false; this.fpSpread1_Sheet1.Columns.Get(0).Width = 99F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 154F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "model"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "모델"; this.fpSpread1_Sheet1.Columns.Get(2).Width = 154F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 154F; @@ -724,6 +729,28 @@ this.panel2.Size = new System.Drawing.Size(1084, 186); this.panel2.TabIndex = 7; // + // label4 + // + label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + label4.AutoSize = true; + label4.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + label4.ForeColor = System.Drawing.Color.White; + label4.Location = new System.Drawing.Point(3, 384); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(63, 21); + label4.TabIndex = 28; + label4.Text = "단가($)"; + // + // textBox4 + // + this.textBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "priceD", true)); + this.textBox4.Location = new System.Drawing.Point(74, 382); + this.textBox4.Name = "textBox4"; + this.textBox4.ReadOnly = true; + this.textBox4.Size = new System.Drawing.Size(200, 25); + this.textBox4.TabIndex = 29; + // // fLovItem // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -812,5 +839,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn enrDateDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn enrolleeDataGridViewTextBoxColumn; + private System.Windows.Forms.TextBox textBox4; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Item/fLovItem.cs b/SubProject/FCM0000/Item/fLovItem.cs index 4c94c5c..9faafcf 100644 --- a/SubProject/FCM0000/Item/fLovItem.cs +++ b/SubProject/FCM0000/Item/fLovItem.cs @@ -17,6 +17,7 @@ namespace FCM0000 public int item { get; set; } public string itemmodel { get; set; } public decimal itemprice { get; set; } + public decimal itempriceD { get; set; } public string SID { get; set; } public string itemUnit { get; set; } public string itemSupply { get; set; } @@ -35,6 +36,7 @@ namespace FCM0000 item = -1; itemmodel = string.Empty; itemprice = 0; + itempriceD = 0; SID = string.Empty; itemUnit = "EA"; itemSupply = string.Empty; @@ -101,6 +103,7 @@ namespace FCM0000 item = -1; itemmodel = string.Empty; itemprice = 0; + itempriceD = 0; itemSupply = string.Empty; itemSupplyidx = -1; itemManu = string.Empty; @@ -120,6 +123,10 @@ namespace FCM0000 else itemManu = dr.manu; if (dr.IspriceNull()) itemprice = 0; else itemprice = dr.price; + if (dr.IspriceDNull()) itempriceD = 0; + else itempriceD = dr.priceD; + + if (dr.IssupplyNull()) itemSupply = string.Empty; else itemSupply = dr.supply; if (dr.IssupplyidxNull()) itemSupplyidx = -1; @@ -249,9 +256,23 @@ namespace FCM0000 item = f.newIDX; itemmodel = f.tbModel.Text.Trim(); itemManu = f.tbManu.Text.Trim(); - decimal price; - decimal.TryParse(f.tbPrice.Text.Replace(",", ""), out price); - itemprice = price;// decimal.Parse(f.tbPrice.Text.Trim().Replace(",","")); + //decimal price; + //decimal.TryParse(f.tbPrice.Text.Replace(",", ""), out price); + //itemprice = price;// decimal.Parse(f.tbPrice.Text.Trim().Replace(",","")); + if (f.tbPrice.Text.Replace(",", "").isEmpty() == false) + { + if (decimal.TryParse(f.tbPrice.Text.Replace(",", "").Trim(), out decimal price)) + itemprice = price; + } + else itemprice = 0; + + if (f.tbPriceD.Text.Replace(",", "").isEmpty()==false) + { + if (decimal.TryParse(f.tbPriceD.Text.Replace(",", "").Trim(), out decimal priced)) + itempriceD = priced; + } + else itempriceD = 0; + SID = f.tbSid.Text.Trim(); itemUnit = f.tbUnit.Text.Trim(); itemSupply = f.tbSupply.Text.Trim(); diff --git a/SubProject/FCM0000/Item/fLovItem.resx b/SubProject/FCM0000/Item/fLovItem.resx index 6b4a385..0d8594d 100644 --- a/SubProject/FCM0000/Item/fLovItem.resx +++ b/SubProject/FCM0000/Item/fLovItem.resx @@ -230,24 +230,27 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALBSURBVGhD7Zm5bhRBEIZXXAEhR8TxEgiEIyfIWu/0bvdI - XoEg5xWwnGxmyA0CiwdAxjvdkg8SAp4BBA/AEQEmBhJcNVtOWtV4ao72jjSf9EuWtrr63/F0d3Vtr6Oj - ozrj1+PTypqFxOk15XSWZOaTmppfyqm/ueDvgTUf888gZpiltyeTySkafnJop6+B8Segb8qZfzINv8KX - edzP0quULh79rZXLKhtt3nH9P7y54sIcA6efqx11idI3C7wG9+HpHXBmqmjZLf9MsvQeTVM/NzYfnk2s - eclNXqdgjhc4F01bD/DvPZ+40RtuwkZkzT7OSdNXI3/yMc0fyZq3sLudIxvlifHahISLm2yUAxbVAy5x - XOm7ZEeGsebi0tT84JPGFOx4ZbZY3Of5hPEFr/EzslUMPB2rHlI+XExR5V521HWydzx5ecAkksiHi5EI - yw6y93+wyMI6hUsikQ8XIxLUW1g0ks0wELjAJhDKh4uRCtbCLbIZZlYS8wkk8uFixLJmlWyGgSDLDhbK - h4sRy5ptshlmdvFgBgvlw8WINTUfyGYYSalcF1xuTniwks0wkv2/LrjcrF6Z32QzTOu/QOtfofYv4rZv - o/N8kMEF5xHZDINNJ26wVD5cjFhZepNshsFibrBtvrAJBPLhYiTqW/O5cDcPS1cuiUQ+XIxMep3sHc+8 - XWhw/092kytkrxh5u49LdiLSG2SrOEtbKxfm4VKPLcfSfVPsVXJJYyqx6ZjslAN7lVziGILN5CnZKA/e - QweZcdwEzUrvLb5bPEM2qoGNVjjG9/mJ6lfiRru1NXePwCZvjJ0JX5vanjwH9iqb2Z1G3ysv2KJg3xTb - fXjA8GYEynPoDdy2KX088HTEsqNM7TQbo9fFJ2wTYJGFTSdY6KtYs+PFA292WI7MSpLhAVyU3uNnWBJj - VTkXP7N2dLSeXu8Q4dlqpZ4XgMwAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALBSURBVGhD7Zk7bxQxEMdPvApKHhWPL4FApEqBFC63vrNX + ygkEPV+BiOa6QB8QRPRIIbe2lJA0KfgMIPgAPCog1EADM3uTxhqTnX04t9L+pL8U6cbj/23W9niu19HR + UZ3x6/FJZc1C4vQj5XSWZOajmpqfyqk/ueDvgTUf8s8gZpilNyeTyQkafnxop6+A8Segr8qZvzINv8CX + edzP0suULh79zZWLKhtt3HK3f/PmigtzDJx+rrbVBUrfLPAa3IOnd8CZqaJlt/wjydK7NE39XNt4cDqx + 5iU3eZ2COV7gXDRtPcC/92ziRnvchI3Iml2ck6avRv7kY5o/lDX7sLudIRvlifHahISLm2yUAxbVfS5x + XOk7ZEeGseb80tR855PGFOx4ZbZY3Of5hPEFr/EzslUMPB2rHlI+XExR5V621VWydzR5ecAkksiHi5EI + yw6y93+wyMI6hUsikQ8XIxLUW1g0ks0wELjAJhDKh4uRCtbCDbIZZlYS8wkk8uFixLJmlWyGgSDLDhbK + h4sRy5otshlmdvFgBgvlw8WINTXvyWYYSalcF1xuTniwks0wkv2/LrjcrF6ZX2QzTOu/QOtfofYv4rZv + o/N8kMEF5yHZDINNJ26wVD5cjFhZep1shsFibrBlPrMJBPLhYiTqW/OpcDcPS1cuiUQ+XIxMeo3sHc28 + XWhw/092kktkrxh5u49LdizS62SrOEubK+fm4VKPLcfSfVPsVXJJYyqx6ZjslAN7lVziGILN5CnZKA/e + QweZcdwEzUq/WXy7eIpsVAMbrXCM7/IT1a/EjXZqa+4egk3eGDsTvja1PXkO7FU2szuNvlVesEXBvim2 + +/CA4c0IlOfQ67htU/p44OmIZUeZ2mk2Rq+JT9gmwCILm06w0FexZseLB97ssByZlSTDA7govcPPsCTG + qnIufmbt6Gg9vd4/WrdqjuFnCj8AAAAASUVORK5CYII= 216, 17 + + False + 81, 17 diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index 2f3c72b..6d78415 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -632,6 +632,8 @@ namespace FCM0000 { private global::System.Data.DataColumn columngcode; + private global::System.Data.DataColumn columnpriceD; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ItemsDataTable() { @@ -817,6 +819,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn priceDColumn { + get { + return this.columnpriceD; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -872,7 +882,8 @@ namespace FCM0000 { bool bparam1, int iparam1, string import, - string gcode) { + string gcode, + decimal priceD) { ItemsRow rowItemsRow = ((ItemsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -893,7 +904,8 @@ namespace FCM0000 { bparam1, iparam1, import, - gcode}; + gcode, + priceD}; rowItemsRow.ItemArray = columnValuesArray; this.Rows.Add(rowItemsRow); return rowItemsRow; @@ -942,6 +954,7 @@ namespace FCM0000 { this.columniparam1 = base.Columns["iparam1"]; this.columnimport = base.Columns["import"]; this.columngcode = base.Columns["gcode"]; + this.columnpriceD = base.Columns["priceD"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -985,6 +998,8 @@ namespace FCM0000 { base.Columns.Add(this.columnimport); this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columngcode); + this.columnpriceD = new global::System.Data.DataColumn("priceD", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpriceD); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -5811,6 +5826,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal priceD { + get { + try { + return ((decimal)(this[this.tableItems.priceDColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Items\' 테이블의 \'priceD\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableItems.priceDColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsnameNull() { @@ -6002,6 +6033,18 @@ namespace FCM0000 { public void SetgcodeNull() { this[this.tableItems.gcodeColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IspriceDNull() { + return this.IsNull(this.tableItems.priceDColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetpriceDNull() { + this[this.tableItems.priceDColumn] = global::System.Convert.DBNull; + } } /// @@ -9943,6 +9986,7 @@ namespace FCM0000.dsMSSQLTableAdapters { tableMapping.ColumnMappings.Add("iparam1", "iparam1"); tableMapping.ColumnMappings.Add("import", "import"); tableMapping.ColumnMappings.Add("gcode", "gcode"); + tableMapping.ColumnMappings.Add("priceD", "priceD"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -9951,33 +9995,36 @@ namespace FCM0000.dsMSSQLTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx], [scale], [unit], [disable], [bparam1], [iparam1], [import], [gcode]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx, @scale, @unit, @disable, @bparam1, @iparam1, @import, @gcode); + this._adapter.InsertCommand.CommandText = @"INSERT INTO Items + (name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode, priceD) +VALUES (@name,@sid,@model,@manu,@supply,@price,@memo,@wuid,@wdate,@cate,@supplyidx,@scale,@unit,@disable,@bparam1,@iparam1,@import,@gcode,@priceD); SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name, idx"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@manu", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "manu", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supply", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@price", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 0, "price", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scale", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bparam1", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iparam1", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@manu", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "manu", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supply", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@price", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "price", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supplyidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scale", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disable", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bparam1", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iparam1", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@priceD", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "priceD", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = @"UPDATE Items SET name = @name, sid = @sid, model = @model, manu = @manu, supply = @supply, price = @price, memo = @memo, wuid = @wuid, wdate = @wdate, cate = @cate, supplyidx = @supplyidx, - scale = @scale, unit = @unit, disable = @disable, bparam1 = @bparam1, iparam1 = @iparam1, import = @import, gcode = @gcode -WHERE (idx = @Original_idx); + scale = @scale, unit = @unit, disable = @disable, bparam1 = @bparam1, iparam1 = @iparam1, import = @import, gcode = @gcode, priceD = @priceD +WHERE (idx = @Original_idx); SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode FROM Items WHERE (idx = @idx) ORDER BY cate, name, idx"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -9988,7 +10035,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@price", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "price", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supplyidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scale", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -9998,6 +10045,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iparam1", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@priceD", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "priceD", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -10016,8 +10064,8 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp" + - "lyidx, scale, unit, disable, bparam1, iparam1, import, gcode\r\nFROM Items\r\nWH" + - "ERE (gcode = @gcode)\r\nORDER BY cate, name, idx"; + "lyidx, scale, unit, disable, bparam1, iparam1, import, gcode, priceD\r\nFROM I" + + "tems\r\nWHERE (gcode = @gcode)\r\nORDER BY cate, name, idx"; 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, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); @@ -10042,7 +10090,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid + this._commandCollection[4].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD FROM Items WHERE (sid IN (SELECT sid @@ -10055,7 +10103,7 @@ ORDER BY sid, name, idx"; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid + this._commandCollection[5].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD FROM Items WHERE (gcode = @code) AND (ISNULL(cate, N'') LIKE @cate) AND (ISNULL(name, N'') LIKE @search OR ISNULL(model, N'') LIKE @search OR @@ -10068,15 +10116,23 @@ ORDER BY name, idx"; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(sid, N'') LIKE @search OR ISNULL(manu, N'') LIKE @search OR ISNULL(supply, N'') LIKE @search OR ISNULL(model, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) ORDER BY name, idx"; + this._commandCollection[6].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD +FROM Items +WHERE (ISNULL(name, N'') LIKE @search OR + ISNULL(sid, N'') LIKE @search OR + ISNULL(manu, N'') LIKE @search OR + ISNULL(supply, N'') LIKE @search OR + ISNULL(model, N'') LIKE @search OR + ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) +ORDER BY name, idx"; this._commandCollection[6].CommandType = global::System.Data.CommandType.Text; this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, na" + - "me, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (id" + - "x = @idx)"; + this._commandCollection[7].CommandText = "SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, n" + + "ame, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD\r\nFROM I" + + "tems\r\nWHERE (idx = @idx)"; this._commandCollection[7].CommandType = global::System.Data.CommandType.Text; this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); @@ -10377,7 +10433,8 @@ ORDER BY name, idx"; global::System.Nullable bparam1, global::System.Nullable iparam1, string import, - string gcode) { + string gcode, + global::System.Nullable priceD) { if ((name == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -10481,6 +10538,12 @@ ORDER BY name, idx"; else { this.Adapter.InsertCommand.Parameters[17].Value = ((string)(gcode)); } + if ((priceD.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[18].Value = ((decimal)(priceD.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[18].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -10520,6 +10583,7 @@ ORDER BY name, idx"; global::System.Nullable iparam1, string import, string gcode, + global::System.Nullable priceD, int Original_idx, int idx) { if ((name == null)) { @@ -10625,8 +10689,14 @@ ORDER BY name, idx"; else { this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(gcode)); } - this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(idx)); + if ((priceD.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[18].Value = ((decimal)(priceD.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index 040c3b1..f48b13a 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -9,50 +9,53 @@ - + - + DELETE FROM Items WHERE (idx = @Original_idx) - + - - INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx], [scale], [unit], [disable], [bparam1], [iparam1], [import], [gcode]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx, @scale, @unit, @disable, @bparam1, @iparam1, @import, @gcode); + + INSERT INTO Items + (name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode, priceD) +VALUES (@name,@sid,@model,@manu,@supply,@price,@memo,@wuid,@wdate,@cate,@supplyidx,@scale,@unit,@disable,@bparam1,@iparam1,@import,@gcode,@priceD); SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name, idx - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode + SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode, priceD FROM Items WHERE (gcode = @gcode) ORDER BY cate, name, idx - + @@ -60,30 +63,31 @@ ORDER BY cate, name, idx UPDATE Items SET name = @name, sid = @sid, model = @model, manu = @manu, supply = @supply, price = @price, memo = @memo, wuid = @wuid, wdate = @wdate, cate = @cate, supplyidx = @supplyidx, - scale = @scale, unit = @unit, disable = @disable, bparam1 = @bparam1, iparam1 = @iparam1, import = @import, gcode = @gcode -WHERE (idx = @Original_idx); + scale = @scale, unit = @unit, disable = @disable, bparam1 = @bparam1, iparam1 = @iparam1, import = @import, gcode = @gcode, priceD = @priceD +WHERE (idx = @Original_idx); SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode FROM Items WHERE (idx = @idx) ORDER BY cate, name, idx - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -109,6 +113,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp + @@ -159,7 +164,7 @@ where gcode = @gcode and sid = @sid and isnull(sid,'') <> '' - SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid + SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD FROM Items WHERE (sid IN (SELECT sid @@ -168,7 +173,7 @@ WHERE (sid IN HAVING (COUNT(*) > 1))) AND (ISNULL(sid, '') <> '') AND (gcode = @gcode) AND (ISNULL(cate, '') LIKE @cate) ORDER BY sid, name, idx - + @@ -177,7 +182,7 @@ ORDER BY sid, name, idx - SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid + SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD FROM Items WHERE (gcode = @code) AND (ISNULL(cate, N'') LIKE @cate) AND (ISNULL(name, N'') LIKE @search OR ISNULL(model, N'') LIKE @search OR @@ -195,20 +200,30 @@ ORDER BY name, idx - SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(sid, N'') LIKE @search OR ISNULL(manu, N'') LIKE @search OR ISNULL(supply, N'') LIKE @search OR ISNULL(model, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) ORDER BY name, idx + SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD +FROM Items +WHERE (ISNULL(name, N'') LIKE @search OR + ISNULL(sid, N'') LIKE @search OR + ISNULL(manu, N'') LIKE @search OR + ISNULL(supply, N'') LIKE @search OR + ISNULL(model, N'') LIKE @search OR + ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) +ORDER BY name, idx - + - - SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (idx = @idx) + + SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD +FROM Items +WHERE (idx = @idx) - + @@ -1533,7 +1548,7 @@ ORDER BY pdate - + @@ -1621,10 +1636,11 @@ ORDER BY pdate + - + @@ -1676,7 +1692,7 @@ ORDER BY pdate - + @@ -1744,7 +1760,7 @@ ORDER BY pdate - + @@ -1833,7 +1849,7 @@ ORDER BY pdate - + @@ -1946,7 +1962,7 @@ ORDER BY pdate - + @@ -2011,7 +2027,7 @@ ORDER BY pdate - + @@ -2152,7 +2168,7 @@ ORDER BY pdate - + @@ -2273,7 +2289,7 @@ ORDER BY pdate - + @@ -2303,7 +2319,7 @@ ORDER BY pdate - + diff --git a/SubProject/FCM0000/dsMSSQL.xss b/SubProject/FCM0000/dsMSSQL.xss index 8b72eb8..ece1d18 100644 --- a/SubProject/FCM0000/dsMSSQL.xss +++ b/SubProject/FCM0000/dsMSSQL.xss @@ -6,7 +6,7 @@ --> - + diff --git a/SubProject/FCOMMON/Info.cs b/SubProject/FCOMMON/Info.cs index 7003080..ca3daa5 100644 --- a/SubProject/FCOMMON/Info.cs +++ b/SubProject/FCOMMON/Info.cs @@ -50,6 +50,7 @@ namespace FCOMMON public int permission; } + public static double dollertowon = 1200; public static Boolean ShowBuyerror = true; public static sUserInfo Login; public static string Path; diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 055dcc8..bc22696 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,33 +30,34 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -131,8 +132,8 @@ this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label1 = new System.Windows.Forms.Label(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -241,7 +242,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -350,7 +350,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 26); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -607,7 +606,6 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; @@ -624,7 +622,6 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; @@ -679,7 +676,6 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -783,13 +779,25 @@ this.fpSpread1.TabIndex = 4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(0, 629); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label1.Size = new System.Drawing.Size(1226, 23); + this.label1.TabIndex = 6; + this.label1.Text = "--"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 29; + this.fpSpread1_Sheet1.ColumnCount = 30; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -810,22 +818,23 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "장비\r\n모델"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "수량"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "합계금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "공급업체"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "프로젝트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "입고예정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "입고일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "입고수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "PO#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "삭제됨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "단가($)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "합계금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "공급업체"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "입고예정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "입고일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "입고수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "PO#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "삭제됨"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; @@ -834,7 +843,7 @@ this.fpSpread1_Sheet1.Columns.Get(0).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; @@ -842,225 +851,219 @@ this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "공정"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(4).Tag = "requestName"; this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#"; this.fpSpread1_Sheet1.Columns.Get(5).Tag = "sc"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령"; this.fpSpread1_Sheet1.Columns.Get(7).Tag = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pumname"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType8.DecimalPlaces = 0; - numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType8.MaximumValue = 2147483647D; - numberCellType8.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType8; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n제조사"; this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "manuproc"; this.fpSpread1_Sheet1.Columns.Get(13).Label = "제조\r\n공정"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(14).Label = "장비\r\n모델"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; - numberCellType9.DecimalPlaces = 0; - numberCellType9.NegativeRed = true; - numberCellType9.NullDisplay = "--"; - numberCellType9.Separator = ","; - numberCellType9.ShowSeparator = true; - numberCellType9.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType9; + numberCellType2.DecimalPlaces = 0; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + numberCellType2.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; - numberCellType10.DecimalPlaces = 0; - numberCellType10.MaximumValue = 9999999999999.99D; - numberCellType10.MinimumValue = -9999999999999.99D; - numberCellType10.NegativeRed = true; - numberCellType10.NullDisplay = "--"; - numberCellType10.Separator = ","; - numberCellType10.ShowSeparator = true; - numberCellType10.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType10; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice"; + numberCellType3.DecimalPlaces = 1; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumpriceD"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumprice"; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F; - numberCellType11.DecimalPlaces = 0; - numberCellType11.MaximumValue = 9999999999999.99D; - numberCellType11.MinimumValue = -9999999999999.99D; - numberCellType11.NegativeRed = true; - numberCellType11.NullDisplay = "--"; - numberCellType11.Separator = ","; - numberCellType11.ShowSeparator = true; - numberCellType11.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType11; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가($)"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType4.DecimalPlaces = 0; + numberCellType4.MaximumValue = 9999999999999.99D; + numberCellType4.MinimumValue = -9999999999999.99D; + numberCellType4.NegativeRed = true; + numberCellType4.NullDisplay = "--"; + numberCellType4.Separator = ","; + numberCellType4.ShowSeparator = true; + numberCellType4.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액"; - this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType33; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply"; - this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체"; - this.fpSpread1_Sheet1.Columns.Get(19).Tag = "supply"; + numberCellType5.DecimalPlaces = 0; + numberCellType5.MaximumValue = 9999999999999.99D; + numberCellType5.MinimumValue = -9999999999999.99D; + numberCellType5.NegativeRed = true; + numberCellType5.NullDisplay = "--"; + numberCellType5.Separator = ","; + numberCellType5.ShowSeparator = true; + numberCellType5.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "합계금액"; + this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType12.DecimalPlaces = 0; - numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType12.MaximumValue = 2147483647D; - numberCellType12.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType12; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx"; - this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(20).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(20).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "공급업체"; + this.fpSpread1_Sheet1.Columns.Get(20).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType34; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "project"; - this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "프로젝트"; + this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType6.DecimalPlaces = 0; + numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType6.MaximumValue = 2147483647D; + numberCellType6.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "supplyidx"; + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType13.DecimalPlaces = 0; - numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType13.MaximumValue = 2147483647D; - numberCellType13.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType13; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "projectidx"; - this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(22).Tag = "projectidx"; - this.fpSpread1_Sheet1.Columns.Get(22).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "project"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "프로젝트"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType35; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(23).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(23).Tag = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(23).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(23).Tag = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(23).Visible = false; this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType36; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고예정"; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(24).Tag = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType37; - this.fpSpread1_Sheet1.Columns.Get(25).DataField = "indate"; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(25).Tag = "indate"; + this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; - numberCellType14.NegativeRed = true; - numberCellType14.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType14; - this.fpSpread1_Sheet1.Columns.Get(26).DataField = "inqty"; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고수량"; - this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inqty"; - this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고일"; + this.fpSpread1_Sheet1.Columns.Get(26).Tag = "indate"; this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType38; - this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po"; + numberCellType8.NegativeRed = true; + numberCellType8.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(27).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(27).Label = "PO#"; - this.fpSpread1_Sheet1.Columns.Get(27).Tag = "po"; + this.fpSpread1_Sheet1.Columns.Get(27).Label = "입고수량"; + this.fpSpread1_Sheet1.Columns.Get(27).Tag = "inqty"; + this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType2; - this.fpSpread1_Sheet1.Columns.Get(28).DataField = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(28).Label = "삭제됨"; - this.fpSpread1_Sheet1.Columns.Get(28).Tag = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(28).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(28).Label = "PO#"; + this.fpSpread1_Sheet1.Columns.Get(28).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(29).DataField = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(29).Label = "삭제됨"; + this.fpSpread1_Sheet1.Columns.Get(29).Tag = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(29).Width = 51F; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 629); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1226, 23); - this.label1.TabIndex = 6; - this.label1.Text = "--"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1161,11 +1164,11 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.ToolStripMenuItem 구매승인양식ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton6; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripDropDownButton toolStripButton7; private System.Windows.Forms.ToolStripMenuItem 입고품목메일전송ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 엑셀에서가져오기ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 견적서폴더열기ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton3; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index 551b90d..64e6db4 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -264,20 +264,6 @@ pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+ brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX - EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl - 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR - BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT - Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz - tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV - iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i - DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA - AAAASUVORK5CYII= @@ -317,6 +303,20 @@ oQIAAAJCCriYcSOGDCgzBAiQYSTGDQM4AjBAEwGCCRRIftypoKcDBwcS5MQIYIBRBQ0aPCBAwIKDoR4A cFiZdKmFAgUOQAWwIKnSpgUkSOgA1UCCqmAlVKgAoWyCBQsSOLhwoAMECBfK2tw7oa9fqBYDL2yIMCAA Ow== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX + EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl + 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR + BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT + Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz + tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV + iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i + DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA + AAAASUVORK5CYII= @@ -409,14 +409,14 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGSSURBVFhH7ZBNSwJBHMb9Ip37CH2C0lXxDfoSfosIYtfW - hG5l9N6hOgZFlyhQd9w65UECO+gxDJSCLKPJZ9gVk8l1ncWNmB88zM78H8afE5D8e4KqQUUSzpC3pG5e - BrXCLO5bWDZnUjnzAue8vpv0BUVovrzTw1K9G9PK7fklYy6qF1tHRr2LcxE8E7Q5gKROniBrHQnhuSBe - LLJK2OoFngsCr++SgiL4Jrh93aDxbJnu3DSsEz6+CSbWTNbDOgrfBPFykNv9qy84LlKQB+aDGQXmUxcE - tpxTF3MpyMOWc+piLgV52HJOXcylIA9bzqmLuRQcxhYbzG9gNnVBN0hBUaSgKFJQlB+Collcv6MbV3X2 - jRX74c4k6Que176EclLp0PRelV2a3q/S096e13OTvmBELT9vkTa35CbH9x12KWR5czfJ93wUvdhkgiHN - CEMSl0+a4T+IH+D1xg3kFNVQmKAooUwpmciR1zxp0bOHT7pptGi8t1c0krAq/hNWjVQsc/sYWil8RLOk - BmlrJPGZQOAb99uk1OKmJ2IAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGTSURBVFhH7ZDdSgJBGIa9kY67hK6g3FXxD7oJ7yKKWP8S + Oiuj0o6qw6DoJCrDHbeO6kACQ/IwDJSCLKPJd9gVk8l1ncWNmAdeZme+l/FxfJJ/j1/TqUgCKfIWyxin + /uTVLO5bWDZm4jnjBOe8vpP0BUVovrzTYrneDWuV9vySPhfKlFp7er2LcxFcE7QoQDJNniBrHgnhuiBe + LJgmbHUD1wWB23dJQRE8E9w+b9BItkJ3LhrmCR/PBKNrButhHYVngng5yO3+1RccFynIA/PBjALzqQsC + S86ui7kU5GHJ2XUxl4I8LDm7LuZSkIclZ9fFXAoOY4kN5jcwm7qgE6SgKFJQFCkoyg9B0Syu39CNs0f2 + jRX74c4k6Qse176EcnDXoYlClV2aKFbpYW/P6zlJXzC4WnneIm1uyUn2bzvsUsjy5k6S7/momVKTCSpJ + PQBJXD5phv8gfoDXGzeQUzVdZYKiKKlyLJorv+ZJix7df9JNvUUjvb2aJFGz4j0BTY+HU9cPysrlRyhL + apA2RxKP8fm+ARZlpLBhGLbIAAAAAElFTkSuQmCC diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index 4c368aa..bac2f17 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -48,6 +48,8 @@ System.Windows.Forms.Label label3; System.Windows.Forms.Label label6; System.Windows.Forms.Label label7; + System.Windows.Forms.Label label8; + System.Windows.Forms.Label label9; this.tbSC = new System.Windows.Forms.TextBox(); this.tbSID = new System.Windows.Forms.TextBox(); this.tbPumName = new System.Windows.Forms.TextBox(); @@ -93,6 +95,7 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); + this.tbPumPriceD = new System.Windows.Forms.TextBox(); processLabel = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); @@ -111,6 +114,8 @@ label3 = new System.Windows.Forms.Label(); label6 = new System.Windows.Forms.Label(); label7 = new System.Windows.Forms.Label(); + label8 = new System.Windows.Forms.Label(); + label9 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -151,7 +156,7 @@ // sidLabel // sidLabel.AutoSize = true; - sidLabel.Location = new System.Drawing.Point(288, 210); + sidLabel.Location = new System.Drawing.Point(288, 251); sidLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); sidLabel.Name = "sidLabel"; sidLabel.Size = new System.Drawing.Size(32, 20); @@ -191,7 +196,7 @@ // pumamtLabel // pumamtLabel.AutoSize = true; - pumamtLabel.Location = new System.Drawing.Point(47, 215); + pumamtLabel.Location = new System.Drawing.Point(47, 251); pumamtLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumamtLabel.Name = "pumamtLabel"; pumamtLabel.Size = new System.Drawing.Size(39, 20); @@ -221,7 +226,7 @@ // deptLabel // deptLabel.AutoSize = true; - deptLabel.Location = new System.Drawing.Point(41, 396); + deptLabel.Location = new System.Drawing.Point(50, 362); deptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); deptLabel.Name = "deptLabel"; deptLabel.Size = new System.Drawing.Size(39, 20); @@ -289,6 +294,18 @@ label6.TabIndex = 4; label6.Text = "상태"; // + // label7 + // + label7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + label7.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + label7.Location = new System.Drawing.Point(11, 539); + label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label7.Name = "label7"; + label7.Padding = new System.Windows.Forms.Padding(5); + label7.Size = new System.Drawing.Size(910, 103); + label7.TabIndex = 17; + label7.Text = resources.GetString("label7.Text"); + // // tbSC // this.tbSC.Location = new System.Drawing.Point(104, 156); @@ -300,7 +317,7 @@ // tbSID // this.tbSID.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.tbSID.Location = new System.Drawing.Point(327, 208); + this.tbSID.Location = new System.Drawing.Point(327, 248); this.tbSID.Margin = new System.Windows.Forms.Padding(4); this.tbSID.Name = "tbSID"; this.tbSID.Size = new System.Drawing.Size(148, 27); @@ -353,7 +370,7 @@ // // tbPumPrice // - this.tbPumPrice.Location = new System.Drawing.Point(327, 175); + this.tbPumPrice.Location = new System.Drawing.Point(326, 175); this.tbPumPrice.Margin = new System.Windows.Forms.Padding(4); this.tbPumPrice.Name = "tbPumPrice"; this.tbPumPrice.Size = new System.Drawing.Size(148, 27); @@ -363,7 +380,7 @@ // // tbPumAmt // - this.tbPumAmt.Location = new System.Drawing.Point(93, 212); + this.tbPumAmt.Location = new System.Drawing.Point(93, 248); this.tbPumAmt.Margin = new System.Windows.Forms.Padding(4); this.tbPumAmt.Name = "tbPumAmt"; this.tbPumAmt.ReadOnly = true; @@ -375,7 +392,7 @@ // tbSupply // this.tbSupply.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbSupply.Location = new System.Drawing.Point(93, 248); + this.tbSupply.Location = new System.Drawing.Point(93, 283); this.tbSupply.Margin = new System.Windows.Forms.Padding(4); this.tbSupply.Name = "tbSupply"; this.tbSupply.Size = new System.Drawing.Size(311, 27); @@ -383,7 +400,7 @@ // // tbSupplyIndex // - this.tbSupplyIndex.Location = new System.Drawing.Point(410, 248); + this.tbSupplyIndex.Location = new System.Drawing.Point(410, 283); this.tbSupplyIndex.Margin = new System.Windows.Forms.Padding(4); this.tbSupplyIndex.Name = "tbSupplyIndex"; this.tbSupplyIndex.ReadOnly = true; @@ -397,7 +414,7 @@ // this.tbProject.BackColor = System.Drawing.SystemColors.Window; this.tbProject.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbProject.Location = new System.Drawing.Point(93, 285); + this.tbProject.Location = new System.Drawing.Point(93, 320); this.tbProject.Margin = new System.Windows.Forms.Padding(4); this.tbProject.Name = "tbProject"; this.tbProject.Size = new System.Drawing.Size(311, 27); @@ -406,7 +423,7 @@ // // tbProjectIndex // - this.tbProjectIndex.Location = new System.Drawing.Point(410, 285); + this.tbProjectIndex.Location = new System.Drawing.Point(410, 320); this.tbProjectIndex.Margin = new System.Windows.Forms.Padding(4); this.tbProjectIndex.Name = "tbProjectIndex"; this.tbProjectIndex.ReadOnly = true; @@ -427,12 +444,12 @@ // tbBigo // this.tbBigo.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbBigo.Location = new System.Drawing.Point(93, 320); + this.tbBigo.Location = new System.Drawing.Point(93, 359); this.tbBigo.Margin = new System.Windows.Forms.Padding(4); this.tbBigo.MaxLength = 500; this.tbBigo.Multiline = true; this.tbBigo.Name = "tbBigo"; - this.tbBigo.Size = new System.Drawing.Size(381, 197); + this.tbBigo.Size = new System.Drawing.Size(381, 150); this.tbBigo.TabIndex = 28; this.tbBigo.TabStop = false; this.toolTip1.SetToolTip(this.tbBigo, resources.GetString("tbBigo.ToolTip")); @@ -587,6 +604,9 @@ // // groupBox1 // + this.groupBox1.Controls.Add(label9); + this.groupBox1.Controls.Add(this.tbPumPriceD); + this.groupBox1.Controls.Add(label8); this.groupBox1.Controls.Add(this.button3); this.groupBox1.Controls.Add(this.button2); this.groupBox1.Controls.Add(this.button1); @@ -627,7 +647,7 @@ // // button3 // - this.button3.Location = new System.Drawing.Point(9, 285); + this.button3.Location = new System.Drawing.Point(9, 320); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(80, 27); this.button3.TabIndex = 34; @@ -638,7 +658,7 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(9, 248); + this.button2.Location = new System.Drawing.Point(9, 283); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(80, 27); this.button2.TabIndex = 33; @@ -807,17 +827,39 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // - // label7 + // tbPumPriceD // - label7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - label7.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - label7.Location = new System.Drawing.Point(11, 539); - label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label7.Name = "label7"; - label7.Padding = new System.Windows.Forms.Padding(5); - label7.Size = new System.Drawing.Size(910, 103); - label7.TabIndex = 17; - label7.Text = resources.GetString("label7.Text"); + this.tbPumPriceD.ForeColor = System.Drawing.Color.Blue; + this.tbPumPriceD.Location = new System.Drawing.Point(94, 211); + this.tbPumPriceD.Margin = new System.Windows.Forms.Padding(4); + this.tbPumPriceD.Name = "tbPumPriceD"; + this.tbPumPriceD.Size = new System.Drawing.Size(178, 27); + this.tbPumPriceD.TabIndex = 36; + this.tbPumPriceD.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.tbPumPriceD.TextChanged += new System.EventHandler(this.textBox1_TextChanged); + // + // label8 + // + label8.AutoSize = true; + label8.ForeColor = System.Drawing.Color.Blue; + label8.Location = new System.Drawing.Point(29, 214); + label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label8.Name = "label8"; + label8.Size = new System.Drawing.Size(57, 20); + label8.TabIndex = 35; + label8.Text = "단가($)"; + // + // label9 + // + label9.AutoSize = true; + label9.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + label9.ForeColor = System.Drawing.Color.Blue; + label9.Location = new System.Drawing.Point(285, 218); + label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(163, 15); + label9.TabIndex = 37; + label9.Text = "해외물품은 좌측 단가를 입력"; // // fPurchase_Add // @@ -895,5 +937,6 @@ private System.Windows.Forms.Button button5; private System.Windows.Forms.Button button6; private System.Windows.Forms.Button button7; + private System.Windows.Forms.TextBox tbPumPriceD; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index e04a72a..9837e80 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -183,6 +183,7 @@ namespace FEQ0000 if (dr.IspumidxNull()) tbPumIDX.Text = "-1"; else tbPumIDX.Text = dr.pumidx.ToString(); tbPumPrice.Text = dr.pumprice.ToString(); + tbPumPriceD.Text = dr.pumpriceD.ToString(); tbPumAmt.Text = dr.pumamt.ToString("N0"); //천단위 구분기호 추가 181222 tbPumUnit.Text = dr.pumunit; @@ -335,6 +336,7 @@ namespace FEQ0000 this.tbPumIDX.Text = f.item.ToString(); this.tbPumModel.Text = f.itemmodel; this.tbPumPrice.Text = f.itemprice.ToString(); + this.tbPumPriceD.Text = f.itempriceD.ToString(); this.tbSID.Text = f.SID; this.tbSID.Tag = f.SID; this.tbPumUnit.Text = f.itemUnit; //181214 @@ -449,7 +451,7 @@ namespace FEQ0000 tbPumQty.Focus(); return false; } - if (advInput == true ) + if (advInput == true) { if (tbProject.Text == "") { @@ -459,7 +461,7 @@ namespace FEQ0000 else { //프로젝트에 뭔가를 입력했다 - if(tbProjectIndex.Text == "-1") + if (tbProjectIndex.Text == "-1") { FCOMMON.Util.MsgE("프로젝트가 선택되지 않았습니다. 직접입력은 허용되지 않습니다.\n" + "프로젝트 명을 입력하고 Enter 키를 눌러서 관련 프로젝트를 선택하세요\n" + @@ -469,7 +471,7 @@ namespace FEQ0000 return false; } } - + } var overtime = DateTime.Now - DateTime.Parse("2019-01-09 00:00:00"); @@ -596,10 +598,26 @@ namespace FEQ0000 } + //단가가없는경우 생성한다. + if(decimal.TryParse(tbPumPrice.Text,out decimal vprice)==false) + { + if(decimal.TryParse(tbPumPriceD.Text,out decimal vpriced)==true) + { + applyDollerToWon(); + } + } + if (tbPumQty.Text.isEmpty()) tbPumQty.Text = "0"; if (tbPumPrice.Text.isEmpty()) tbPumPrice.Text = "0"; dr.pumqty = int.Parse(tbPumQty.Text); dr.pumprice = decimal.Parse(tbPumPrice.Text); + + if (decimal.TryParse(tbPumPriceD.Text, out decimal priced)) + { + dr.pumpriceD = priced; + } + else dr.SetpumpriceDNull(); + dr.pumamt = dr.pumqty * dr.pumprice; if (tbPumIDX.Text == "" || tbPumIDX.Text == "-1") dr.SetpumidxNull(); else dr.pumidx = int.Parse(tbPumIDX.Text); @@ -913,5 +931,32 @@ namespace FEQ0000 string path = "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년"; FCOMMON.Util.RunExplorer(path); } + + private void textBox1_TextChanged(object sender, EventArgs e) + { + //단가에 금액이 없는경우에는 환율을 곱해준다. + //if ( decimal.TryParse(tbPumPrice.Text, out decimal result) == false || result == 0) + { + if (decimal.TryParse(tbPumPriceD.Text, out decimal priced) == true) + { + applyDollerToWon(); + } + else + { + //달러입력값도 이상하니 처리 못함 + tbPumPrice.Text = "0"; + } + } + + } + void applyDollerToWon() + { + if (decimal.TryParse(tbPumPriceD.Text, out decimal priced)) + { + var price = FCOMMON.info.dollertowon * (double)priced; + tbPumPrice.Text = (Math.Ceiling(price)).ToString(); + } + else tbPumPrice.Text = "0"; + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx index 4523461..b58c206 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx @@ -178,22 +178,6 @@ False - - * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) -* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) -* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) -* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) -* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) - - - 17, 17 - - - 131, 17 - - - 313, 17 - False @@ -206,6 +190,28 @@ 기타 물품 / 상세한 사유 작성 (상기항목에 포함되지 않는 것들…관리 및 정리에 사용되는 물품 등..) + + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) +* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) +* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) +* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) +* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) + + + False + + + False + + + 17, 17 + + + 131, 17 + + + 313, 17 + 58 diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 797bd93..62a9953 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -365,6 +365,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnbigo2; + private global::System.Data.DataColumn columnpumpriceD; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public PurchaseDataTable() : @@ -703,6 +705,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn pumpriceDColumn { + get { + return this.columnpumpriceD; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -776,7 +786,8 @@ namespace FEQ0000 { string requestName, string place, int inqty, - string bigo2) { + string bigo2, + decimal pumpriceD) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -815,7 +826,8 @@ namespace FEQ0000 { requestName, place, inqty, - bigo2}; + bigo2, + pumpriceD}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -858,7 +870,8 @@ namespace FEQ0000 { string receiveName, string requestName, string place, - int inqty) { + int inqty, + decimal pumpriceD) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -897,7 +910,8 @@ namespace FEQ0000 { requestName, place, inqty, - null}; + null, + pumpriceD}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -964,6 +978,7 @@ namespace FEQ0000 { this.columnplace = base.Columns["place"]; this.columninqty = base.Columns["inqty"]; this.columnbigo2 = base.Columns["bigo2"]; + this.columnpumpriceD = base.Columns["pumpriceD"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1043,6 +1058,8 @@ namespace FEQ0000 { base.Columns.Add(this.columninqty); this.columnbigo2 = new global::System.Data.DataColumn("bigo2", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnbigo2); + this.columnpumpriceD = new global::System.Data.DataColumn("pumpriceD", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpumpriceD); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1800,6 +1817,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal pumpriceD { + get { + if (this.IspumpriceDNull()) { + return 0m; + } + else { + return ((decimal)(this[this.tablePurchase.pumpriceDColumn])); + } + } + set { + this[this.tablePurchase.pumpriceDColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -2195,6 +2228,18 @@ namespace FEQ0000 { public void Setbigo2Null() { this[this.tablePurchase.bigo2Column] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IspumpriceDNull() { + return this.IsNull(this.tablePurchase.pumpriceDColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetpumpriceDNull() { + this[this.tablePurchase.pumpriceDColumn] = global::System.Convert.DBNull; + } } /// @@ -2392,6 +2437,7 @@ namespace FEQ0000.dsPurchaseTableAdapters { tableMapping.ColumnMappings.Add("requestName", "requestName"); tableMapping.ColumnMappings.Add("place", "place"); tableMapping.ColumnMappings.Add("inqty", "inqty"); + tableMapping.ColumnMappings.Add("pumpriceD", "pumpriceD"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -2402,8 +2448,8 @@ namespace FEQ0000.dsPurchaseTableAdapters { this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.CommandText = @"INSERT INTO Purchase (pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, - import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty) -VALUES (@pdate,@state,@process,@receive,@sc,@request,@sid,@pumname,@pumscale,@pumunit,@pumqty,@pumprice,@pumamt,@supply,@supplyidx,@project,@projectidx,@asset,@edate,@indate,@po,@dept,@wuid,@wdate,@import,@pumidx,@isdel,@bigo,@manuproc,@orderno,@gcode,@place,@inqty); + import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD) +VALUES (@pdate,@state,@process,@receive,@sc,@request,@sid,@pumname,@pumscale,@pumunit,@pumqty,@pumprice,@pumamt,@supply,@supplyidx,@project,@projectidx,@asset,@edate,@indate,@po,@dept,@wuid,@wdate,@import,@pumidx,@isdel,@bigo,@manuproc,@orderno,@gcode,@place,@inqty,@pumpriceD); SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2413,7 +2459,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sc", global::System.Data.SqlDbType.VarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, "sc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@request", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "request", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumname", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "pumname", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumname", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "pumname", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumscale", global::System.Data.SqlDbType.VarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "pumscale", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumunit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "pumunit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumqty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pumqty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2439,14 +2485,15 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inqty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "inqty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumpriceD", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "pumpriceD", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = @"UPDATE Purchase SET pdate = @pdate, state = @state, process = @process, receive = @receive, sc = @sc, request = @request, sid = @sid, pumname = @pumname, pumscale = @pumscale, pumunit = @pumunit, pumqty = @pumqty, pumprice = @pumprice, pumamt = @pumamt, supply = @supply, supplyidx = @supplyidx, project = @project, projectidx = @projectidx, asset = @asset, edate = @edate, indate = @indate, po = @po, dept = @dept, wuid = @wuid, wdate = @wdate, import = @import, pumidx = @pumidx, isdel = @isdel, bigo = @bigo, manuproc = @manuproc, - orderno = @orderno, place = @place, inqty = @inqty -WHERE (idx = @Original_idx); + orderno = @orderno, place = @place, inqty = @inqty, pumpriceD = @pumpriceD +WHERE (idx = @Original_idx); SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2456,7 +2503,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sc", global::System.Data.SqlDbType.VarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, "sc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@request", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "request", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumname", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "pumname", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumname", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "pumname", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumscale", global::System.Data.SqlDbType.VarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "pumscale", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumunit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "pumunit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumqty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pumqty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2481,6 +2528,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inqty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "inqty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumpriceD", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "pumpriceD", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -2499,7 +2547,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, - pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty + pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD FROM Purchase WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; @@ -2526,7 +2574,7 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = @"SELECT idx, asset, bigo, dept, edate, import, indate, isdel, manuproc, orderno, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, - request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName, gcode, place, inqty + request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName, gcode, place, inqty, pumpriceD FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; @@ -2720,7 +2768,8 @@ ORDER BY pdate DESC, idx DESC"; string orderno, string gcode, string place, - global::System.Nullable inqty) { + global::System.Nullable inqty, + global::System.Nullable pumpriceD) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -2914,6 +2963,12 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.InsertCommand.Parameters[32].Value = global::System.DBNull.Value; } + if ((pumpriceD.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[33].Value = ((decimal)(pumpriceD.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[33].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -2967,6 +3022,7 @@ ORDER BY pdate DESC, idx DESC"; string orderno, string place, global::System.Nullable inqty, + global::System.Nullable pumpriceD, int Original_idx, int idx) { if ((pdate == null)) { @@ -3156,8 +3212,14 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(idx)); + if ((pumpriceD.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[32].Value = ((decimal)(pumpriceD.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index 0ab5afe..a4cb0b9 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -24,8 +24,8 @@ WHERE (idx = @Original_idx) INSERT INTO Purchase (pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, - import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty) -VALUES (@pdate,@state,@process,@receive,@sc,@request,@sid,@pumname,@pumscale,@pumunit,@pumqty,@pumprice,@pumamt,@supply,@supplyidx,@project,@projectidx,@asset,@edate,@indate,@po,@dept,@wuid,@wdate,@import,@pumidx,@isdel,@bigo,@manuproc,@orderno,@gcode,@place,@inqty); + import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD) +VALUES (@pdate,@state,@process,@receive,@sc,@request,@sid,@pumname,@pumscale,@pumunit,@pumqty,@pumprice,@pumamt,@supply,@supplyidx,@project,@projectidx,@asset,@edate,@indate,@po,@dept,@wuid,@wdate,@import,@pumidx,@isdel,@bigo,@manuproc,@orderno,@gcode,@place,@inqty,@pumpriceD); SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC @@ -35,7 +35,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, - + @@ -61,13 +61,14 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, - pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty + pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD FROM Purchase WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -82,8 +83,8 @@ ORDER BY pdate DESC, idx DESC SET pdate = @pdate, state = @state, process = @process, receive = @receive, sc = @sc, request = @request, sid = @sid, pumname = @pumname, pumscale = @pumscale, pumunit = @pumunit, pumqty = @pumqty, pumprice = @pumprice, pumamt = @pumamt, supply = @supply, supplyidx = @supplyidx, project = @project, projectidx = @projectidx, asset = @asset, edate = @edate, indate = @indate, po = @po, dept = @dept, wuid = @wuid, wdate = @wdate, import = @import, pumidx = @pumidx, isdel = @isdel, bigo = @bigo, manuproc = @manuproc, - orderno = @orderno, place = @place, inqty = @inqty -WHERE (idx = @Original_idx); + orderno = @orderno, place = @place, inqty = @inqty, pumpriceD = @pumpriceD +WHERE (idx = @Original_idx); SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC @@ -93,7 +94,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, - + @@ -118,6 +119,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + @@ -162,6 +164,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + @@ -202,7 +205,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc SELECT idx, asset, bigo, dept, edate, import, indate, isdel, manuproc, orderno, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, - request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName, gcode, place, inqty + request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName, gcode, place, inqty, pumpriceD FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -414,6 +417,7 @@ ORDER BY pdate DESC, idx DESC + diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index b6c176b..1a5faa2 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -266,7 +266,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -389,7 +388,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -917,7 +915,6 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(120, 25); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 09730a0..85e434d 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -231,15 +231,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpqMigpL15TLXClrrcUoLbd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6JYwl9Y1Fd7+jSYu/DCMyuMLofhEEl07+Qq/qWIU7MSGDc0e+5 - Xuq0twUGjw76US1OuBrJzzrTM4gZCT3ur2TeP38FjP8yzLMXQSEHwXDo0tyaBaaRMJlnQ1k8IWRLMBy8 - 4JMUVFkUqgpmF8q65FB3KyR+yjoRFLsyhONpaM5OrxRUWUpVSn0J1zzShLaxZpSf20GCAgPjwUyBfSoE - +2QQzpkg3n5JYG/HJClQ95WqFPR2TnuvHntM5Sg+VQB56xYMekOwCppg/97g9ac4Klq9UDE7K8toOdfo - rIOMLuSK6LxtxtuLiKeWYZtiidfOf0kB2YLfwMarxnoAyp4SVF/fh6OOw9hMb+A20uu3Chu12T4gllyG - Y5rFnZmMqOEnLBKp1ZfVXK2E3q3FEXsNiukCLr8pExZoGXyHpW8/cdeX2eD+LH9IzscssqXuUkLWXogi - fR7yj69bCQvobiyQgmE+KIRJwU3+IbJ5EYhBY/SueQfaay8R5QtcT8PE6/bzBUIgV5s63L/FjIQG5jki - iR9gY2l8jqQQYJOgdhs8yJWsYcguZiQcM8+P13b6k7Wdc6g+78P+M6v38o9Q1B82NSzBGIz5VAAAAABJ + SKESs3abDTUZFRWWrimXuVLWWouRWW7pZGra0pb01b7Mvmy3Nt1aWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G5PyItltBGG3voe+fx8m+N9Ayrx6JYwm9ozFdz8jiQs/DKCzuCLoeREAl07+Qq3rDICdmJDCe2Pdc + L3Xa1wyjVwf9iBYn3I3kZ535GcSMhG7PVzLvm7sCJnAZlpmLoJCDYDh0aXbNAvNwhMyzoazeMLIlGA5e + 8EsKqqwKVQWzC2Wdcqi7FBI/ZRsPiV0ZIvE0NGenVgqqrKUqJV3CGYab0DpqQPm5HSQo0D8WyhQ4JsNw + TITgmg7h7ZcE9rZPkAJ1b6lKQW/ntIP12GMuR/GpAshbtmDAF4ZN0Dj79wavP8VR0eKDitlZWUbLuUZX + HWR0IVdE520z3V5APLUM+yRLvA7+SwrIFvwGdl41tgNQdpeg+vo+HHUexmZ6A7eRXr9V2KjV/gFLyWU4 + p1jcmc6IGnrCIpFafVnN1UroPVoccdSgmC7g8psyYYHmgXdY/PYTd/2ZDe7P8IfkeswiW+pOJWRthSjS + 5yH/+LqVsIDuxjwpGOKDQpgU3OQfIpsXwSVoTL4170B77SVifIH7aYR4PQG+QAjkalO757eYkdDAPEc0 + 8QPsUhqfoykE2SSo3UYvciVruOcQMxKOWebGajsCydqOWVSf92P/mdV7+Uco6g8s4iy+4isZvgAAAABJ RU5ErkJggg== @@ -247,17 +247,17 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFJTBNhHMXn4J2bdw9eRCSKVG8cTExMPHgy - JB5MNF7ARIMJBw9UYsC6YViUpBCMguyCUiS0hhAItAWEIh2xlLZOS6lMBabMdJZOp/P8WkZRExOXl3mZ - Jd/v/Zeh/lvLw0WL4aGzauQXr46cDAZeHtkf7C3K+8lvi/LGx0v2GThFudtNiq5nAOjkynr3OS3HER0v - S625LijfHJu/JoddFWHf62PnDZyi6MHihK7JUKJ1EEP1EJmnkML90NMcyUpC1wTind339DZYlk35Bky0 - gVOUv/Mon1F3CNyEZKAR/IdqbM2WIT53FZy3BtzSLXCLN7HtqSSuIJ2x8A8cFwycBPQVq2lpAxzdhO0F - C9iJG5DYGVKVN6pn74nvHWTH8/QVygae7eCEmps/oxBLgCbmQE3yQYk9Bk33wOZ0o22MQdfUOhyeCLJ7 - M3AS0GRK6ZoEjXcjzdmhbvYjtdEKee0+vEvtGJ5nsfpZxKdNBTNBHqOLXzBke6AZOPkLVpOSUXmoWzak - 2I5cVTlSAylUiV5nDMtRAbOMBGdIxDSxN6age5KBgVOU51GhrKscgZ9BWa+HHK4mcAVE/+Vc24G4Amcw - ialAEmM+AfMRBR0T0b2AlbsFMSlBJ1YmuzLJ1TYI/icQfHUQPtaim8y8vC5iwr8LZ/1uTYF1ZGUvwFeb - f91nOdxJ3zkU91gK5B/9ZvChNhPgsUAgFyNjjlS3vRdgtjTr9qpTF42I36vBzhywOhhzH9lFz3QMLY6p - jNnSontHW+FuLOVflOeXGkf/XK+qzlxxNV/iQvYGjNwuEY3Pf6fn5QdLR82nJce9c3u7+DdR1Fcz4yQR - j0qf7QAAAABJRU5ErkJggg== + JB5MNF7ARIMJBw9UYlgUg2ERk0owCrILSpHQGkKq0BYQirTiUNo6LaUyFZgy01k6nc7zaxlFTUxcXuZl + lny/91+G+m8tjxYthkfOqpFfvDp2Mhh4fmR/sL8o7ye/LsqbnCzZZ+AU5e40KbqeAaCTK+vd57QcR3Sy + LLXmuqB8c2z+mhx2VYTpl8fOGzhF+YaLE7omQ4k2Qgw1QWQeQwoPQk9zJCsJXROId3bf09tgWTZFD5l8 + Bk5R/u6jfEbdIXArkoEW8B+qsTVbhvjcVXDeGnBLt8At3sS2p5K4gnTGwj90XDBwEjBQrKalDXC+Vmwv + 1IN13IDEzpCqvFE9e0987yA7nmegUDbwbAcn1Nz8GYVYAjQxB2oSDSX2AD5fH6xONzomGPRMrcPuiSC7 + NwMnAa2mlK5J0Hg30pwN6uYgUhvtkNca4F3qxOg8i9XPIj5tKpgJ8hhf/IIRa4Nm4OQvWExKRuWhblmR + YrtyVeVIDaRQJfqdMSxHBcwyEpwhEdPE3piC3jcMDJyiPPcLZV3lCPwEynoT5HA1gSsg+i/n2g7EFTiD + SUwFkpigBcxHFHQ5onsBK3cKYlLCl6AdPZnkagcEfxsEuhHCx1r0kpmX10U4/Ltw1u/WFFjGVvYC6Nr8 + 63T94W5f3aG4p75A/tGvhu9pMwEeCwRyMTLmSHXrewHmujbdVnXqohHxezXbmAMWO2MeILvom47hkf1t + xlxn0b3j7XC3lPLPyvNLjaN/rhdVZ664Hl7iQrZmjN0uEY3Pf6en5QdLx82nJfvdc3u7+DdR1FcpHSQI + 6GT/VwAAAABJRU5ErkJggg==