diff --git a/Project/Dialog/PMPUpdate.Designer.cs b/Project/Dialog/PMPUpdate.Designer.cs index 8511dec..19874ed 100644 --- a/Project/Dialog/PMPUpdate.Designer.cs +++ b/Project/Dialog/PMPUpdate.Designer.cs @@ -31,27 +31,29 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PMPUpdate)); this.panel1 = new System.Windows.Forms.Panel(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.button1 = new System.Windows.Forms.Button(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.prb1 = new System.Windows.Forms.ToolStripProgressBar(); this.dsPMPDatabase = new Project.DsPMPDatabase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new Project.DsPMPDatabaseTableAdapters.SPMasterTableAdapter(); this.tam = new Project.DsPMPDatabaseTableAdapters.TableAdapterManager(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.sPMasterBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.sPMasterDataGridView = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -74,8 +76,6 @@ this.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.prb1 = new System.Windows.Forms.ToolStripProgressBar(); this.panel1.SuspendLayout(); this.statusStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dsPMPDatabase)).BeginInit(); @@ -96,23 +96,15 @@ this.panel1.Size = new System.Drawing.Size(800, 34); this.panel1.TabIndex = 0; // - // statusStrip1 + // button1 // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.prb1}); - this.statusStrip1.Location = new System.Drawing.Point(0, 428); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(800, 22); - this.statusStrip1.TabIndex = 1; - this.statusStrip1.Text = "statusStrip1"; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(50, 6); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(676, 21); - this.textBox1.TabIndex = 0; - this.textBox1.Text = "W:\\DB\\SPMaster.mdb"; + this.button1.Location = new System.Drawing.Point(732, 7); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(62, 19); + this.button1.TabIndex = 2; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); // // linkLabel1 // @@ -124,15 +116,28 @@ this.linkLabel1.TabStop = true; this.linkLabel1.Text = "파일"; // - // button1 + // textBox1 // - this.button1.Location = new System.Drawing.Point(732, 7); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(62, 19); - this.button1.TabIndex = 2; - this.button1.Text = "button1"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); + this.textBox1.Location = new System.Drawing.Point(50, 6); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(676, 21); + this.textBox1.TabIndex = 0; + this.textBox1.Text = "W:\\DB\\SPMaster.mdb"; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.prb1}); + this.statusStrip1.Location = new System.Drawing.Point(0, 428); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(800, 22); + this.statusStrip1.TabIndex = 1; + this.statusStrip1.Text = "statusStrip1"; + // + // prb1 + // + this.prb1.Name = "prb1"; + this.prb1.Size = new System.Drawing.Size(300, 16); // // dsPMPDatabase // @@ -186,6 +191,31 @@ this.bn.TabIndex = 2; this.bn.Text = "bindingNavigator1"; // + // bindingNavigatorAddNewItem + // + this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); + this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; + this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorAddNewItem.Text = "새로 추가"; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorDeleteItem + // + this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); + this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; + this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorDeleteItem.Text = "삭제"; + // // bindingNavigatorMoveFirstItem // this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -218,16 +248,9 @@ this.bindingNavigatorPositionItem.Text = "0"; this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // // bindingNavigatorSeparator1 // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); // // bindingNavigatorMoveNextItem @@ -250,27 +273,9 @@ // // bindingNavigatorSeparator2 // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // - // bindingNavigatorAddNewItem - // - this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); - this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; - this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorAddNewItem.Text = "새로 추가"; - // - // bindingNavigatorDeleteItem - // - this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); - this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; - this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorDeleteItem.Text = "삭제"; - // // sPMasterBindingNavigatorSaveItem // this.sPMasterBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -281,6 +286,15 @@ this.sPMasterBindingNavigatorSaveItem.Text = "데이터 저장"; this.sPMasterBindingNavigatorSaveItem.Click += new System.EventHandler(this.sPMasterBindingNavigatorSaveItem_Click); // + // toolStripButton1 + // + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(65, 22); + this.toolStripButton1.Text = "Update"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // // sPMasterDataGridView // this.sPMasterDataGridView.AllowUserToAddRows = false; @@ -487,20 +501,6 @@ this.dataGridViewTextBoxColumn21.ReadOnly = true; this.dataGridViewTextBoxColumn21.Width = 76; // - // toolStripButton1 - // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(65, 22); - this.toolStripButton1.Text = "Update"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); - // - // prb1 - // - this.prb1.Name = "prb1"; - this.prb1.Size = new System.Drawing.Size(300, 16); - // // PMPUpdate // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -512,7 +512,7 @@ this.Controls.Add(this.panel1); this.Name = "PMPUpdate"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "PMPUpdate"; + this.Text = "W: \\\\k4fs3202n\\atk4eqmt$\\SparePart /User:Kr\\atk4eqmt K4pmp123!"; this.Load += new System.EventHandler(this.PMPUpdate_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); diff --git a/Project/Dialog/PMPUpdate.resx b/Project/Dialog/PMPUpdate.resx index d0c9dc5..dd6d441 100644 --- a/Project/Dialog/PMPUpdate.resx +++ b/Project/Dialog/PMPUpdate.resx @@ -138,74 +138,73 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFKSURBVDhPYxi84O4C9v+35nH+vzqH6//FGbz/ocLEg+tA - jX8eNf7/87Dh/8nJAqQbcH46L9yAgz0ipBtwfJIgUHPd/z8Pqv7vaBcnbMClmTz/z07l+38SqPFIv9D/ - fd0iQM3l///eK/q/vkHm/6oauf9LKxX/zy9V/j+rSBXTwFNAf/55WA/UVAvElf//3CsB4rz/f+9m/v97 - J/n/39tx///djADikP+TcjQxDTjUKwx27t/7pUCNBUCN2UCNqUCNCf//3YoGagz7/+9G0P9/1/3+d6Xp - Yhqws13i/5Zmqf/rwM6V/7+kQvH/31sxQI3h/6fmafyfkKX1vztD9397qv7/5kRDwmEyG+hPkHP/3Qj4 - 35OhQ1gDOgD5898NfyD2+9+arE+6Ad3pumD/gnB9nBHpBrQkGfxviDf8XxNr/L8y2oR0A+gEGBgAJCPY - nnX8iGkAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== - 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 + oAc0QjgAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEsSURBVDhPYxhcoHDW8/9QJgYAyTUteP4/c+JjnGoYcmc+ - +5/QfQ+rApDcqiPv/4e3P8BtQMaUp//n7f/9P6HrDoYikNzCfR/+Bzdcw21AQs+T/7P3/frfufXvf7fS - yygKQXLTtrz/7199AbcBkV2P/k/Z9ut/ydK//xOm//1vk3sWrhgk17v6w3+v0hO4DQhsfvi/de17sGbj - ki//paOv/TeOXAbWAJKrm//uv0v+AdwGeFTd/18y9x1cs6JLD1wxSC5/2pv/9hnbcRtgX3r3f2DLMwzN - IACSy578+r9FwnrcBljk3flvU3AFQzMIgORS+1/DvYQVGGbdxqoZBEByYS0v/+sGz8NtgE7aDZySIDm/ - 6of/NXyn4TYAH3DKvfJfxWMCGEOFBgVgYAAAvtG/s7kMTpwAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABMSURBVDhPY6AK+Pbt239SMVQrBIAFgufA8Yf3H+EYWQxE - x0zYh2kIKQaAMMwQqHbSDQBhog1AxshqaGsAMXjUgEFpADkYqp0SwMAAAPRDDFPA2mtzAAAAAElFTkSu - QmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index 816ba4b..b5a395a 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -51,15 +51,15 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); 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.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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 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.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); this.radSortGrp = new System.Windows.Forms.RadioButton(); @@ -787,8 +787,8 @@ 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 = "PMP"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "구매"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "PMP재고"; + 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, 12).Value = "제조사"; @@ -864,43 +864,47 @@ this.fpSpread1_Sheet1.Columns.Get(7).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(7).Tag = "qty"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "qtyjago"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "PMP"; - this.fpSpread1_Sheet1.Columns.Get(8).Tag = "pmp"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 66F; - this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); numberCellType4.DecimalPlaces = 0; numberCellType4.NegativeRed = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType4; + numberCellType4.NullDisplay = "--"; + numberCellType4.Separator = ","; + numberCellType4.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "qtyjago"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "PMP재고"; + this.fpSpread1_Sheet1.Columns.Get(8).Tag = "pmp"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType5.DecimalPlaces = 0; + numberCellType5.NegativeRed = true; + numberCellType5.NullDisplay = "--"; + numberCellType5.Separator = ","; + numberCellType5.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "qtybuy"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "구매"; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "구매수량"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "buy"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 70F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ItemUnit"; 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(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - numberCellType5.NegativeRed = true; - numberCellType5.Separator = ","; - numberCellType5.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5; + numberCellType6.DecimalPlaces = 0; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + numberCellType6.NegativeRed = true; + numberCellType6.Separator = ","; + numberCellType6.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amt"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(11).Label = "금액"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ItemManu"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(12).Label = "제조사"; @@ -908,34 +912,34 @@ this.fpSpread1_Sheet1.Columns.Get(12).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(13).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "ItemSupply"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(13).ImeMode = System.Windows.Forms.ImeMode.Hangul; this.fpSpread1_Sheet1.Columns.Get(13).Label = "공급사"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "option2"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(14).Label = "납기일"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(15).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).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(16).CellType = numberCellType6; + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "ItemSupplyidx"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 90F; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 80F; this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.fpSpread1_Sheet1.Columns.Get(17).DataField = "Item"; this.fpSpread1_Sheet1.Columns.Get(17).Label = "품명코드"; diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index 7de9c83..0e0efe4 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -280,92 +280,92 @@ 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 - AElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKnSURBVDhPvVLfT1JRHL/ruf6GHpplPLRVGw/10IOvvdbc + zIfemk9tmloaZA2LUEOUYSJsgMYEAkPSy4+75PLDcJXO2DBQkEG//JUGXiGsT/dc7pZurcc+22dn++58 + zud8PudQ/x0WiwVGoxHDw8PQarXXqEgkAsJQKISZmRkwDAOfz4fp6WlMTk7C5XLBbrfDarXCbDYLeyuV + CvL5PNRqdZwKh8PY399HuVz+JwuFAgwGw8ednR0sLS1BpVJllEplE8WyrDDI5XKYnZ1FNpsFmWUyGfj9 + fqRSKXg8HmGPw+FAPB4XbsSL68RUFBUIBBCNRsmVpcFgEE6nU0rEY2NjUhJDr9dLiVij0Uj5mZBfoVDU + inKKomkai4uLQgfpdFrogDgTcSKRAOPWYJltxfgzIxYWFog75HL5UVFexcTEBIrFIrxer+DsdrsFZ6fD + iiTdkNlM2fHW1Tg6MjICmUwGUfYHNputc25uDslkEkRMnPkZEhEt1hOjqBSX8d55Fe+ibrS3t/8SZYdh + MplI0xgaGsLAwAD0WgUWHVdQWveg9KkPWysvERu/gdZbzX8/4CD4kEfitsuWjQ8OlHL3wT46jx+bDswb + 6/BEVv9d3FYFn+vUUx46nY40jd7eXhjUrcgwHSivmcEtXwf78Cz2sm3YTk/B33fpZ1h54Zgopyj+WTrJ + 2t/ff7Onp2dVpVQ0zxvq3nzji9tbbcFusr7KVCMfRY1sUIOw8pxMEBMMDg528t9S+CixWAxTpg5k2T6U + v+gE991UAx/hnLBy6SZwn1/g1YPar6xcIhGPqKK7uxtdXV0IqS9ucxsrKG8xKK3xHazZD/A5KoU48q9H + wdypsYvSw2Afn9lg7km4gFzC+Xn6eHrlpzn6bi1Hd5zk6Ns1HN12ggu0HA/9Btq+MKJpIMd/AAAAAElF + TkSuQmCC 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 + dZZIJBL9BohloZ6S1+tQAAAAAElFTkSuQmCC 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 - AElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKmSURBVDhPvVLfT1JxHL3ruf6GHpplPLRlGw/10IOvvdZq + 5kNvzac2TS0NRg2LUEOUYSJsgMYCAkNSft2Syw/DVTpiw0BBBv3yVxp4hbBO93u5W7q1Hjvb2Xf77Hu+ + 53vO90v9d5jNZhgMBoyMjECj0VylIpEICEOhEGZmZkDTNHw+H6anpzE5OQmn0wmbzQaLxQKTycTvrVar + KBQKUKlUCSocDmNvbw+VSuWfLBaL0Ov1H7e3t7G4uAilUplVKBQtFMMw/CCfz2N2dha5XA5kls1m4ff7 + kU6n4Xa7+T12ux2JRIK/ESduFFJRVCAQQDQaJVcWB4NBOBwOMRGPj4+LSQydTicmYrVaLeZmfH65XF4v + yCnK4/EgHo/zHWQyGb4D4kzEyWQStEuNJaYdT58YsLCwQNwhlUoPC/IaJiYmUCqV4PV6eWeXy8U7O+wW + pDxN2Y20DW+dzWOjo6OQSCQQZH9gtVq75+bmkEqlQMTEmZshGdFgLTmGamkJ7x2X8C7qQmdn5y9BdhBG + o5E0jeHhYQwODkKnkSNuv4jymhvlT/3YXH6B2NPraL/Z+vcD9oMLeShhvWBe/2BHOX8XzIMz+LFhx7yh + EY8kV74L22rgcp14zEGr1ZKm0dfXB72qHVm6C5VVE9ila2Dun8ZurgNbmSn4+8//DCvOHhHkFMU9SzdZ + BwYGbvT29q4oFfLWeX3jm29ccbsrbdhJXa4x3cxFUSEXVCOsaJDwYoKhoaFu7lvyHyUWi2HK2IUc04/K + Fy3vvpNu4iI08CubaQH7+Tle3av/ykhFIuGIGnp6eiCTyRBSndti15dR2aRRXuU6WLXt4zNUiwkUXo+B + vl1nE6QHwTw8tf5SJmJpqYgNcPRz9ElPst479ayn6zjruVXHejqOsYG2o6Hf3OgwqqoSGf0AAAAASUVO + RK5CYII= diff --git a/SubProject/FPJ0000/Project/fProjectPartImport.Designer.cs b/SubProject/FPJ0000/Project/fProjectPartImport.Designer.cs index a1fdad3..dae1619 100644 --- a/SubProject/FPJ0000/Project/fProjectPartImport.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectPartImport.Designer.cs @@ -29,31 +29,18 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectPartImport)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); this.textBox1 = new System.Windows.Forms.TextBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.btView = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.noDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemGroupDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemSidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemModelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.qtyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemUnitDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.priceDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.amtDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemManuDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemSupplyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemSupplyidxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); this.panel1 = new System.Windows.Forms.Panel(); @@ -82,14 +69,14 @@ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.sbSum = new System.Windows.Forms.ToolStripLabel(); this.panel2 = new System.Windows.Forms.Panel(); + this.nudMidDiv = new System.Windows.Forms.NumericUpDown(); + this.label6 = new System.Windows.Forms.Label(); this.nudNapKi = new System.Windows.Forms.NumericUpDown(); this.label5 = new System.Windows.Forms.Label(); - this.nudBuwi = new System.Windows.Forms.NumericUpDown(); + this.nudLowDiv = new System.Windows.Forms.NumericUpDown(); this.label4 = new System.Windows.Forms.Label(); this.nudMemo = new System.Windows.Forms.NumericUpDown(); this.label21 = new System.Windows.Forms.Label(); - this.nudGrp = new System.Windows.Forms.NumericUpDown(); - this.label20 = new System.Windows.Forms.Label(); this.nudSupply = new System.Windows.Forms.NumericUpDown(); this.label19 = new System.Windows.Forms.Label(); this.nudModel = new System.Windows.Forms.NumericUpDown(); @@ -110,8 +97,22 @@ this.label9 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsPartTableAdapter(); - this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); - this.label6 = new System.Windows.Forms.Label(); + this.itemGroupDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.option1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.noDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemSidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemModelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.priceDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.qtyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemUnitDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.amtDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemManuDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemSupplyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.option2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemSupplyidxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); @@ -122,10 +123,10 @@ ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudMidDiv)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudNapKi)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudBuwi)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudLowDiv)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMemo)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudGrp)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudSupply)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudModel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudNo)).BeginInit(); @@ -135,7 +136,6 @@ ((System.ComponentModel.ISupportInitialize)(this.nudQty)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudName)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudSid)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); this.SuspendLayout(); // // textBox1 @@ -165,8 +165,8 @@ this.btView.ForeColor = System.Drawing.Color.Black; this.btView.Location = new System.Drawing.Point(918, 23); this.btView.Name = "btView"; - this.btView.Size = new System.Drawing.Size(102, 59); - this.btView.TabIndex = 4; + this.btView.Size = new System.Drawing.Size(102, 64); + this.btView.TabIndex = 26; this.btView.Text = "1. 보기"; this.btView.UseVisualStyleBackColor = true; this.btView.Click += new System.EventHandler(this.button1_Click); @@ -179,146 +179,31 @@ this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.noDataGridViewTextBoxColumn, this.itemGroupDataGridViewTextBoxColumn, + this.option1, + this.noDataGridViewTextBoxColumn, this.itemSidDataGridViewTextBoxColumn, this.itemNameDataGridViewTextBoxColumn, - this.itemDataGridViewTextBoxColumn, this.itemModelDataGridViewTextBoxColumn, + this.priceDataGridViewTextBoxColumn, this.qtyDataGridViewTextBoxColumn, this.itemUnitDataGridViewTextBoxColumn, - this.priceDataGridViewTextBoxColumn, this.amtDataGridViewTextBoxColumn, this.itemManuDataGridViewTextBoxColumn, this.itemSupplyDataGridViewTextBoxColumn, - this.itemSupplyidxDataGridViewTextBoxColumn, - this.memoDataGridViewTextBoxColumn}); + this.option2, + this.memoDataGridViewTextBoxColumn, + this.itemDataGridViewTextBoxColumn, + this.itemSupplyidxDataGridViewTextBoxColumn}); this.dataGridView1.DataSource = this.bs; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridView1.Location = new System.Drawing.Point(0, 171); + this.dataGridView1.Location = new System.Drawing.Point(0, 176); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1022, 465); + this.dataGridView1.Size = new System.Drawing.Size(1022, 460); this.dataGridView1.TabIndex = 1; // - // noDataGridViewTextBoxColumn - // - this.noDataGridViewTextBoxColumn.DataPropertyName = "no"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.noDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle19; - this.noDataGridViewTextBoxColumn.HeaderText = "No"; - this.noDataGridViewTextBoxColumn.Name = "noDataGridViewTextBoxColumn"; - this.noDataGridViewTextBoxColumn.Width = 46; - // - // itemGroupDataGridViewTextBoxColumn - // - this.itemGroupDataGridViewTextBoxColumn.DataPropertyName = "ItemGroup"; - this.itemGroupDataGridViewTextBoxColumn.HeaderText = "그룹"; - this.itemGroupDataGridViewTextBoxColumn.Name = "itemGroupDataGridViewTextBoxColumn"; - this.itemGroupDataGridViewTextBoxColumn.Width = 54; - // - // itemSidDataGridViewTextBoxColumn - // - this.itemSidDataGridViewTextBoxColumn.DataPropertyName = "ItemSid"; - this.itemSidDataGridViewTextBoxColumn.HeaderText = "SID"; - this.itemSidDataGridViewTextBoxColumn.Name = "itemSidDataGridViewTextBoxColumn"; - this.itemSidDataGridViewTextBoxColumn.Width = 49; - // - // itemNameDataGridViewTextBoxColumn - // - this.itemNameDataGridViewTextBoxColumn.DataPropertyName = "ItemName"; - this.itemNameDataGridViewTextBoxColumn.HeaderText = "품명"; - this.itemNameDataGridViewTextBoxColumn.Name = "itemNameDataGridViewTextBoxColumn"; - this.itemNameDataGridViewTextBoxColumn.Width = 54; - // - // itemDataGridViewTextBoxColumn - // - this.itemDataGridViewTextBoxColumn.DataPropertyName = "Item"; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.itemDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle20; - this.itemDataGridViewTextBoxColumn.HeaderText = "*"; - this.itemDataGridViewTextBoxColumn.Name = "itemDataGridViewTextBoxColumn"; - this.itemDataGridViewTextBoxColumn.Width = 36; - // - // itemModelDataGridViewTextBoxColumn - // - this.itemModelDataGridViewTextBoxColumn.DataPropertyName = "ItemModel"; - this.itemModelDataGridViewTextBoxColumn.HeaderText = "규격"; - this.itemModelDataGridViewTextBoxColumn.Name = "itemModelDataGridViewTextBoxColumn"; - this.itemModelDataGridViewTextBoxColumn.Width = 54; - // - // qtyDataGridViewTextBoxColumn - // - this.qtyDataGridViewTextBoxColumn.DataPropertyName = "qty"; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle21.Format = "N0"; - this.qtyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle21; - this.qtyDataGridViewTextBoxColumn.HeaderText = "수량"; - this.qtyDataGridViewTextBoxColumn.Name = "qtyDataGridViewTextBoxColumn"; - this.qtyDataGridViewTextBoxColumn.Width = 54; - // - // itemUnitDataGridViewTextBoxColumn - // - this.itemUnitDataGridViewTextBoxColumn.DataPropertyName = "ItemUnit"; - this.itemUnitDataGridViewTextBoxColumn.HeaderText = "단위"; - this.itemUnitDataGridViewTextBoxColumn.Name = "itemUnitDataGridViewTextBoxColumn"; - this.itemUnitDataGridViewTextBoxColumn.Width = 54; - // - // priceDataGridViewTextBoxColumn - // - this.priceDataGridViewTextBoxColumn.DataPropertyName = "price"; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle22.Format = "N0"; - this.priceDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle22; - this.priceDataGridViewTextBoxColumn.HeaderText = "단가"; - this.priceDataGridViewTextBoxColumn.Name = "priceDataGridViewTextBoxColumn"; - this.priceDataGridViewTextBoxColumn.Width = 54; - // - // amtDataGridViewTextBoxColumn - // - this.amtDataGridViewTextBoxColumn.DataPropertyName = "amt"; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle23.Format = "N0"; - this.amtDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle23; - this.amtDataGridViewTextBoxColumn.HeaderText = "금액"; - this.amtDataGridViewTextBoxColumn.Name = "amtDataGridViewTextBoxColumn"; - this.amtDataGridViewTextBoxColumn.ReadOnly = true; - this.amtDataGridViewTextBoxColumn.Width = 54; - // - // itemManuDataGridViewTextBoxColumn - // - this.itemManuDataGridViewTextBoxColumn.DataPropertyName = "ItemManu"; - this.itemManuDataGridViewTextBoxColumn.HeaderText = "제조사"; - this.itemManuDataGridViewTextBoxColumn.Name = "itemManuDataGridViewTextBoxColumn"; - this.itemManuDataGridViewTextBoxColumn.Width = 66; - // - // itemSupplyDataGridViewTextBoxColumn - // - this.itemSupplyDataGridViewTextBoxColumn.DataPropertyName = "ItemSupply"; - this.itemSupplyDataGridViewTextBoxColumn.HeaderText = "공급사"; - this.itemSupplyDataGridViewTextBoxColumn.Name = "itemSupplyDataGridViewTextBoxColumn"; - this.itemSupplyDataGridViewTextBoxColumn.Width = 66; - // - // itemSupplyidxDataGridViewTextBoxColumn - // - this.itemSupplyidxDataGridViewTextBoxColumn.DataPropertyName = "ItemSupplyidx"; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.itemSupplyidxDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle24; - this.itemSupplyidxDataGridViewTextBoxColumn.HeaderText = "*"; - this.itemSupplyidxDataGridViewTextBoxColumn.Name = "itemSupplyidxDataGridViewTextBoxColumn"; - this.itemSupplyidxDataGridViewTextBoxColumn.Width = 36; - // - // memoDataGridViewTextBoxColumn - // - this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo"; - this.memoDataGridViewTextBoxColumn.HeaderText = "비고"; - this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; - this.memoDataGridViewTextBoxColumn.Width = 54; - // // bs // this.bs.DataMember = "ProjectsPart"; @@ -601,17 +486,15 @@ // this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel2.Controls.Add(this.numericUpDown2); + this.panel2.Controls.Add(this.nudMidDiv); this.panel2.Controls.Add(this.label6); this.panel2.Controls.Add(this.nudNapKi); this.panel2.Controls.Add(this.label5); - this.panel2.Controls.Add(this.nudBuwi); + this.panel2.Controls.Add(this.nudLowDiv); this.panel2.Controls.Add(this.label4); this.panel2.Controls.Add(this.btView); this.panel2.Controls.Add(this.nudMemo); this.panel2.Controls.Add(this.label21); - this.panel2.Controls.Add(this.nudGrp); - this.panel2.Controls.Add(this.label20); this.panel2.Controls.Add(this.nudSupply); this.panel2.Controls.Add(this.label19); this.panel2.Controls.Add(this.nudModel); @@ -635,62 +518,87 @@ this.panel2.ForeColor = System.Drawing.Color.White; this.panel2.Location = new System.Drawing.Point(0, 87); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1022, 84); + this.panel2.Size = new System.Drawing.Size(1022, 89); this.panel2.TabIndex = 3; // - // nudNapKi + // nudMidDiv // - this.nudNapKi.Location = new System.Drawing.Point(431, 58); - this.nudNapKi.Name = "nudNapKi"; - this.nudNapKi.Size = new System.Drawing.Size(45, 21); - this.nudNapKi.TabIndex = 55; - this.nudNapKi.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.nudNapKi.Value = new decimal(new int[] { - 12, + this.nudMidDiv.Location = new System.Drawing.Point(61, 32); + this.nudMidDiv.Name = "nudMidDiv"; + this.nudMidDiv.Size = new System.Drawing.Size(45, 21); + this.nudMidDiv.TabIndex = 1; + this.nudMidDiv.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudMidDiv.Value = new decimal(new int[] { + 1, 0, 0, 0}); + this.nudMidDiv.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(10, 36); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(41, 12); + this.label6.TabIndex = 0; + this.label6.Text = "중분류"; + // + // nudNapKi + // + this.nudNapKi.Location = new System.Drawing.Point(453, 58); + this.nudNapKi.Name = "nudNapKi"; + this.nudNapKi.Size = new System.Drawing.Size(45, 21); + this.nudNapKi.TabIndex = 23; + this.nudNapKi.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudNapKi.Value = new decimal(new int[] { + 15, + 0, + 0, + 0}); + this.nudNapKi.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(383, 62); + this.label5.Location = new System.Drawing.Point(407, 62); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(41, 12); - this.label5.TabIndex = 54; + this.label5.TabIndex = 22; this.label5.Text = "납기일"; // - // nudBuwi + // nudLowDiv // - this.nudBuwi.Location = new System.Drawing.Point(648, 30); - this.nudBuwi.Name = "nudBuwi"; - this.nudBuwi.Size = new System.Drawing.Size(45, 21); - this.nudBuwi.TabIndex = 53; - this.nudBuwi.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.nudBuwi.Value = new decimal(new int[] { - 11, + this.nudLowDiv.Location = new System.Drawing.Point(168, 32); + this.nudLowDiv.Name = "nudLowDiv"; + this.nudLowDiv.Size = new System.Drawing.Size(45, 21); + this.nudLowDiv.TabIndex = 3; + this.nudLowDiv.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudLowDiv.Value = new decimal(new int[] { + 2, 0, 0, 0}); + this.nudLowDiv.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(597, 34); + this.label4.Location = new System.Drawing.Point(117, 36); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); - this.label4.TabIndex = 52; + this.label4.TabIndex = 2; this.label4.Text = "소분류"; // // nudMemo // - this.nudMemo.Location = new System.Drawing.Point(523, 58); + this.nudMemo.Location = new System.Drawing.Point(540, 58); this.nudMemo.Name = "nudMemo"; this.nudMemo.Size = new System.Drawing.Size(45, 21); - this.nudMemo.TabIndex = 50; + this.nudMemo.TabIndex = 25; this.nudMemo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudMemo.Value = new decimal(new int[] { - 13, + 16, 0, 0, 0}); @@ -699,44 +607,21 @@ // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(487, 62); + this.label21.Location = new System.Drawing.Point(506, 62); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(29, 12); - this.label21.TabIndex = 49; + this.label21.TabIndex = 24; this.label21.Text = "비고"; // - // nudGrp - // - this.nudGrp.Location = new System.Drawing.Point(326, 56); - this.nudGrp.Name = "nudGrp"; - this.nudGrp.Size = new System.Drawing.Size(45, 21); - this.nudGrp.TabIndex = 48; - this.nudGrp.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.nudGrp.Value = new decimal(new int[] { - 11, - 0, - 0, - 0}); - this.nudGrp.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(293, 60); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(29, 12); - this.label20.TabIndex = 47; - this.label20.Text = "그룹"; - // // nudSupply // - this.nudSupply.Location = new System.Drawing.Point(234, 56); + this.nudSupply.Location = new System.Drawing.Point(358, 58); this.nudSupply.Name = "nudSupply"; this.nudSupply.Size = new System.Drawing.Size(45, 21); - this.nudSupply.TabIndex = 46; + this.nudSupply.TabIndex = 21; this.nudSupply.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudSupply.Value = new decimal(new int[] { - 10, + 14, 0, 0, 0}); @@ -745,21 +630,21 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(187, 60); + this.label19.Location = new System.Drawing.Point(311, 62); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(41, 12); - this.label19.TabIndex = 45; + this.label19.TabIndex = 20; this.label19.Text = "공급사"; // // nudModel // - this.nudModel.Location = new System.Drawing.Point(326, 30); + this.nudModel.Location = new System.Drawing.Point(540, 32); this.nudModel.Name = "nudModel"; this.nudModel.Size = new System.Drawing.Size(45, 21); - this.nudModel.TabIndex = 44; + this.nudModel.TabIndex = 11; this.nudModel.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudModel.Value = new decimal(new int[] { - 4, + 6, 0, 0, 0}); @@ -768,22 +653,22 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(293, 34); + this.label7.Location = new System.Drawing.Point(508, 36); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(29, 12); - this.label7.TabIndex = 43; + this.label7.TabIndex = 10; this.label7.Text = "규격"; // // nudNo // this.nudNo.BackColor = System.Drawing.Color.White; - this.nudNo.Location = new System.Drawing.Point(42, 30); + this.nudNo.Location = new System.Drawing.Point(261, 32); this.nudNo.Name = "nudNo"; this.nudNo.Size = new System.Drawing.Size(45, 21); - this.nudNo.TabIndex = 37; + this.nudNo.TabIndex = 5; this.nudNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudNo.Value = new decimal(new int[] { - 1, + 3, 0, 0, 0}); @@ -792,21 +677,21 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(7, 34); + this.label15.Location = new System.Drawing.Point(226, 36); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(29, 12); - this.label15.TabIndex = 36; + this.label15.TabIndex = 4; this.label15.Text = "번호"; // // nudManu // - this.nudManu.Location = new System.Drawing.Point(139, 56); + this.nudManu.Location = new System.Drawing.Point(261, 58); this.nudManu.Name = "nudManu"; this.nudManu.Size = new System.Drawing.Size(45, 21); - this.nudManu.TabIndex = 35; + this.nudManu.TabIndex = 19; this.nudManu.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudManu.Value = new decimal(new int[] { - 9, + 13, 0, 0, 0}); @@ -815,21 +700,21 @@ // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(93, 60); + this.label14.Location = new System.Drawing.Point(217, 62); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(41, 12); - this.label14.TabIndex = 34; + this.label14.TabIndex = 18; this.label14.Text = "제조사"; // // nudPrice // - this.nudPrice.Location = new System.Drawing.Point(431, 30); + this.nudPrice.Location = new System.Drawing.Point(638, 32); this.nudPrice.Name = "nudPrice"; this.nudPrice.Size = new System.Drawing.Size(45, 21); - this.nudPrice.TabIndex = 33; + this.nudPrice.TabIndex = 13; this.nudPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudPrice.Value = new decimal(new int[] { - 5, + 7, 0, 0, 0}); @@ -838,21 +723,21 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(388, 34); + this.label13.Location = new System.Drawing.Point(595, 36); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(29, 12); - this.label13.TabIndex = 32; + this.label13.TabIndex = 12; this.label13.Text = "단가"; // // nudUnit // - this.nudUnit.Location = new System.Drawing.Point(42, 56); + this.nudUnit.Location = new System.Drawing.Point(61, 58); this.nudUnit.Name = "nudUnit"; this.nudUnit.Size = new System.Drawing.Size(45, 21); - this.nudUnit.TabIndex = 31; + this.nudUnit.TabIndex = 17; this.nudUnit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudUnit.Value = new decimal(new int[] { - 7, + 11, 0, 0, 0}); @@ -861,21 +746,21 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(7, 60); + this.label12.Location = new System.Drawing.Point(26, 62); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(29, 12); - this.label12.TabIndex = 30; + this.label12.TabIndex = 16; this.label12.Text = "단위"; // // nudQty // - this.nudQty.Location = new System.Drawing.Point(537, 30); + this.nudQty.Location = new System.Drawing.Point(733, 32); this.nudQty.Name = "nudQty"; this.nudQty.Size = new System.Drawing.Size(45, 21); - this.nudQty.TabIndex = 29; + this.nudQty.TabIndex = 15; this.nudQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudQty.Value = new decimal(new int[] { - 6, + 8, 0, 0, 0}); @@ -884,22 +769,22 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(502, 34); + this.label11.Location = new System.Drawing.Point(698, 36); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(29, 12); - this.label11.TabIndex = 28; + this.label11.TabIndex = 14; this.label11.Text = "수량"; // // nudName // this.nudName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.nudName.Location = new System.Drawing.Point(234, 30); + this.nudName.Location = new System.Drawing.Point(453, 32); this.nudName.Name = "nudName"; this.nudName.Size = new System.Drawing.Size(45, 21); - this.nudName.TabIndex = 27; + this.nudName.TabIndex = 9; this.nudName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudName.Value = new decimal(new int[] { - 3, + 5, 0, 0, 0}); @@ -908,22 +793,22 @@ // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(199, 34); + this.label10.Location = new System.Drawing.Point(418, 36); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(29, 12); - this.label10.TabIndex = 26; + this.label10.TabIndex = 8; this.label10.Text = "품명"; // // nudSid // this.nudSid.BackColor = System.Drawing.Color.White; - this.nudSid.Location = new System.Drawing.Point(139, 30); + this.nudSid.Location = new System.Drawing.Point(358, 32); this.nudSid.Name = "nudSid"; this.nudSid.Size = new System.Drawing.Size(45, 21); - this.nudSid.TabIndex = 25; + this.nudSid.TabIndex = 7; this.nudSid.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudSid.Value = new decimal(new int[] { - 2, + 4, 0, 0, 0}); @@ -932,10 +817,10 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(110, 34); + this.label9.Location = new System.Drawing.Point(329, 36); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(24, 12); - this.label9.TabIndex = 24; + this.label9.TabIndex = 6; this.label9.Text = "SID"; // // label8 @@ -954,22 +839,138 @@ // this.ta.ClearBeforeFill = true; // - // numericUpDown2 + // itemGroupDataGridViewTextBoxColumn // - this.numericUpDown2.Location = new System.Drawing.Point(648, 58); - this.numericUpDown2.Name = "numericUpDown2"; - this.numericUpDown2.Size = new System.Drawing.Size(45, 21); - this.numericUpDown2.TabIndex = 57; - this.numericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.itemGroupDataGridViewTextBoxColumn.DataPropertyName = "ItemGroup"; + this.itemGroupDataGridViewTextBoxColumn.HeaderText = "중분류"; + this.itemGroupDataGridViewTextBoxColumn.Name = "itemGroupDataGridViewTextBoxColumn"; + this.itemGroupDataGridViewTextBoxColumn.Width = 66; // - // label6 + // option1 // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(597, 62); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(41, 12); - this.label6.TabIndex = 56; - this.label6.Text = "중분류"; + this.option1.DataPropertyName = "option1"; + this.option1.HeaderText = "소분류"; + this.option1.Name = "option1"; + this.option1.Width = 66; + // + // noDataGridViewTextBoxColumn + // + this.noDataGridViewTextBoxColumn.DataPropertyName = "no"; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.noDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle29; + this.noDataGridViewTextBoxColumn.HeaderText = "번호"; + this.noDataGridViewTextBoxColumn.Name = "noDataGridViewTextBoxColumn"; + this.noDataGridViewTextBoxColumn.Width = 54; + // + // itemSidDataGridViewTextBoxColumn + // + this.itemSidDataGridViewTextBoxColumn.DataPropertyName = "ItemSid"; + this.itemSidDataGridViewTextBoxColumn.HeaderText = "SID"; + this.itemSidDataGridViewTextBoxColumn.Name = "itemSidDataGridViewTextBoxColumn"; + this.itemSidDataGridViewTextBoxColumn.Width = 49; + // + // itemNameDataGridViewTextBoxColumn + // + this.itemNameDataGridViewTextBoxColumn.DataPropertyName = "ItemName"; + this.itemNameDataGridViewTextBoxColumn.HeaderText = "품명"; + this.itemNameDataGridViewTextBoxColumn.Name = "itemNameDataGridViewTextBoxColumn"; + this.itemNameDataGridViewTextBoxColumn.Width = 54; + // + // itemModelDataGridViewTextBoxColumn + // + this.itemModelDataGridViewTextBoxColumn.DataPropertyName = "ItemModel"; + this.itemModelDataGridViewTextBoxColumn.HeaderText = "규격"; + this.itemModelDataGridViewTextBoxColumn.Name = "itemModelDataGridViewTextBoxColumn"; + this.itemModelDataGridViewTextBoxColumn.Width = 54; + // + // priceDataGridViewTextBoxColumn + // + this.priceDataGridViewTextBoxColumn.DataPropertyName = "price"; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle30.Format = "N0"; + this.priceDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle30; + this.priceDataGridViewTextBoxColumn.HeaderText = "단가"; + this.priceDataGridViewTextBoxColumn.Name = "priceDataGridViewTextBoxColumn"; + this.priceDataGridViewTextBoxColumn.Width = 54; + // + // qtyDataGridViewTextBoxColumn + // + this.qtyDataGridViewTextBoxColumn.DataPropertyName = "qty"; + dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle31.Format = "N0"; + this.qtyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle31; + this.qtyDataGridViewTextBoxColumn.HeaderText = "수량"; + this.qtyDataGridViewTextBoxColumn.Name = "qtyDataGridViewTextBoxColumn"; + this.qtyDataGridViewTextBoxColumn.Width = 54; + // + // itemUnitDataGridViewTextBoxColumn + // + this.itemUnitDataGridViewTextBoxColumn.DataPropertyName = "ItemUnit"; + this.itemUnitDataGridViewTextBoxColumn.HeaderText = "단위"; + this.itemUnitDataGridViewTextBoxColumn.Name = "itemUnitDataGridViewTextBoxColumn"; + this.itemUnitDataGridViewTextBoxColumn.Width = 54; + // + // amtDataGridViewTextBoxColumn + // + this.amtDataGridViewTextBoxColumn.DataPropertyName = "amt"; + dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle32.Format = "N0"; + this.amtDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle32; + this.amtDataGridViewTextBoxColumn.HeaderText = "금액"; + this.amtDataGridViewTextBoxColumn.Name = "amtDataGridViewTextBoxColumn"; + this.amtDataGridViewTextBoxColumn.ReadOnly = true; + this.amtDataGridViewTextBoxColumn.Width = 54; + // + // itemManuDataGridViewTextBoxColumn + // + this.itemManuDataGridViewTextBoxColumn.DataPropertyName = "ItemManu"; + this.itemManuDataGridViewTextBoxColumn.HeaderText = "제조사"; + this.itemManuDataGridViewTextBoxColumn.Name = "itemManuDataGridViewTextBoxColumn"; + this.itemManuDataGridViewTextBoxColumn.Width = 66; + // + // itemSupplyDataGridViewTextBoxColumn + // + this.itemSupplyDataGridViewTextBoxColumn.DataPropertyName = "ItemSupply"; + this.itemSupplyDataGridViewTextBoxColumn.HeaderText = "공급사"; + this.itemSupplyDataGridViewTextBoxColumn.Name = "itemSupplyDataGridViewTextBoxColumn"; + this.itemSupplyDataGridViewTextBoxColumn.Width = 66; + // + // option2 + // + this.option2.DataPropertyName = "option2"; + dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.option2.DefaultCellStyle = dataGridViewCellStyle33; + this.option2.HeaderText = "납기일"; + this.option2.Name = "option2"; + this.option2.Width = 66; + // + // memoDataGridViewTextBoxColumn + // + this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo"; + this.memoDataGridViewTextBoxColumn.HeaderText = "비고"; + this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; + this.memoDataGridViewTextBoxColumn.Width = 54; + // + // itemDataGridViewTextBoxColumn + // + this.itemDataGridViewTextBoxColumn.DataPropertyName = "Item"; + dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.itemDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle34; + this.itemDataGridViewTextBoxColumn.HeaderText = "item(*)"; + this.itemDataGridViewTextBoxColumn.Name = "itemDataGridViewTextBoxColumn"; + this.itemDataGridViewTextBoxColumn.Width = 70; + // + // itemSupplyidxDataGridViewTextBoxColumn + // + this.itemSupplyidxDataGridViewTextBoxColumn.DataPropertyName = "ItemSupplyidx"; + dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.itemSupplyidxDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle35; + this.itemSupplyidxDataGridViewTextBoxColumn.HeaderText = "Supply(*)"; + this.itemSupplyidxDataGridViewTextBoxColumn.Name = "itemSupplyidxDataGridViewTextBoxColumn"; + this.itemSupplyidxDataGridViewTextBoxColumn.Width = 85; // // fProjectPartImport // @@ -981,6 +982,7 @@ this.Controls.Add(this.bn); this.Controls.Add(this.panel1); this.Name = "fProjectPartImport"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "파트리스트 가져오기"; this.Load += new System.EventHandler(this.@__Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); @@ -996,10 +998,10 @@ this.bn.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudMidDiv)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudNapKi)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudBuwi)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudLowDiv)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMemo)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudGrp)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudSupply)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudModel)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudNo)).EndInit(); @@ -1009,7 +1011,6 @@ ((System.ComponentModel.ISupportInitialize)(this.nudQty)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudName)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudSid)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1061,8 +1062,6 @@ private System.Windows.Forms.Label label19; private System.Windows.Forms.NumericUpDown nudMemo; private System.Windows.Forms.Label label21; - private System.Windows.Forms.NumericUpDown nudGrp; - private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label16; private System.Windows.Forms.ToolStripButton btSave; @@ -1073,25 +1072,27 @@ private dsPRJ dsPRJ; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripLabel sbSum; - private System.Windows.Forms.DataGridViewTextBoxColumn noDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemGroupDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemSidDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemNameDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemModelDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn qtyDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemUnitDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn priceDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn amtDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemManuDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemSupplyDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemSupplyidxDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn; - private System.Windows.Forms.NumericUpDown nudBuwi; + private System.Windows.Forms.NumericUpDown nudLowDiv; private System.Windows.Forms.Label label4; private System.Windows.Forms.NumericUpDown nudNapKi; private System.Windows.Forms.Label label5; - private System.Windows.Forms.NumericUpDown numericUpDown2; + private System.Windows.Forms.NumericUpDown nudMidDiv; private System.Windows.Forms.Label label6; + private System.Windows.Forms.DataGridViewTextBoxColumn itemGroupDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn option1; + private System.Windows.Forms.DataGridViewTextBoxColumn noDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemSidDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemNameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemModelDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn priceDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn qtyDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemUnitDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn amtDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemManuDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemSupplyDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn option2; + private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemSupplyidxDataGridViewTextBoxColumn; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartImport.cs b/SubProject/FPJ0000/Project/fProjectPartImport.cs index 7955029..01e01d7 100644 --- a/SubProject/FPJ0000/Project/fProjectPartImport.cs +++ b/SubProject/FPJ0000/Project/fProjectPartImport.cs @@ -111,13 +111,12 @@ namespace FPJ0000 string 단위 = ""; string 제조사 = ""; string 공급사 = ""; - string 그룹 = ""; + //string 그룹 = ""; string 비고 = ""; - string 적용부위 = ""; + string 소분류 = ""; string 납기일 = ""; string 중분류 = ""; - - + this.progressBar1.Value = 0; this.progressBar1.Maximum = MaxRow - MinRow + 1; @@ -130,20 +129,23 @@ namespace FPJ0000 progressBar1.Value += 1; //필수값을 먼저 확인한다. - if (nudNo.Value > 0) no = sheet.readStr(r, (int)nudNo.Value - 1); - if (nudSid.Value > 0) SID = sheet.readStr(r, (int)nudSid.Value - 1); - if (nudName.Value > 0) 품명 = sheet.readStr(r, (int)this.nudName.Value - 1); - if (nudModel.Value > 0) 규격 = sheet.readStr(r, (int)this.nudModel.Value - 1); - if (nudPrice.Value > 0) 단가 = sheet.readStr(r, (int)this.nudPrice.Value - 1).Replace(",", ""); - if (nudQty.Value > 0) 수량 = sheet.readStr(r, (int)nudQty.Value - 1).Replace(",", ""); - if (nudUnit.Value > 0) 단위 = sheet.readStr(r, (int)nudUnit.Value - 1); - if (nudManu.Value > 0) 제조사 = sheet.readStr(r, (int)nudManu.Value - 1); - if (nudSupply.Value > 0) 공급사 = sheet.readStr(r, (int)nudSupply.Value - 1); - if (nudGrp.Value > 0) 그룹 = sheet.readStr(r, (int)nudGrp.Value - 1); - if (nudMemo.Value > 0) 비고 = sheet.readStr(r, (int)nudMemo.Value - 1); - if (nudBuwi.Value > 0) 적용부위 = sheet.readStr(r, (int)nudBuwi.Value - 1); - if (nudNapKi.Value > 0) 납기일 = sheet.readStr(r, (int)nudNapKi.Value - 1); - if (numericUpDown2.Value > 0) 중분류 = sheet.readStr(r, (int)numericUpDown2.Value - 1); + if (nudNo.Value > 0) no = sheet.readStr(r, (int)nudNo.Value - 1).Trim(); + if (nudSid.Value > 0) SID = sheet.readStr(r, (int)nudSid.Value - 1).Trim(); + if (nudName.Value > 0) 품명 = sheet.readStr(r, (int)this.nudName.Value - 1).Trim(); + if (nudModel.Value > 0) 규격 = sheet.readStr(r, (int)this.nudModel.Value - 1).Trim(); + if (nudPrice.Value > 0) 단가 = sheet.readStr(r, (int)this.nudPrice.Value - 1).Replace(",", "").Trim(); + if (nudQty.Value > 0) 수량 = sheet.readStr(r, (int)nudQty.Value - 1).Replace(",", "").Trim(); + if (nudUnit.Value > 0) 단위 = sheet.readStr(r, (int)nudUnit.Value - 1).Trim(); + if (nudManu.Value > 0) 제조사 = sheet.readStr(r, (int)nudManu.Value - 1).Trim(); + if (nudSupply.Value > 0) 공급사 = sheet.readStr(r, (int)nudSupply.Value - 1).Trim(); + //if (nudGrp.Value > 0) 그룹 = sheet.readStr(r, (int)nudGrp.Value - 1).Trim(); + if (nudMemo.Value > 0) 비고 = sheet.readStr(r, (int)nudMemo.Value - 1).Trim(); + if (nudLowDiv.Value > 0) 소분류 = sheet.readStr(r, (int)nudLowDiv.Value - 1).Trim(); + if (nudNapKi.Value > 0) 납기일 = sheet.readStr(r, (int)nudNapKi.Value - 1).Trim(); + if (nudMidDiv.Value > 0) 중분류 = sheet.readStr(r, (int)nudMidDiv.Value - 1).Trim(); + + //sid 공백과 - _ 제거 200506 + SID = SID.Replace(" ", "").Replace("-", "").Replace("_", "").Trim(); //필수자료갸ㅏ 없는 경우처리하지 않음 if (품명.Trim() == "") continue; @@ -178,9 +180,8 @@ namespace FPJ0000 } newdr.ItemGroup = 중분류; - newdr.option1 = 적용부위; + newdr.option1 = 소분류; newdr.option2 = 납기일; - newdr.ItemGroup = 그룹; newdr.memo = 비고; sumamt += newdr.amt; diff --git a/SubProject/FPJ0000/Project/fProjectPartImport.resx b/SubProject/FPJ0000/Project/fProjectPartImport.resx index cce993d..6688284 100644 --- a/SubProject/FPJ0000/Project/fProjectPartImport.resx +++ b/SubProject/FPJ0000/Project/fProjectPartImport.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + 83, 17 @@ -221,4 +227,10 @@ 147, 17 + + True + + + True + \ No newline at end of file