diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index dee3ec1..af69ce4 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.11.06.0950")] -[assembly: AssemblyFileVersion("23.11.06.0950")] +[assembly: AssemblyVersion("23.11.09.0850")] +[assembly: AssemblyFileVersion("23.11.09.0850")] diff --git a/SubProject/FCM0000/Item/fItems.Designer.cs b/SubProject/FCM0000/Item/fItems.Designer.cs index dffdebb..c77be87 100644 --- a/SubProject/FCM0000/Item/fItems.Designer.cs +++ b/SubProject/FCM0000/Item/fItems.Designer.cs @@ -43,7 +43,7 @@ FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); 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.ComboBoxCellType comboBoxCellType1 = new FarPoint.Win.Spread.CellType.ComboBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); 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); @@ -86,7 +86,6 @@ 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(); @@ -120,6 +119,7 @@ this.taPurchase = new FCM0000.dsMSSQLTableAdapters.PurchaseTableAdapter(); this.bsStaff = new System.Windows.Forms.BindingSource(this.components); this.taStaff = new FCM0000.dsMSSQLTableAdapters.StaffTableAdapter(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -127,12 +127,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 @@ -511,143 +511,6 @@ this.fpSpread1.Size = new System.Drawing.Size(877, 623); 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 = 14; - 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 = "분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "SID#"; - 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, 10).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).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 = 62F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "disable"; - 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 = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Storage"; - 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 = 79F; - this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "cate"; - 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 = 113F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "name"; - 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; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "SID#"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "model"; - 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; - 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(7).CellType = currencyCellType1; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "price"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - 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 = 123F; - numberCellType2.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "priceD"; - this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.Blue; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - 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 = 94F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "manu"; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 113F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "scale"; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "unit"; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "supply"; - this.fpSpread1_Sheet1.Columns.Get(12).Tag = "supplyname"; - this.fpSpread1_Sheet1.Columns.Get(12).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(13).CellType = comboBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "supplyidx"; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "공급처"; - this.fpSpread1_Sheet1.Columns.Get(13).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; @@ -930,6 +793,139 @@ // this.taStaff.ClearBeforeFill = true; // + // 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 = 14; + 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 = "분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "품명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "SID#"; + 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, 10).Value = "규격"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).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 = 62F; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "disable"; + 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 = 78F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Storage"; + 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 = 79F; + this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "cate"; + 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 = 113F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "name"; + 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; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sid"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "SID#"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "model"; + 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; + 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(7).CellType = currencyCellType1; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "price"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + 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 = 123F; + numberCellType2.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "priceD"; + this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.Blue; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + 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 = 94F; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "manu"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 113F; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "scale"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 84F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "unit"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "supplyname"; + this.fpSpread1_Sheet1.Columns.Get(12).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "공급처"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + 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 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -952,7 +948,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); @@ -961,6 +956,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(); diff --git a/SubProject/FCM0000/Item/fItems.cs b/SubProject/FCM0000/Item/fItems.cs index a4e05d9..a339927 100644 --- a/SubProject/FCM0000/Item/fItems.cs +++ b/SubProject/FCM0000/Item/fItems.cs @@ -42,18 +42,18 @@ namespace FCM0000 //공급처 목록을 업데이트 함 var taCustom = new dsMSSQLTableAdapters.CustomsTableAdapter(); var customData = taCustom.GetData(FCOMMON.info.Login.gcode); - var colSupply = this.fpSpread1_Sheet1.Columns["supply"]; - var cy = colSupply.CellType as FarPoint.Win.Spread.CellType.ComboBoxCellType; - List items = new List(); - List itemData = new List(); - foreach (var item in customData) - { - items.Add(item.name); - itemData.Add(item.idx.ToString()); - } - cy.Items = items.ToArray(); - cy.ItemData = itemData.ToArray(); - cy.EditorValueChanged += cy_EditorValueChanged; + //var colSupply = this.fpSpread1_Sheet1.Columns["supply"]; + //var cy = colSupply.CellType as FarPoint.Win.Spread.CellType.ComboBoxCellType; + //List items = new List(); + //List itemData = new List(); + //foreach (var item in customData) + //{ + // items.Add(item.name); + // itemData.Add(item.idx.ToString()); + //} + //cy.Items = items.ToArray(); + //cy.ItemData = itemData.ToArray(); + //cy.EditorValueChanged += cy_EditorValueChanged; this.cmbSort.SelectedIndex = 0; diff --git a/SubProject/FCM0000/Item/fItems.resx b/SubProject/FCM0000/Item/fItems.resx index 37b5c84..1f60b91 100644 --- a/SubProject/FCM0000/Item/fItems.resx +++ b/SubProject/FCM0000/Item/fItems.resx @@ -159,7 +159,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -170,7 +170,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -179,7 +179,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -188,7 +188,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -222,20 +222,20 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVEhLtVZbTxNBFCZeYrxEjY8++KKiMfHFRAgviv4H - o/4Bn9RoDBETzcQgRmjLtrbQVuwFygKloZRud5dLvYRCd7c8gJFuIaDcTMqLCT5BImbd00wTYwa6A9sv - +TLZ2TPflzln5uxWmIHHtvDhZ1bvxZetvTdghGf8ynzc6uvbz4SER0FBFiMTuZWkkt8cX/ylwQjPPn2e - 6Uo8RAjtw0v2juaOaE1wSJEUdW3ry09N246Kmt/y81L6dUe8Bi/dPZiQeDc++W2FZLQdo9Lssp0V7mAJ - elj88asxZW6JJF6K0czCj2Z2FzuHmkJ6SaJGCWmnrjkcpFI1LUU5m9+CA4cljSHAS0MkMVoGeVnEkqXx - xNJ5NJpSV0lCtISrZvie1zW9v/Ahs7ZJEqLlwFR+o67Jfx5L7wzU1n1zfHGdKETL1Pd1DTl7arH0zqi3 - vqscmFrbIAnREnZcb2s/h6V3BkLeI1AbkhAt+9O5ZapeDr2XJETLgCjzWNIY4P5B7yWJGaW8mP9t7+Tv - Y0ljgI7jE/fWuQKCNEHdufQFB6yBwdFBeY4oWoqxzMIqda9+4HAcaumMcVz6qxZOTmrxzDxRfDvC14np - 4W9jOWOAE20JDoic9FUTFFXj0jNacyCW8nFpCXovyahIqCmk1+KLVWM5Y0BM4KS+01RCmimYwmj1x4Yh - A1ArOHB+URbgisD9hD8QGKNSbgl6Mhwk+pra2k85WX4sIWcLpryU1VpC3AjpDsIcNBnk7qmFcdf/XMjZ - fdrZzStC0VTJanY2MYZcrmM4xHw0OIJnXWF+mtcNwRTM7V3xScgADjEfje7QJXd4eKZgWNipqrlYfhoy - gEPMxytP7xVPJKkWTYHuiDiF7B1ncIj5aPB0XfP0j87/Z6rqn69KHGI+nr7xnmiLJOf+NW2PJnPPneHL - OKQ8eMH4qiMfP/0pmvr0naO3bBV+XT7c83oPMiHuc59u7u0fmW1sZa/jV+UHmCNbsAo5QsfxVJlRUfEX - RWVZ//5ppeoAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVEhLtVZbTxNBFCZeYrxEjY8++KKiMfHFRAgvCv4H + o/4Bn9RoDBETzcQgRmjLtrbQVuwFygKloZRud5dLvYRCdxcewNALBJSbKbyY4BMkYtY9zTQxZqA7sP2S + L5OdPfN9mXNmzm6ZEXhiCR59bnZfftXSUwMjPONXxuN2b+9BJiA89guyGBrPrsTlta2xxV8qjPDs0eaZ + ztgjhNABvGT/aGoPV/kHFUlJr21//amqO1FJ57a9vJR80x6twkv3DiYg3otOflshGe3EsDS7bGWFu1iC + HiZv9HpEmVsiiRdjeGLhRxO7h51DTSG9JFG9hLRT1xwOUrGaFqOcym3DgcOS+uDjpUGSGC39vCxiyeJ4 + auo4Hk5kVklCtISrpvue1zZ+uPRRWd8iCdGyf2pts7bRexFL7w7U2nVrbHGDKETLxPcNFdm7q7H07qgz + vy/vn1rfJAnREnZcZ2m7gKV3B0LuY1AbkhAt+5LZZapeDr2XJERLnyjzWFIf4P5B7yWJ6aW8mPtt7eAf + YEl9gI7jEffXuXyCNE7dubQFh8y+gZEBeY4oWoyRiYVV6l790GY70twR4bjkjBqMT6rRiXmi+E6ErxPT + zd/BcvoAJ9rk7xc5aUYVlIzKJVNqky+S8HBJCXovyahAqCmk1+SJVGI5fUCM77S200RMSuVNYTR7I0OQ + AagVHDivKAtwReB+wh8IjGEpuwQ9GQ4SfU0tbWfsLD8ak9N5U15Kq80Bbph0B2EOmgxydlfDuOd/LmTv + Omvv4hWhYKqkVSsbG0UOxwkcYjzqbf7zjiA/zWuGYArm1s7oJGQAhxiPBmfgijM4lMob5neaUR0sPw0Z + wCHG47Wr55orFM8UTIHOkDiFrO3ncIjxqHd13nD1jcz/Z5rRPl/lOMR4PHvrPtUais/9a9oWjmdf2INX + cUhp8JLxVIY+ff5TMPVoO0fv2Ar8unS473YfZgLcl17N3N03PNvQwt7Er0oPMEcWfwWyBU7iqRKjrOwv + mt1Z7u+KDIgAAAAASUVORK5CYII= @@ -282,25 +282,25 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQmSURBVEhLtVfrT1NnHD6ZLvon6JYlLt7mvutM/LCvixoR - xVQUiqVV6hWFSpVLDlRF2gO00yIy1gEDWm+4BZVKoQGkLS1VLrqMMsQWtqFbJgWmfnO1z+F96RGqo+Ps - Sd70JL/n/T19L7/Ly8SKXbuuLdp28sePduY1f7Ejr3lTXM7dT75k2xYTs7iQsC1rZCUu7lB5v/2EaWDk - uGlwnK3y/VPQMBbKqvzpVaLGvplQxYGEbVsh/9prOfX90HNdUzDEWSfmjLM//BHao2nZSqYsHFKdU6Wq - +eU3zhpdkI7ZwlJtpz39cn9g9kgqcozuzLPGEdpc4AxTda6K/Pqxl0IBrDjLMjJ5tOKR66Cx16IwdFcq - DB7TfoO7MYFt3UCmM4fL+5uF8zBU1YFnyZwzmVCiA6KFjcOv6SRd00RIXfP499QST4WksGUNob0Tc4WD - IWlxVyMxRwe2V7hS7Z3xUNoFb0cS1/Epofwroq04o973MqXIeYxQ3gYu0vSZRkTl+u6bXx1tWkIo8wIV - VlsCwaLb4zPiquqB0agLUBjcV+hFwvamXbzfHqsoAGGcaVJRp1xp7HVRYfhUlHprCW0aezX2tQgZSsKZ - xrK9Quw972hP4py78b1d074OvqhfVfWTZ4ka22qeCMg4F0fjFL+yUs9lYooZcWrrCvLJQ6H3fBcJybDv - cCIiJoZBRqL/Ksfsn9oh/FcLBCIhy+yfpP4PlvXZeAPiFmmQGo6V9zl5g4g4cumhm/qHFp/bt2Tf+vh0 - zZMJalAae64QvmhQXui5Sv2frvFPoMgw8axtY0HD4EzCSNV7KwhfNMAn9Y/iEp9t28igvOU3+P5X4f2G - 7m+o//wbvtfxeU3r+a0WHn6a0Sv+Vpf1Xqf+UVI3q24vYw4cuP+h8HLhIhC+aBBeroxKnx8XmjcoL/W2 - UkOWOTApZjglsm2f5ZhHpqj/Q+V9LcQUPvxid7EwyBH0xMRjdlKIBfJSz7fC5CTlnFpiYpiEXPvazNrh - P+m/QppLOHfvc9iQ/pAGeWKMQMukrh18Sv1m1A3/lVB4dxUxT0Ou91iQyCkpXCSciefbpSfrhsaQ+Alt - 3ggniaXwEfEZRLWrI+YIJDr7yhNVP/9KhVHS1OZAEN+xCkNUpnc3orRSf5lVA6OScEdKKG8jRetQ5jf4 - /6ZkOmIRxvYqjQ8cQlH2xuMX0uLOdEKJjpSSrluRizZ/YYnGtk5e4jHhTIVHhjYqhXO8v9olazskOFOh - KIZQGI0dGjw0emj4lGV9VxGnuebAFL29dGClEJ2J22hA64kWNFpripaV0Bi0smhphQJzRzCkCp9psq7z - OJm2cLxPGCtGyMj03fXvvEj/FXiu4NmC5wsqDXJvumkggOy3j+vSSs7YVxKquEARx0MNDzZUtvhs63KW - ZT8g5nmCYd4A3cPztue5qtUAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQjSURBVEhLtVdbT1NZGD1xxjg/wUsmceLddy+JD75OdDKI + YioKxdIq9YpipQqSg1WR9gCtWkTEKgi03tAJOlSKDSBtaakKzEwsKtqCipcoBWb0TWvXYW96hOpQOa5k + pyf51v5W9+W7bCZWrF176Yff9/4xfU1O/ZLVOfXL4rJv/rycbfyRmMWFhG2YKyt0cVtLOu27Tb6eXaYH + /exZ38eDNX2hzLJ/3idq7CsIVRxI2MaZ8mNey77zj97q6oIhzjowZhy+9iq0XtPwG5kycUh1TpWq4uEz + zhpdkI7RwlJtiz39VGdg9EjKd/SuybHGEdpY4AxTda7S3Oq+d0IBrDjT0jO4o/Rv1xZju0VhaCtTGDym + TQZ3bQJ7azGZzmwr6awXzsNQlQdeJnPOZEKJDojm1XZ/oJN0dQMhdUX389RCT6kkr2EuoX0RY4WDIWlB + ay0xRwe2V7hS7Z/9obTj3uYkrvkXQvlfRFtxRnXXu5R8505C+Ry4SMNnGhGV69uu/rqjbgqhjAtUWG0J + BPNv9I+Iq8p9vVEXoDC4L9CLhO1NO3GnKVZRAMI406T8FrnS2O6iwvCpKPJWEtowNmjs8xAylIQzjWV7 + hdhw1NGUxDnX4XuVpmkBfFG/qvInLxM1tjk8EZBxLo7GKX5lRZ5TxBQz4tTWmeSTh0LvORsJybDvcCIi + JoZBRqL/KtvsH1ot/FcTBCIh0+wfpP63FHfYeAPiFmmQGnaWdDh5g4jYfvIvN/UPLT63r8y6PmN/xZMB + alAa710gfNGgPH7vIvW/v8I/gCLDxLO2pQdrukYSRqreW0r4ogE+qX8Ul/gs21IG5S23xvddhTcZ2k5T + /7lXfB/ic+oW8VstPPw0o1f8rS5uv0z9o6SuUN2YymzefGey8HLhIhC+aBBeroyyLj8uNG9Qnmy/RQ2Z + 5sCgmOGUyDbOzzb3DFH/W0s6GogpfPgF7gJhkCPoiYnH6KQQC+RFnjPC5CTlnFpiYpiEA/Z5eyofv6b/ + Cmku4cjthbAh/SEN8sQYgZZJXfngBfWbUfX4TULezdnEPAy53mNBIqekcJFwJh5tku6tetSHxE9o40Y4 + SfwEHxGfQVS7KmKOQKKzz9p97v5TKoySpjYHgviOVRiiMr27FqWV+ttzztcrCXekhPI5UrQOZW6N/19K + piMWYWyv0njXIRRlr3T/Jy1oSSeU6EgpbL0euWjjF5ZobAvkhR4TzlR4ZGijUjjH16tdsrZZgjMVimII + hdHYocFDo4eGT1nccRFxesAcGKK3lw6sFKIjcRsNaD3RgkZrTdGyEhqDVhYtrVBg7AiGVOEzTda17CLT + Jo6vCWPFCBmZvq36ixfpW4HnCp4teL6g0iD3ppt8AWS/jVyrVnLIPotQxQWKOB5qeLChssVnWaexLDuJ + mMcJhvkEj8Lzq4oHQwoAAAAASUVORK5CYII= @@ -345,7 +345,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKQSURBVDhPzZLbSptBFIX/Nyj0MTxcSAwiihoRBS9EQVQ0 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKPSURBVDhPzZLbSptBFIX/Nyj0MTxcSAwiihoRBS9EQVQ0 5GRiDqhBUREJRqlR8RgSczZJaRpBQREqTRUpXlijIBKlMbFVaPsGpVDohX6d/6f0FdqBxczArLXX2nuk /2OFQiHP+vp6dmlpKbewsHDtdrtvJycn70dGRr4ODQ19m5iYuF9cXPT+eS719vaqOjs7nyuXSCTyLBwO c3Fxwfn5OWdnZ5yenhLzu/n15TU/3mvwuOz4/T4GBwd1Wq32uwACT319fWpJVPi8t7fHzc0N+/v7pFIp @@ -355,8 +355,8 @@ v8ORvMOeuMMSK6IP35JOp+nq6lLiLC8v093dzfj4ONXV1Ugmk4m1tTWy2awiYBGVZbLj5R3WeBFTtKA4 bG9vVxrq8Xhoa2tjeHiYqqoqJIPBgJg9h4eHmIM5jNEi1k0BQR4Quy16xcrKCq2trUSjUWZmZmhpaVGm oVarkeRs09PTirVA+p0QucIQFdlFH2yRK174U4h5o9FoCAQCSvbGxkbMZjMqlQpJzuN0OpW5Tk1NKXbl - Tvv9fubn5+np6VHGJRO8Xi9jY2MYjUbEb6SiogJJ2HGWlpb+FHYem5ubn5qampRq9fX11NbWUllZ+VRe - Xv5YVlb2KN79RUlJiYy3ynf+h0uSfgPEsdG8SMl3KAAAAABJRU5ErkJggg== + Tvv9fubn5+np6VHGJRO8Xi9jY2MYjUbEb6SiogJJ2HGWlJT8FHYem5ubn5qampRq9fX11NbWUllZ+VRe + Xv5YVlb2WFpa+heCI+Ot8p3/4ZKk38J60bkqmPGtAAAAAElFTkSuQmCC diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs index 836de5b..45ada11 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs @@ -144,6 +144,11 @@ namespace FEQ0000 //} } this.cmbManager.SelectedIndex = 0; + var manidx = cmbManager.Items.IndexOf(FCOMMON.info.Login.nameK); + if (manidx >= 0) + { + cmbManager.SelectedIndex = manidx; + } //this.cmbAdmin.SelectedIndex = 0; @@ -871,6 +876,7 @@ namespace FEQ0000 newdr.bigo = string.Empty; newdr.bigo2 = string.Empty; + newdr.purchase_manager = string.Empty; newdr.request = FCOMMON.info.Login.no; newdr.receive = "";// FCOMMON.info.Login.nameK; diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs index 8871c8a..4e019dc 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs @@ -53,15 +53,16 @@ namespace FEQ0000 } //필수로 - if(FCOMMON.info.Login.gcode == "K4PM") + if (FCOMMON.info.Login.gcode == "K4PM") { tbCostCenter.BackColor = Color.FromArgb(255, 255, 192); tbLineCode.BackColor = Color.FromArgb(255, 255, 192); tbManager.BackColor = Color.FromArgb(255, 255, 192); } - this.tbPumPrice.Validated += (s1, e1) => { + this.tbPumPrice.Validated += (s1, e1) => + { - if(tbPumPrice.Tag != null && tbPumPrice.Tag.ToString().Equals(tbPumPrice.Text)) + if (tbPumPrice.Tag != null && tbPumPrice.Tag.ToString().Equals(tbPumPrice.Text)) { } @@ -74,8 +75,8 @@ namespace FEQ0000 } } - - + + }; } @@ -134,7 +135,7 @@ namespace FEQ0000 { if (cmbRemark.SelectedIndex > 0) { - tbBigo.Text = cmbRemark.Text.Replace(@"\n",Environment.NewLine) + tbBigo.Text.Trim(); + tbBigo.Text = cmbRemark.Text.Replace(@"\n", Environment.NewLine) + tbBigo.Text.Trim(); } }; cmbRemark.SelectedIndex = 0; @@ -271,7 +272,11 @@ namespace FEQ0000 chk2.Checked = dr.chk2; tbManager.Text = dr.purchase_manager; - // tbAdmin.Text = dr.purchase_admin; + if (tbManager.Text.isEmpty() && tbManager.Items.Count == 1) + { + tbManager.Text = (tbManager.Items[0] as DataRowView)["Value"].ToString(); + } + // tbAdmin.Text = dr.purchase_admin; tbSC.Text = dr.sc; tbPO.Text = dr.po; @@ -446,7 +451,7 @@ namespace FEQ0000 this.tbPumUnit.Text = f.itemUnit; //181214 this.tbStorage.Text = f.Storage; this.tbPumModel.Enabled = this.tbPumModel.Text.isEmpty(); - + this.tbPumUnit.Enabled = false; if (tbSID.Text != "") tbSID.Enabled = false; else tbSID.Enabled = true; @@ -575,7 +580,7 @@ namespace FEQ0000 if (FCOMMON.info.Login.gcode == "K4PM") { - if(tbCostCenter.Text.isEmpty()) + if (tbCostCenter.Text.isEmpty()) { FCOMMON.Util.MsgE("CostCenter 를 입력하세요"); tbCostCenter.Focus(); @@ -774,7 +779,7 @@ namespace FEQ0000 //품목정보에 없는 데이터이므로 자료를 추가한다. if (tbPumIDX.Text == "-1") { - var newidx = FCOMMON.DBM.addItem(tbPumName.Text, tbSID.Text, tbPumModel.Text.Trim(), decimal.Parse(tbPumPrice.Text.Replace(",","")), tbSupply.Text.Trim(), int.Parse(tbSupplyIndex.Text), null); + var newidx = FCOMMON.DBM.addItem(tbPumName.Text, tbSID.Text, tbPumModel.Text.Trim(), decimal.Parse(tbPumPrice.Text.Replace(",", "")), tbSupply.Text.Trim(), int.Parse(tbSupplyIndex.Text), null); if (newidx > 0) tbPumIDX.Text = newidx.ToString(); } else if (tbSID.Text != "" && tbSID.Text != tbSID.Tag.ToString()) @@ -796,7 +801,7 @@ namespace FEQ0000 } //단가가없는경우 생성한다. - if (decimal.TryParse(tbPumPrice.Text.Replace(",",""), out decimal vprice) == false) + if (decimal.TryParse(tbPumPrice.Text.Replace(",", ""), out decimal vprice) == false) { if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal vpriced) == true) { @@ -871,7 +876,7 @@ namespace FEQ0000 dr.linecode = tbLineCode.Text; dr.purchase_manager = tbManager.Text; - // dr.purchase_admin = tbAdmin.Text; + // dr.purchase_admin = tbAdmin.Text; if (tbSupplyIndex.Text == "") dr.SetsupplyidxNull(); else dr.supplyidx = int.Parse(tbSupplyIndex.Text); @@ -1003,7 +1008,7 @@ namespace FEQ0000 var b1 = int.TryParse(tbQtyReal.Text.Replace(",", ""), out int qtyreal); var b2 = int.TryParse(tbQtyReq.Text.Replace(",", ""), out int qtyreq); - var amtstr = tbPumPrice.Text.Replace("\\", "").Replace(",", "").Replace("₩",""); + var amtstr = tbPumPrice.Text.Replace("\\", "").Replace(",", "").Replace("₩", ""); var b3 = double.TryParse(amtstr, out double price); double amt = 0; @@ -1324,8 +1329,9 @@ namespace FEQ0000 //선택된 개체의 Svalue 값이 있따면 그것을 라인코드에 넣는다. var selvalue = tbCostCenter.SelectedItem as DataRowView; var svalue = selvalue["SValue"]; - if(svalue != null) { - if(tbLineCode.Text.isEmpty()) tbLineCode.Text = svalue.ToString(); + if (svalue != null) + { + if (tbLineCode.Text.isEmpty()) tbLineCode.Text = svalue.ToString(); } }