diff --git a/SubProject/FCM0000/Item/fItems.Designer.cs b/SubProject/FCM0000/Item/fItems.Designer.cs index d1fb659..370a6cb 100644 --- a/SubProject/FCM0000/Item/fItems.Designer.cs +++ b/SubProject/FCM0000/Item/fItems.Designer.cs @@ -31,6 +31,7 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItems)); FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); @@ -158,7 +159,7 @@ this.toolStripLabel3, this.tbFind, this.btFind}); - this.bn.Location = new System.Drawing.Point(0, 588); + this.bn.Location = new System.Drawing.Point(0, 660); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; @@ -369,6 +370,7 @@ this.tam.BoardTableAdapter = null; this.tam.CommonTableAdapter = null; this.tam.CustomsTableAdapter = null; + this.tam.EETGW_DocuFormTableAdapter = null; this.tam.HolidayLIstTableAdapter = null; this.tam.InventoryUserTableAdapter = null; this.tam.ItemsTableAdapter = this.ta; @@ -505,7 +507,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(877, 551); + this.fpSpread1.Size = new System.Drawing.Size(877, 623); this.fpSpread1.TabIndex = 3; // // panel1 @@ -513,7 +515,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Right; this.panel1.Location = new System.Drawing.Point(877, 37); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(13, 588); + this.panel1.Size = new System.Drawing.Size(13, 660); this.panel1.TabIndex = 4; // // groupBox1 @@ -530,7 +532,7 @@ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right; this.groupBox1.Location = new System.Drawing.Point(890, 37); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(382, 588); + this.groupBox1.Size = new System.Drawing.Size(382, 660); this.groupBox1.TabIndex = 5; this.groupBox1.TabStop = false; this.groupBox1.Text = "기타 정보"; @@ -543,7 +545,7 @@ this.memoTextBox.Multiline = true; this.memoTextBox.Name = "memoTextBox"; this.memoTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.memoTextBox.Size = new System.Drawing.Size(376, 66); + this.memoTextBox.Size = new System.Drawing.Size(376, 138); this.memoTextBox.TabIndex = 3; // // label1 @@ -630,7 +632,7 @@ // label4 // this.label4.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label4.Location = new System.Drawing.Point(3, 279); + this.label4.Location = new System.Drawing.Point(3, 351); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(376, 22); this.label4.TabIndex = 8; @@ -647,7 +649,7 @@ this.lvSupplyDamdang.FullRowSelect = true; this.lvSupplyDamdang.GridLines = true; this.lvSupplyDamdang.HideSelection = false; - this.lvSupplyDamdang.Location = new System.Drawing.Point(3, 301); + this.lvSupplyDamdang.Location = new System.Drawing.Point(3, 373); this.lvSupplyDamdang.Name = "lvSupplyDamdang"; this.lvSupplyDamdang.Size = new System.Drawing.Size(376, 80); this.lvSupplyDamdang.TabIndex = 9; @@ -672,7 +674,7 @@ // label2 // this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label2.Location = new System.Drawing.Point(3, 381); + this.label2.Location = new System.Drawing.Point(3, 453); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(376, 22); this.label2.TabIndex = 4; @@ -692,7 +694,7 @@ this.lvInDate.FullRowSelect = true; this.lvInDate.GridLines = true; this.lvInDate.HideSelection = false; - this.lvInDate.Location = new System.Drawing.Point(3, 403); + this.lvInDate.Location = new System.Drawing.Point(3, 475); this.lvInDate.Name = "lvInDate"; this.lvInDate.Size = new System.Drawing.Size(376, 80); this.lvInDate.TabIndex = 5; @@ -726,7 +728,7 @@ // label3 // this.label3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label3.Location = new System.Drawing.Point(3, 483); + this.label3.Location = new System.Drawing.Point(3, 555); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(376, 22); this.label3.TabIndex = 6; @@ -745,7 +747,7 @@ this.lvOrder.FullRowSelect = true; this.lvOrder.GridLines = true; this.lvOrder.HideSelection = false; - this.lvOrder.Location = new System.Drawing.Point(3, 505); + this.lvOrder.Location = new System.Drawing.Point(3, 577); this.lvOrder.Name = "lvOrder"; this.lvOrder.Size = new System.Drawing.Size(376, 80); this.lvOrder.TabIndex = 7; @@ -796,21 +798,22 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 12; + this.fpSpread1_Sheet1.ColumnCount = 13; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "모델명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "단가($)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "제조사"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "공급처"; + this.fpSpread1_Sheet1.ColumnHeader.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 = "SID#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "모델명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "단가($)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "제조사"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "규격"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).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; @@ -822,32 +825,38 @@ this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 88F; - this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "cate"; + this.fpSpread1_Sheet1.Columns.Get(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).Label = "숨김"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "품명"; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "cate"; + 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 = 113F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID#"; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + 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 = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "model"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명"; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sid"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "SID#"; 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 = "model"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "모델명"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F; currencyCellType1.DecimalPlaces = 0; currencyCellType1.MaximumValue = new decimal(new int[] { 10000000, @@ -863,50 +872,50 @@ currencyCellType1.NullDisplay = "--"; currencyCellType1.Separator = ","; currencyCellType1.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType1; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "price"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 123F; - numberCellType2.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "priceD"; - this.fpSpread1_Sheet1.Columns.Get(6).ForeColor = System.Drawing.Color.Blue; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = currencyCellType1; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "price"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "단가($)"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 94F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "manu"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "제조사"; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 123F; + numberCellType2.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "priceD"; + this.fpSpread1_Sheet1.Columns.Get(7).ForeColor = System.Drawing.Color.Blue; + 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 = 113F; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 94F; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "manu"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + 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 = 113F; numberCellType3.MaximumValue = 999999999999999D; numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "scale"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "규격"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "unit"; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "단위"; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "supply"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "supplyname"; - this.fpSpread1_Sheet1.Columns.Get(10).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "scale"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 84F; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "unit"; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "supplyname"; + this.fpSpread1_Sheet1.Columns.Get(11).Visible = false; comboBoxCellType1.AllowEditorVerticalAlign = true; comboBoxCellType1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; comboBoxCellType1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; comboBoxCellType1.ButtonAlign = FarPoint.Win.ButtonAlign.Right; comboBoxCellType1.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = comboBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "supplyidx"; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "공급처"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "supply"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = comboBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "supplyidx"; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "공급처"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "supply"; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -917,7 +926,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1272, 625); + this.ClientSize = new System.Drawing.Size(1272, 697); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.bn); this.Controls.Add(this.panel1); diff --git a/SubProject/FCM0000/Item/fItems.resx b/SubProject/FCM0000/Item/fItems.resx index 63d8371..762bcb9 100644 --- a/SubProject/FCM0000/Item/fItems.resx +++ b/SubProject/FCM0000/Item/fItems.resx @@ -223,19 +223,19 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL0SURBVEhLtVZbTxNBFCZeYrxEjY8++KKiMfHFRAgviv4H - o/4Bn9RoDBETzcQgRmjLtrbQVuyFtguUhlq63V0ulRgK3V2IggFaCig3E0jQBJ8gEbL2NNPEmIHuwPZL - vkx29sz3Zc6ZObsleuCxKXj4mdF58WVj+w0Y4Rm/0h+3Ojr2M37hkVeQxdBQejH+eXljcO63CiM8u7Lz - TCD2ECG0Dy/ZO+pbwhXebkVSpn9ufv2lqttRmV7ddPNS8nVLtAIv3T0Yv3g3OvJtkWS0HcPS1IKZFe5g - CXoY3NGrESUzTxIvxPDw7I96dhc7h5pCekmiWglpp645HKRCNS1EObO6CQcOS2qDh5e6SWK09PKyiCUL - 44nBdzScSC2RhGgJV03zPa+qe3/h45eVDZIQLaOjy+tVde7zWHpnoKbWm4Nza0QhWia+r6nI2laJpXdG - tfFdKTe6sk4SoiXsuNrUfA5L7wyEnEegNiQhWnYm0wtUvRx6L0mIlh5R5rGkNsD9g95LEtNKeW71j9nH - 38eS2gAdxyXurXN5BGmIunNlFxwwerr6uuQMUbQQI8OzS9S9+oHFcqjBF+G45LgajI+o0eEZovh2hK8T - 08bfxnLaACfa4P0gctK4KigplUtOqPWeSMLFJSXovSSjPKGmkF6DK1KO5bQBMZ6T2Z0mYtJEzhRGozvS - AxmAWsGBc4uyAFcE7if8gcAYltLz0JPhINHX1NR8ysryAzF5MmfKS5Nqg5/rJd1BmIMmg+xtlTDu+p8L - WVtPW1t5RcibKpOqmY0NIJvtGA7RHzUW71lbkB/js4ZgCubmQHQEMoBD9Eet3X/JHuyZyBnmdppSbSw/ - BhnAIfrjlaP9iiMUT+VNgfaQOIrMLWdwiP6ocQSuOTr7Zv4zTWU/X6U4RH88feM80RSKZ/41bQ7H08+t - wcs4pDh4wbjKQ/2JrbypK7tz9JYtw6+Lh3tO50HGz33q6B/Ycnb2TtU2stfxq+IDzJHJW4Ys/uN4qsgo - KfkLbnlaWkwqLJMAAAAASUVORK5CYII= + o/4Bn9RoDBETzcQgRmjLtrbQVuyFlgVKQy3d7i6XSpRCdxc0QICWBpSbCQRjgk+QWLL2NNPEmIHuwPZL + vkx29sz3Zc6ZObsleuCxKXD4mdF58WVjxw0Y4Rm/0h+3Ojv3M37hkVeQxeBwain2ZWVzaP63CiM8u7Lz + TGv0IUJoH16yd9S3hCq8PYqkpH9mJn6p6nZU0msZNy8lXrdEKvDS3YPxi3cjo9+WSEbbMSTNLJpZ4Q6W + oIfBHbkaVtILJPFCDI3M/ahnd7FzqCmklySqlZB26prDQSpU00KUZ9YycOCwpDZ4eKmHJEZLLy+LWLIw + nhh8R0Px5DJJiJZw1TTf86q69xc+fl3dJAnRsntsZaOqzn0eS+8M1NR2c2h+nShEy/j3dRVZ2yux9M6o + Nr4rjYytbpCEaAk7rjY1n8PSOwMh5xGoDUmIll2J1CJVL4feSxKipUeUeSypDXD/oPeSxLRSnl/7Y/bx + 97GkNkDHcYl761weQRqm7lzZBQeMnu7+bjlNFC3E8MjcMnWvfmCxHGrwhTkuMakGYqNqZGSWKL4d4evE + tPO3sZw2wIk2eD+InDSpCkpS5RJTar0nHHdxCQl6L8koT6gppNfgCpdjOW1AjOdkdqfxqDSVM4XR6A73 + QgagVnDg3KIswBWB+wl/IDCGpNQC9GQ4SPQ1NTWfsrL8YFSezpny0rTa4Of6SHcQ5qDJIHt7JYy7/udC + 1rbT1jZeEfKmyrRqZqODyGY7hkP0R43Fe9YW4Mf5rCGYgrm5NTIKGcAh+qPW7r9kD/RO5QxzO02qNpYf + hwzgEP3xytFxxRGMJfOmQHtQHEPmljM4RH/UOFqvObr6Z/8zTWY/X6U4RH88feM80RSMpf81bQ7FUs+t + gcs4pDh4wbjKgwODW3lTV3bn6C1bhl8XD/eczoOMn/vUOfB5y9nVN1PbyF7Hr4oPMEcmbxmy+I/jqSKj + pOQvnQJaQklTJLQAAAAASUVORK5CYII= @@ -282,25 +282,25 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQlSURBVEhLtVftT1NXHL7xJfNPmBoTjZtv331J9mFfjS4y - FFOZUCytUp2CYqEKkovdRNoLtNMiMuyEAa1O0QWVQrEBpC0tVQG3iEqxBZWpUQr48s3VPpdz6BWqo3L3 - JCe9ye85v6fn5fdymFixdesfszdl/blgS17T2s15Td/E5TYu+pZtmUPM4kLCNi+TFbu4PWU99gOm3oH9 - pvvDbLXv36N1Q6Hsir/fJmrsGwhVHEjYlsXyX7yWQ7/3vdQ1BEOcdWTK+Pnys9APmubvyJSZQ6pzqlRV - Dx5z1uiCdEwWlmrb7RmnewKTR1KhY3BLnjWO0KYCZ5iqc5Xn1w69EQpgxdmWgdF95X+5dhu7LApDZ4XC - 4DHtNLjrE9jra8h05seynibhPAxVZeBpMudMJpTogGhB/cA7OknXMBJSV/mepBZ7yiUFzcsI7aOYKhwM - SYs66ok5OrC9wpVqrw2H0k5425K4tiWE8p+ItuKs2r43KYXOdEL5ELhI42caEZXrOy+t39fwBaFMC1RY - bQkEC68OT4irKnsHoy5AYXCfoxcJ25t28mZrrKIAhHGmSYXtcqWxy0WF4VNR4q0mtHFs19iXI2QoCWca - y/YKsf24ozWJc27D9/ea1pXwRf2qKh8+TdTYvuaJgIxzcTRO8Ssr8ZwmppgRp7YuJp88FHrPb5GQDPsO - JyJiYhhkJPqvcs3+sc3CfzVDIBKyzf5R6n93abeNNyBukQapIb2s28kbRMTeU3fc1D+0+Ny+MefKwsNV - D0eoQWm8fY7wRYPyxO3z1P/hKv8IigwTz9rWHa3rn0gYqXpvOeGLBvik/lFc4nNs6xiUt/w63/8qvNPQ - +Sv1n3/R9y4+r2E1v9XCw08zesXf6tKuC9Q/SuoG1dUvmV27bs4VXi5cBMIXDcLLlVlxz48LzRuUp7qu - U0O2OTAqZjglsi0rcs0DY9T/nrLuZmIKH36Ru0gY5Ah6YuIxOSnEAnmJ54wwOUk5p5aYGCbhiH35wer+ - 5/RfIc0lHLuxCjakP6RBnhgj0DKpq+//Q/1m1vS/SCho/IqYxyHXeyxI5JQULhLOxOOt0qyaviEkfkKb - NsJJYh58RHwGUe1qiDkCic6+9MDZu4+oMEqa2hwI4jtWYYjK9O56lFbq7+DZ3kFJuCMllA+RonUo8+v8 - ryiZjliEsb1K4y2HUJS96HstLWrPIJToSCnuuBK5aNMXlmhsK+XFHhPOVHhkaKNSOMenq12ytk2CMxWK - YgiF0dihwUOjh4ZPWdp9HnF6xBwYo7eXDqwUohNxGw1oPdGCRmtN0bISGoNWFi2tUGDqCIZU4TNN1rXv - J9Nmjk8JY8UIGZm+s/ajF+lzgecKni14vqDSIPdmmHoDyH47uA6t5Cf7UkIVFyjieKjhwYbKFp9jnc+y - 7CxiniYY5j1XkfPoaitWpwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQkSURBVEhLtVftT1NXHL7RGf0TNs0SjZtOv+tI/OBXo2YM + xHQolJVWqW6KQqUDJBe7ibQXaKflTVYFgVY3UYOOSrEBRlta6gS2RdSiLaj4EqWAum+u63M5x16gMCp3 + T3LSm/ye83t6Xn4vh4kVO3f+vPiLI1eW7yho/TyxoHVTfP71jzez7R8Qs7iQsG1rZKUubn9lv/2waWDo + kOnuKHvO98+xppFQTs1ffydr7FsJVRxI2PaV8h+9lu/O+V7qWoIhzjo2Y/xw+Vlol6ZtO5mycEh1TpWq + 7t4jzhpdkI7pwlJtlz2zqj8wfaQUO4Z3FFjjCW0mcIbpOld1YePIG6EAVpxjGRo/UP2na5+x16Iw9NQo + DB7THoO7OYm9sZFMZ76p7G8VzsNQ1QaepnLOVEKJDogWNQfe0km6lrGQum7wcXqpp1pS1LaG0GbFTOFg + SFrS3UzM0YHtFa5U++toKOOktzOF61xFKP+JqCtuvPcmrdh5kFCmAhdp8kwjonJ9z6UtB1qWEsq8QIXV + lkCw+NpoRLx2YDjqAhQG93l6kbC9GadudsQqCkAYZ5pS3CVXGntdVBg+FWXeekKbxG6NfS1ChpJwprFs + rxC7Tzg6UjjnV/j+UtOxDr6oX1Xtg6fJGtunPBGQcS6Oxil+ZWWeKmKKGfFq60ryyUOh95yJhGTYdzgR + ERPDICPRf5Vv9k8kCv/VAoFIyDH7x6n/feV9Nt6AuEUapIaDlX1O3iAivq34w039Q4vP7dvyrq7IrXsw + Rg1K463zhC8alCdvXaD+c+v8YygyTAJrizvWNPguYaTrvdWELxrgk/pHcUnIs8UxKG+FTb7/VXiPoec0 + 9V940fc2oaBlA7/VwsPPMHrF3+ry3l+of5TUraprHzJ7995cIrxcuAiELxqElyur5o4fF5o3KCt6b1BD + jjkwLmY4JbPtn+Wbhyao//2VfW3EFD78EneJMMgR9MTEY3pSiAXyMs9PwuQk5ZxaYmKYpKP2tdn195/T + f4U0l3T8t/WwIf0hDfLEGIGWSV1/9wn1m9Vw/0VS0fVPiHkScr3HgkROSeEi4Uw+0SE90uAbQeIntHkj + nCSWwUfEZxDVroGYI5Do7KsPn739kAqjpKnNgSC+YxWGqEzvbkZppf6yzw4MS8IdKaFMRZrWoSxs8r+i + ZDpiEcb2Ko2/O4Si7MXB19KSrkxCiY600u6rkYs2f2GJxrZOXuox4UyFR4Y2Ko1zzF3tUrWdEpypUBRD + KIzGDg0eGj00fMryvguI06PmwAS9vXRgpRB9F7fRgNYTLWi01hQtK6ExaGXR0goFZo5gSBU+01Rd1yEy + beGYSxgrRsjI9D2Ns16k9wWeK3i24PmCSoPcm2kaCCD7fc11ayXf21cTqrhAEcdDDQ82VLaEPOtHLMsu + IuZ5gmH+BfOd89s25OCvAAAAAElFTkSuQmCC @@ -345,18 +345,18 @@ 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 diff --git a/SubProject/FCM0000/Item/fLovItem.Designer.cs b/SubProject/FCM0000/Item/fLovItem.Designer.cs index 23f7c4c..5e90f89 100644 --- a/SubProject/FCM0000/Item/fLovItem.Designer.cs +++ b/SubProject/FCM0000/Item/fLovItem.Designer.cs @@ -30,7 +30,6 @@ { this.components = new System.ComponentModel.Container(); System.Windows.Forms.Label manuLabel; - System.Windows.Forms.Label supplyLabel; System.Windows.Forms.Label memoLabel; System.Windows.Forms.Label priceLabel; System.Windows.Forms.Label label1; @@ -41,6 +40,7 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FCM0000.dsMSSQL(); @@ -66,7 +66,6 @@ this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.manuTextBox = new System.Windows.Forms.TextBox(); - this.supplyTextBox = new System.Windows.Forms.TextBox(); this.memoTextBox = new System.Windows.Forms.TextBox(); this.priceTextBox = new System.Windows.Forms.TextBox(); this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter(); @@ -78,26 +77,7 @@ this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.label3 = new System.Windows.Forms.Label(); - this.arDatagridView1 = new arCtl.arDatagridView(); - this.sIDNoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.partNoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.partNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.currentQtyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Storage = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.locationDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.divisionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.priceDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.priceUnitDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.enrDateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.enrolleeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bsPMP = new System.Windows.Forms.BindingSource(this.components); - this.dSPMP = new FCM0000.DSPMP(); - this.taPMP = new FCM0000.DSPMPTableAdapters.SPMasterTableAdapter(); - this.panel2 = new System.Windows.Forms.Panel(); manuLabel = new System.Windows.Forms.Label(); - supplyLabel = new System.Windows.Forms.Label(); memoLabel = new System.Windows.Forms.Label(); priceLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); @@ -112,10 +92,6 @@ ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); this.cm1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsPMP)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSPMP)).BeginInit(); - this.panel2.SuspendLayout(); this.SuspendLayout(); // // manuLabel @@ -129,23 +105,12 @@ manuLabel.TabIndex = 8; manuLabel.Text = "제조사"; // - // supplyLabel - // - supplyLabel.AutoSize = true; - supplyLabel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - supplyLabel.ForeColor = System.Drawing.Color.White; - supplyLabel.Location = new System.Drawing.Point(11, 47); - supplyLabel.Name = "supplyLabel"; - supplyLabel.Size = new System.Drawing.Size(58, 21); - supplyLabel.TabIndex = 10; - supplyLabel.Text = "공급처"; - // // memoLabel // memoLabel.AutoSize = true; memoLabel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); memoLabel.ForeColor = System.Drawing.Color.White; - memoLabel.Location = new System.Drawing.Point(24, 81); + memoLabel.Location = new System.Drawing.Point(24, 45); memoLabel.Name = "memoLabel"; memoLabel.Size = new System.Drawing.Size(42, 21); memoLabel.TabIndex = 12; @@ -157,7 +122,7 @@ priceLabel.AutoSize = true; priceLabel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); priceLabel.ForeColor = System.Drawing.Color.White; - priceLabel.Location = new System.Drawing.Point(24, 353); + priceLabel.Location = new System.Drawing.Point(24, 448); priceLabel.Name = "priceLabel"; priceLabel.Size = new System.Drawing.Size(42, 21); priceLabel.TabIndex = 18; @@ -169,7 +134,7 @@ label1.AutoSize = true; label1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); label1.ForeColor = System.Drawing.Color.White; - label1.Location = new System.Drawing.Point(24, 419); + label1.Location = new System.Drawing.Point(24, 514); label1.Name = "label1"; label1.Size = new System.Drawing.Size(42, 21); label1.TabIndex = 20; @@ -181,7 +146,7 @@ label2.AutoSize = true; label2.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); label2.ForeColor = System.Drawing.Color.White; - label2.Location = new System.Drawing.Point(24, 323); + label2.Location = new System.Drawing.Point(24, 418); label2.Name = "label2"; label2.Size = new System.Drawing.Size(42, 21); label2.TabIndex = 22; @@ -193,7 +158,7 @@ label4.AutoSize = true; label4.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); label4.ForeColor = System.Drawing.Color.White; - label4.Location = new System.Drawing.Point(3, 384); + label4.Location = new System.Drawing.Point(3, 479); label4.Name = "label4"; label4.Size = new System.Drawing.Size(63, 21); label4.TabIndex = 28; @@ -228,7 +193,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1084, 37); + this.bn.Size = new System.Drawing.Size(1177, 37); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -277,7 +242,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -329,7 +293,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(150, 37); this.tbFind.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -367,23 +330,21 @@ this.panel1.Controls.Add(this.textBox1); this.panel1.Controls.Add(manuLabel); this.panel1.Controls.Add(this.manuTextBox); - this.panel1.Controls.Add(supplyLabel); - this.panel1.Controls.Add(this.supplyTextBox); this.panel1.Controls.Add(memoLabel); this.panel1.Controls.Add(this.memoTextBox); this.panel1.Controls.Add(priceLabel); this.panel1.Controls.Add(this.priceTextBox); this.panel1.Dock = System.Windows.Forms.DockStyle.Right; - this.panel1.Location = new System.Drawing.Point(794, 37); + this.panel1.Location = new System.Drawing.Point(887, 37); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(290, 455); + this.panel1.Size = new System.Drawing.Size(290, 550); this.panel1.TabIndex = 2; // // textBox4 // this.textBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "priceD", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2")); - this.textBox4.Location = new System.Drawing.Point(74, 382); + this.textBox4.Location = new System.Drawing.Point(74, 477); this.textBox4.Name = "textBox4"; this.textBox4.ReadOnly = true; this.textBox4.Size = new System.Drawing.Size(200, 25); @@ -395,7 +356,7 @@ this.linkLabel1.AutoSize = true; this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.linkLabel1.ForeColor = System.Drawing.Color.White; - this.linkLabel1.Location = new System.Drawing.Point(11, 167); + this.linkLabel1.Location = new System.Drawing.Point(11, 262); this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Size = new System.Drawing.Size(58, 21); this.linkLabel1.TabIndex = 27; @@ -409,7 +370,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.pictureBox1.BackColor = System.Drawing.Color.Black; this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox1.Location = new System.Drawing.Point(74, 167); + this.pictureBox1.Location = new System.Drawing.Point(74, 262); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(202, 146); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -420,7 +381,7 @@ // this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "unit", true)); - this.textBox3.Location = new System.Drawing.Point(237, 320); + this.textBox3.Location = new System.Drawing.Point(237, 415); this.textBox3.Name = "textBox3"; this.textBox3.ReadOnly = true; this.textBox3.Size = new System.Drawing.Size(38, 25); @@ -430,7 +391,7 @@ // this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "scale", true)); - this.textBox2.Location = new System.Drawing.Point(75, 320); + this.textBox2.Location = new System.Drawing.Point(75, 415); this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; this.textBox2.Size = new System.Drawing.Size(156, 25); @@ -440,7 +401,7 @@ // this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); - this.textBox1.Location = new System.Drawing.Point(75, 417); + this.textBox1.Location = new System.Drawing.Point(75, 512); this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; this.textBox1.Size = new System.Drawing.Size(200, 25); @@ -455,33 +416,24 @@ this.manuTextBox.Size = new System.Drawing.Size(200, 25); this.manuTextBox.TabIndex = 9; // - // supplyTextBox - // - this.supplyTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "supply", true)); - this.supplyTextBox.Location = new System.Drawing.Point(75, 45); - this.supplyTextBox.Name = "supplyTextBox"; - this.supplyTextBox.ReadOnly = true; - this.supplyTextBox.Size = new System.Drawing.Size(200, 25); - this.supplyTextBox.TabIndex = 11; - // // memoTextBox // this.memoTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); - this.memoTextBox.Location = new System.Drawing.Point(75, 79); + this.memoTextBox.Location = new System.Drawing.Point(75, 44); this.memoTextBox.Multiline = true; this.memoTextBox.Name = "memoTextBox"; this.memoTextBox.ReadOnly = true; - this.memoTextBox.Size = new System.Drawing.Size(200, 83); + this.memoTextBox.Size = new System.Drawing.Size(200, 213); this.memoTextBox.TabIndex = 13; // // priceTextBox // this.priceTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.priceTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "price", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2")); - this.priceTextBox.Location = new System.Drawing.Point(75, 351); + this.priceTextBox.Location = new System.Drawing.Point(75, 446); this.priceTextBox.Name = "priceTextBox"; this.priceTextBox.ReadOnly = true; this.priceTextBox.Size = new System.Drawing.Size(200, 25); @@ -497,6 +449,7 @@ this.tam.BoardTableAdapter = null; this.tam.CommonTableAdapter = null; this.tam.CustomsTableAdapter = null; + this.tam.EETGW_DocuFormTableAdapter = null; this.tam.HolidayLIstTableAdapter = null; this.tam.InventoryUserTableAdapter = null; this.tam.ItemsTableAdapter = this.ta; @@ -515,7 +468,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(794, 455); + this.fpSpread1.Size = new System.Drawing.Size(887, 550); this.fpSpread1.TabIndex = 4; // // cm1 @@ -566,7 +519,7 @@ 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 = 4; + this.fpSpread1_Sheet1.ColumnCount = 5; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -574,6 +527,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "품명"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "모델"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "공급"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 27F; numberCellType1.DecimalPlaces = 0; numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; @@ -596,170 +550,23 @@ this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 154F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + 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 = 133F; 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; // - // label3 - // - this.label3.Dock = System.Windows.Forms.DockStyle.Top; - this.label3.Location = new System.Drawing.Point(0, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(1084, 23); - this.label3.TabIndex = 5; - this.label3.Text = "NR - 검색 결과"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // arDatagridView1 - // - this.arDatagridView1.A_DelCurrentCell = true; - this.arDatagridView1.A_EnterToTab = true; - this.arDatagridView1.A_KoreanField = null; - this.arDatagridView1.A_UpperField = null; - this.arDatagridView1.A_ViewRownumOnHeader = true; - this.arDatagridView1.AllowUserToAddRows = false; - this.arDatagridView1.AllowUserToDeleteRows = false; - this.arDatagridView1.AutoGenerateColumns = false; - this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.sIDNoDataGridViewTextBoxColumn, - this.partNoDataGridViewTextBoxColumn, - this.partNameDataGridViewTextBoxColumn, - this.currentQtyDataGridViewTextBoxColumn, - this.Storage, - this.locationDataGridViewTextBoxColumn, - this.divisionDataGridViewTextBoxColumn, - this.priceDataGridViewTextBoxColumn, - this.priceUnitDataGridViewTextBoxColumn, - this.memoDataGridViewTextBoxColumn, - this.enrDateDataGridViewTextBoxColumn, - this.enrolleeDataGridViewTextBoxColumn}); - this.arDatagridView1.DataSource = this.bsPMP; - this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.arDatagridView1.Location = new System.Drawing.Point(0, 23); - this.arDatagridView1.Name = "arDatagridView1"; - this.arDatagridView1.ReadOnly = true; - this.arDatagridView1.RowTemplate.Height = 23; - this.arDatagridView1.Size = new System.Drawing.Size(1084, 163); - this.arDatagridView1.TabIndex = 6; - // - // sIDNoDataGridViewTextBoxColumn - // - this.sIDNoDataGridViewTextBoxColumn.DataPropertyName = "SIDNo"; - this.sIDNoDataGridViewTextBoxColumn.HeaderText = "SIDNo"; - this.sIDNoDataGridViewTextBoxColumn.Name = "sIDNoDataGridViewTextBoxColumn"; - this.sIDNoDataGridViewTextBoxColumn.ReadOnly = true; - // - // partNoDataGridViewTextBoxColumn - // - this.partNoDataGridViewTextBoxColumn.DataPropertyName = "PartNo"; - this.partNoDataGridViewTextBoxColumn.HeaderText = "PartNo"; - this.partNoDataGridViewTextBoxColumn.Name = "partNoDataGridViewTextBoxColumn"; - this.partNoDataGridViewTextBoxColumn.ReadOnly = true; - // - // partNameDataGridViewTextBoxColumn - // - this.partNameDataGridViewTextBoxColumn.DataPropertyName = "PartName"; - this.partNameDataGridViewTextBoxColumn.HeaderText = "PartName"; - this.partNameDataGridViewTextBoxColumn.Name = "partNameDataGridViewTextBoxColumn"; - this.partNameDataGridViewTextBoxColumn.ReadOnly = true; - // - // currentQtyDataGridViewTextBoxColumn - // - this.currentQtyDataGridViewTextBoxColumn.DataPropertyName = "CurrentQty"; - this.currentQtyDataGridViewTextBoxColumn.HeaderText = "CurrentQty"; - this.currentQtyDataGridViewTextBoxColumn.Name = "currentQtyDataGridViewTextBoxColumn"; - this.currentQtyDataGridViewTextBoxColumn.ReadOnly = true; - // - // Storage - // - this.Storage.DataPropertyName = "Storage"; - this.Storage.HeaderText = "Storage"; - this.Storage.Name = "Storage"; - this.Storage.ReadOnly = true; - // - // locationDataGridViewTextBoxColumn - // - this.locationDataGridViewTextBoxColumn.DataPropertyName = "Location"; - this.locationDataGridViewTextBoxColumn.HeaderText = "Location"; - this.locationDataGridViewTextBoxColumn.Name = "locationDataGridViewTextBoxColumn"; - this.locationDataGridViewTextBoxColumn.ReadOnly = true; - // - // divisionDataGridViewTextBoxColumn - // - this.divisionDataGridViewTextBoxColumn.DataPropertyName = "Division"; - this.divisionDataGridViewTextBoxColumn.HeaderText = "Division"; - this.divisionDataGridViewTextBoxColumn.Name = "divisionDataGridViewTextBoxColumn"; - this.divisionDataGridViewTextBoxColumn.ReadOnly = true; - // - // priceDataGridViewTextBoxColumn - // - this.priceDataGridViewTextBoxColumn.DataPropertyName = "Price"; - this.priceDataGridViewTextBoxColumn.HeaderText = "Price"; - this.priceDataGridViewTextBoxColumn.Name = "priceDataGridViewTextBoxColumn"; - this.priceDataGridViewTextBoxColumn.ReadOnly = true; - // - // priceUnitDataGridViewTextBoxColumn - // - this.priceUnitDataGridViewTextBoxColumn.DataPropertyName = "PriceUnit"; - this.priceUnitDataGridViewTextBoxColumn.HeaderText = "PriceUnit"; - this.priceUnitDataGridViewTextBoxColumn.Name = "priceUnitDataGridViewTextBoxColumn"; - this.priceUnitDataGridViewTextBoxColumn.ReadOnly = true; - // - // memoDataGridViewTextBoxColumn - // - this.memoDataGridViewTextBoxColumn.DataPropertyName = "Memo"; - this.memoDataGridViewTextBoxColumn.HeaderText = "Memo"; - this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; - this.memoDataGridViewTextBoxColumn.ReadOnly = true; - // - // enrDateDataGridViewTextBoxColumn - // - this.enrDateDataGridViewTextBoxColumn.DataPropertyName = "EnrDate"; - this.enrDateDataGridViewTextBoxColumn.HeaderText = "EnrDate"; - this.enrDateDataGridViewTextBoxColumn.Name = "enrDateDataGridViewTextBoxColumn"; - this.enrDateDataGridViewTextBoxColumn.ReadOnly = true; - // - // enrolleeDataGridViewTextBoxColumn - // - this.enrolleeDataGridViewTextBoxColumn.DataPropertyName = "Enrollee"; - this.enrolleeDataGridViewTextBoxColumn.HeaderText = "Enrollee"; - this.enrolleeDataGridViewTextBoxColumn.Name = "enrolleeDataGridViewTextBoxColumn"; - this.enrolleeDataGridViewTextBoxColumn.ReadOnly = true; - // - // bsPMP - // - this.bsPMP.DataMember = "SPMaster"; - this.bsPMP.DataSource = this.dSPMP; - this.bsPMP.Filter = "Storage <> \'B-CENTER\'"; - // - // dSPMP - // - this.dSPMP.DataSetName = "DSPMP"; - this.dSPMP.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // taPMP - // - this.taPMP.ClearBeforeFill = true; - // - // panel2 - // - this.panel2.Controls.Add(this.arDatagridView1); - this.panel2.Controls.Add(this.label3); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 492); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1084, 186); - this.panel2.TabIndex = 7; - // // fLovItem // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1084, 678); + this.ClientSize = new System.Drawing.Size(1177, 587); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.panel1); - this.Controls.Add(this.panel2); this.Controls.Add(this.bn); this.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "fLovItem"; @@ -776,10 +583,6 @@ ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); this.cm1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsPMP)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSPMP)).EndInit(); - this.panel2.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -804,7 +607,6 @@ private System.Windows.Forms.ToolStripButton btOK; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.TextBox manuTextBox; - private System.Windows.Forms.TextBox supplyTextBox; private System.Windows.Forms.TextBox memoTextBox; private System.Windows.Forms.TextBox priceTextBox; private System.Windows.Forms.TextBox textBox1; @@ -822,25 +624,7 @@ private System.Windows.Forms.ToolStripButton btFind; private System.Windows.Forms.ToolStripTextBox tbFind; private System.Windows.Forms.ToolStripButton btAdd; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; - private System.Windows.Forms.Label label3; - private arCtl.arDatagridView arDatagridView1; - private System.Windows.Forms.BindingSource bsPMP; - private DSPMP dSPMP; - private DSPMPTableAdapters.SPMasterTableAdapter taPMP; - private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.DataGridViewTextBoxColumn sIDNoDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn partNoDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn partNameDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn currentQtyDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn Storage; - private System.Windows.Forms.DataGridViewTextBoxColumn locationDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn divisionDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn priceDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn priceUnitDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn enrDateDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn enrolleeDataGridViewTextBoxColumn; private System.Windows.Forms.TextBox textBox4; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Item/fLovItem.cs b/SubProject/FCM0000/Item/fLovItem.cs index 9faafcf..f3b69f9 100644 --- a/SubProject/FCM0000/Item/fLovItem.cs +++ b/SubProject/FCM0000/Item/fLovItem.cs @@ -82,18 +82,17 @@ namespace FCM0000 else { //search data - this.ta.FillSearch(this.dsMSSQL.Items, "%" + search + "%", FCOMMON.info.Login.gcode); + this.ta.FillSearchNoDisable(this.dsMSSQL.Items, "%" + search + "%", FCOMMON.info.Login.gcode); FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); //검색을 수행 - this.taPMP.Fill(this.dSPMP.SPMaster, "%" + search + "%"); - this.arDatagridView1.AutoResizeColumns(); + //this.taPMP.Fill(this.dSPMP.SPMaster, "%" + search + "%"); + //this.arDatagridView1.AutoResizeColumns(); searchOk = true; } - - } + private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) { var drv = bs.Current as DataRowView; diff --git a/SubProject/FCM0000/Item/fLovItem.resx b/SubProject/FCM0000/Item/fLovItem.resx index 9293892..2315f45 100644 --- a/SubProject/FCM0000/Item/fLovItem.resx +++ b/SubProject/FCM0000/Item/fLovItem.resx @@ -120,9 +120,6 @@ False - - False - False @@ -233,19 +230,19 @@ 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 @@ -289,16 +286,4 @@ 462, 17 - - True - - - 705, 17 - - - 614, 17 - - - 888, 17 - \ No newline at end of file diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index 464e5bd..f2e5620 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -10626,7 +10626,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[10]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[11]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp" + @@ -10696,30 +10696,44 @@ ORDER BY name, idx"; this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, n" + - "ame, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD\r\nFROM I" + - "tems\r\nWHERE (idx = @idx)"; + this._commandCollection[7].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD +FROM Items +WHERE (ISNULL(name, N'') LIKE @search OR + ISNULL(sid, N'') LIKE @search OR + ISNULL(manu, N'') LIKE @search OR + ISNULL(supply, N'') LIKE @search OR + ISNULL(model, N'') LIKE @search OR + ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) and isnull(disable,0)=0 +ORDER BY name, idx"; this._commandCollection[7].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "SELECT ISNULL(idx, - 1) AS Expr1\r\nFROM Items\r\nWHERE (gcode = @gcode) AND (I" + - "SNULL(name, N\'\') = @name) AND (ISNULL(model, N\'\') = @model)"; + this._commandCollection[8].CommandText = "SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, n" + + "ame, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD\r\nFROM I" + + "tems\r\nWHERE (idx = @idx)"; this._commandCollection[8].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[9].Connection = this.Connection; - this._commandCollection[9].CommandText = "dbo.UpdateItem"; - this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; - this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disable", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].CommandText = "SELECT ISNULL(idx, - 1) AS Expr1\r\nFROM Items\r\nWHERE (gcode = @gcode) AND (I" + + "SNULL(name, N\'\') = @name) AND (ISNULL(model, N\'\') = @model)"; + this._commandCollection[9].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[10].Connection = this.Connection; + this._commandCollection[10].CommandText = "dbo.UpdateItem"; + this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disable", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10914,12 +10928,60 @@ ORDER BY name, idx"; return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillSearchNoDisable(dsMSSQL.ItemsDataTable dataTable, string search, string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[7]; + if ((search == null)) { + throw new global::System.ArgumentNullException("search"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); + } + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsMSSQL.ItemsDataTable GetSearchNoDisable(string search, string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[7]; + if ((search == null)) { + throw new global::System.ArgumentNullException("search"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); + } + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } + dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual dsMSSQL.ItemsDataTable GetbyIDX(int idx) { - this.Adapter.SelectCommand = this.CommandCollection[7]; + this.Adapter.SelectCommand = this.CommandCollection[8]; this.Adapter.SelectCommand.Parameters[0].Value = ((int)(idx)); dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable(); this.Adapter.Fill(dataTable); @@ -11397,7 +11459,7 @@ ORDER BY name, idx"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual global::System.Nullable ReadIDX(string gcode, string name, string model) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((gcode == null)) { command.Parameters[0].Value = global::System.DBNull.Value; } @@ -11443,7 +11505,7 @@ ORDER BY name, idx"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int UpdateItem(string gcode, string sid, string name, string cate, global::System.Nullable disable, string unit) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; if ((gcode == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index 2cc005b..517c2b1 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -208,6 +208,25 @@ WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(supply, N'') LIKE @search OR ISNULL(model, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) +ORDER BY name, idx + + + + + + + + + + + SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid, priceD +FROM Items +WHERE (ISNULL(name, N'') LIKE @search OR + ISNULL(sid, N'') LIKE @search OR + ISNULL(manu, N'') LIKE @search OR + ISNULL(supply, N'') LIKE @search OR + ISNULL(model, N'') LIKE @search OR + ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) and isnull(disable,0)=0 ORDER BY name, idx @@ -1626,7 +1645,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -1718,7 +1737,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -1770,7 +1789,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -1838,7 +1857,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -1927,7 +1946,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -2040,7 +2059,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -2105,7 +2124,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -2246,7 +2265,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -2367,7 +2386,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -2397,7 +2416,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + @@ -2474,7 +2493,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx - + diff --git a/SubProject/FCM0000/dsMSSQL.xss b/SubProject/FCM0000/dsMSSQL.xss index fa4c829..ba83eeb 100644 --- a/SubProject/FCM0000/dsMSSQL.xss +++ b/SubProject/FCM0000/dsMSSQL.xss @@ -6,7 +6,7 @@ --> - +