diff --git a/SubProject/FCM0000/Inventory/fInventory.Designer.cs b/SubProject/FCM0000/Inventory/fInventory.Designer.cs index 876666f..dd2457c 100644 --- a/SubProject/FCM0000/Inventory/fInventory.Designer.cs +++ b/SubProject/FCM0000/Inventory/fInventory.Designer.cs @@ -30,20 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fInventory)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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 numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -78,33 +65,39 @@ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.btSearch = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.입고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.출고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); - this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.인쇄ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.보관소별재고확인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dSInventory = new FCM0000.DSInventory(); this.ta = new FCM0000.DSInventoryTableAdapters.vInventoryTableAdapter(); + this.arDatagridView1 = new arCtl.arDatagridView(); + this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.invtypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemModelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.serialDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.drqtyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dramtDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.userNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.boxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.toolStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); this.cm.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dSInventory)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); this.SuspendLayout(); // // bn @@ -354,7 +347,8 @@ // this.toolStripLabel7.Name = "toolStripLabel7"; this.toolStripLabel7.Size = new System.Drawing.Size(43, 34); - this.toolStripLabel7.Text = "저장소"; + this.toolStripLabel7.Text = "보관소"; + this.toolStripLabel7.Click += new System.EventHandler(this.toolStripLabel7_Click); // // cmbPlace // @@ -365,7 +359,7 @@ "출고", "정정"}); this.cmbPlace.Name = "cmbPlace"; - this.cmbPlace.Size = new System.Drawing.Size(75, 37); + this.cmbPlace.Size = new System.Drawing.Size(100, 37); // // toolStripLabel6 // @@ -382,7 +376,7 @@ "출고", "정정"}); this.cmbInvType.Name = "cmbInvType"; - this.cmbInvType.Size = new System.Drawing.Size(75, 37); + this.cmbInvType.Size = new System.Drawing.Size(100, 37); // // toolStripLabel5 // @@ -420,18 +414,6 @@ this.toolStripButton2.Text = "닫기"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // - // fpSpread1 - // - this.fpSpread1.AccessibleDescription = ""; - this.fpSpread1.ContextMenuStrip = this.cm; - this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; - this.fpSpread1.Location = new System.Drawing.Point(0, 37); - this.fpSpread1.Name = "fpSpread1"; - this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { - this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1107, 568); - this.fpSpread1.TabIndex = 3; - // // cm // this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -439,16 +421,14 @@ this.입고등록ToolStripMenuItem, this.출고등록ToolStripMenuItem, this.toolStripMenuItem3, - this.columnSizeToolStripMenuItem, this.exportListToolStripMenuItem, - this.인쇄ToolStripMenuItem, this.toolStripMenuItem2, this.편집ToolStripMenuItem, this.삭제ToolStripMenuItem, this.toolStripMenuItem1, this.보관소별재고확인ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(297, 310); + this.cm.Size = new System.Drawing.Size(297, 238); // // 입고등록ToolStripMenuItem // @@ -469,31 +449,6 @@ this.toolStripMenuItem3.Name = "toolStripMenuItem3"; this.toolStripMenuItem3.Size = new System.Drawing.Size(293, 6); // - // columnSizeToolStripMenuItem - // - this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveToolStripMenuItem, - this.loadToolStripMenuItem}); - this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(296, 36); - this.columnSizeToolStripMenuItem.Text = "열 크기"; - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(264, 36); - this.saveToolStripMenuItem.Text = "현재 상태 저장"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // loadToolStripMenuItem - // - this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); - this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(264, 36); - this.loadToolStripMenuItem.Text = "저장값 불러오기"; - this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); - // // exportListToolStripMenuItem // this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem"; @@ -501,13 +456,6 @@ this.exportListToolStripMenuItem.Text = "목록 내보내기"; this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); // - // 인쇄ToolStripMenuItem - // - this.인쇄ToolStripMenuItem.Name = "인쇄ToolStripMenuItem"; - this.인쇄ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); - this.인쇄ToolStripMenuItem.Text = "인쇄"; - this.인쇄ToolStripMenuItem.Click += new System.EventHandler(this.인쇄ToolStripMenuItem_Click); - // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; @@ -539,128 +487,6 @@ this.보관소별재고확인ToolStripMenuItem.Text = "보관소별 재고 확인"; this.보관소별재고확인ToolStripMenuItem.Click += new System.EventHandler(this.보관소별재고확인ToolStripMenuItem_Click); // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 14; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "등록일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "구분"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "SID"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "모델명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "SID"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "S/N"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "사용자"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "보관소"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "BOX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 30F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 62F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "invtype"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "구분"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "SID"; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 92F; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "itemName"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "품명"; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "itemModel"; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명"; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "SID"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "serial"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "S/N"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 83F; - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "dr_qty"; - this.fpSpread1_Sheet1.Columns.Get(7).ForeColor = System.Drawing.Color.Blue; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "수량"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 77F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "--"; - numberCellType2.Separator = ","; - numberCellType2.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "dr_amt"; - this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.Blue; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "금액"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 75F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userName"; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "사용자"; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "place"; - 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).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "box"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "BOX"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 151F; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(13).Visible = false; - this.fpSpread1_Sheet1.DataAutoCellTypes = false; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.ReadOnly; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ShowEditingRowSelector = true; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // bs // this.bs.DataMember = "vInventory"; @@ -675,12 +501,139 @@ // this.ta.ClearBeforeFill = true; // + // 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.AutoGenerateColumns = false; + this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.pdateDataGridViewTextBoxColumn, + this.invtypeDataGridViewTextBoxColumn, + this.itemNameDataGridViewTextBoxColumn, + this.itemModelDataGridViewTextBoxColumn, + this.sidDataGridViewTextBoxColumn, + this.serialDataGridViewTextBoxColumn, + this.drqtyDataGridViewTextBoxColumn, + this.dramtDataGridViewTextBoxColumn, + this.userNameDataGridViewTextBoxColumn, + this.placeDataGridViewTextBoxColumn, + this.boxDataGridViewTextBoxColumn, + this.memoDataGridViewTextBoxColumn}); + this.arDatagridView1.ContextMenuStrip = this.cm; + this.arDatagridView1.DataSource = this.bs; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.arDatagridView1.DefaultCellStyle = dataGridViewCellStyle1; + this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.arDatagridView1.Location = new System.Drawing.Point(0, 37); + this.arDatagridView1.Name = "arDatagridView1"; + this.arDatagridView1.ReadOnly = true; + this.arDatagridView1.RowTemplate.Height = 23; + this.arDatagridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.arDatagridView1.Size = new System.Drawing.Size(1107, 568); + this.arDatagridView1.TabIndex = 4; + // + // pdateDataGridViewTextBoxColumn + // + this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; + this.pdateDataGridViewTextBoxColumn.HeaderText = "등록일"; + this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; + this.pdateDataGridViewTextBoxColumn.ReadOnly = true; + // + // invtypeDataGridViewTextBoxColumn + // + this.invtypeDataGridViewTextBoxColumn.DataPropertyName = "invtype"; + this.invtypeDataGridViewTextBoxColumn.HeaderText = "구분"; + this.invtypeDataGridViewTextBoxColumn.Name = "invtypeDataGridViewTextBoxColumn"; + this.invtypeDataGridViewTextBoxColumn.ReadOnly = true; + // + // itemNameDataGridViewTextBoxColumn + // + this.itemNameDataGridViewTextBoxColumn.DataPropertyName = "itemName"; + this.itemNameDataGridViewTextBoxColumn.HeaderText = "품명"; + this.itemNameDataGridViewTextBoxColumn.Name = "itemNameDataGridViewTextBoxColumn"; + this.itemNameDataGridViewTextBoxColumn.ReadOnly = true; + // + // itemModelDataGridViewTextBoxColumn + // + this.itemModelDataGridViewTextBoxColumn.DataPropertyName = "itemModel"; + this.itemModelDataGridViewTextBoxColumn.HeaderText = "모델"; + this.itemModelDataGridViewTextBoxColumn.Name = "itemModelDataGridViewTextBoxColumn"; + this.itemModelDataGridViewTextBoxColumn.ReadOnly = true; + // + // sidDataGridViewTextBoxColumn + // + this.sidDataGridViewTextBoxColumn.DataPropertyName = "sid"; + this.sidDataGridViewTextBoxColumn.HeaderText = "SID"; + this.sidDataGridViewTextBoxColumn.Name = "sidDataGridViewTextBoxColumn"; + this.sidDataGridViewTextBoxColumn.ReadOnly = true; + // + // serialDataGridViewTextBoxColumn + // + this.serialDataGridViewTextBoxColumn.DataPropertyName = "serial"; + this.serialDataGridViewTextBoxColumn.HeaderText = "S/N"; + this.serialDataGridViewTextBoxColumn.Name = "serialDataGridViewTextBoxColumn"; + this.serialDataGridViewTextBoxColumn.ReadOnly = true; + // + // drqtyDataGridViewTextBoxColumn + // + this.drqtyDataGridViewTextBoxColumn.DataPropertyName = "dr_qty"; + this.drqtyDataGridViewTextBoxColumn.HeaderText = "수량"; + this.drqtyDataGridViewTextBoxColumn.Name = "drqtyDataGridViewTextBoxColumn"; + this.drqtyDataGridViewTextBoxColumn.ReadOnly = true; + // + // dramtDataGridViewTextBoxColumn + // + this.dramtDataGridViewTextBoxColumn.DataPropertyName = "dr_amt"; + this.dramtDataGridViewTextBoxColumn.HeaderText = "금액"; + this.dramtDataGridViewTextBoxColumn.Name = "dramtDataGridViewTextBoxColumn"; + this.dramtDataGridViewTextBoxColumn.ReadOnly = true; + // + // userNameDataGridViewTextBoxColumn + // + this.userNameDataGridViewTextBoxColumn.DataPropertyName = "userName"; + this.userNameDataGridViewTextBoxColumn.HeaderText = "사용자"; + this.userNameDataGridViewTextBoxColumn.Name = "userNameDataGridViewTextBoxColumn"; + this.userNameDataGridViewTextBoxColumn.ReadOnly = true; + // + // placeDataGridViewTextBoxColumn + // + this.placeDataGridViewTextBoxColumn.DataPropertyName = "place"; + this.placeDataGridViewTextBoxColumn.HeaderText = "보관소"; + this.placeDataGridViewTextBoxColumn.Name = "placeDataGridViewTextBoxColumn"; + this.placeDataGridViewTextBoxColumn.ReadOnly = true; + // + // boxDataGridViewTextBoxColumn + // + this.boxDataGridViewTextBoxColumn.DataPropertyName = "box"; + this.boxDataGridViewTextBoxColumn.HeaderText = "BOX"; + this.boxDataGridViewTextBoxColumn.Name = "boxDataGridViewTextBoxColumn"; + this.boxDataGridViewTextBoxColumn.ReadOnly = true; + // + // memoDataGridViewTextBoxColumn + // + this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo"; + this.memoDataGridViewTextBoxColumn.HeaderText = "비고"; + this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; + this.memoDataGridViewTextBoxColumn.ReadOnly = true; + // // fInventory // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1107, 630); - this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.arDatagridView1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); this.Name = "fInventory"; @@ -691,11 +644,10 @@ this.bn.PerformLayout(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); this.cm.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dSInventory)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -726,14 +678,10 @@ private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ToolStripLabel toolStripLabel5; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private FarPoint.Win.Spread.FpSpread fpSpread1; private System.Windows.Forms.BindingSource bs; private DSInventory dSInventory; private System.Windows.Forms.ToolStripComboBox cmbUser; private System.Windows.Forms.ContextMenuStrip cm; - private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportListToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem; @@ -749,12 +697,23 @@ private System.Windows.Forms.ToolStripComboBox cmbInvType; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 보관소별재고확인ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 인쇄ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel7; private System.Windows.Forms.ToolStripComboBox cmbPlace; private System.Windows.Forms.ToolStripMenuItem 입고등록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 출고등록ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private arCtl.arDatagridView arDatagridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn invtypeDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemNameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemModelDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn sidDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn serialDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn drqtyDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn dramtDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn userNameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn placeDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn boxDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Inventory/fInventory.cs b/SubProject/FCM0000/Inventory/fInventory.cs index 926103c..c058184 100644 --- a/SubProject/FCM0000/Inventory/fInventory.cs +++ b/SubProject/FCM0000/Inventory/fInventory.cs @@ -55,6 +55,16 @@ namespace FCM0000 FCOMMON.Util.SetFormStatus(ref form, this.Name, false); } + void updateplace() + { + var pretex = cmbPlace.Text; + var PlaceList = FCOMMON.DBM.GetItemStorageList(); + cmbPlace.Items.Clear(); + cmbPlace.Items.Add("--전체--"); + foreach (var item in PlaceList) + cmbPlace.Items.Add(item); + cmbPlace.SelectedIndex = 0; + } private void __Load(object sender, EventArgs e) { var form = this as Form; @@ -63,13 +73,8 @@ namespace FCM0000 Application.DoEvents(); //보관소 목록업데이트 - - var PlaceList = FCOMMON.DBM.GetItemStorageList(); - cmbPlace.Items.Clear(); - cmbPlace.Items.Add("--전체--"); - foreach (var item in PlaceList) - cmbPlace.Items.Add(item); - cmbPlace.SelectedIndex = 0; + updateplace(); + //담당자목록 - 사용자목록으로 처리한다. @@ -136,7 +141,9 @@ namespace FCM0000 this.ta.Fill(this.dSInventory.vInventory, FCOMMON.info.Login.gcode, sd, ed, invtype, userNo, place); this.dSInventory.vInventory.AcceptChanges(); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + //FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + + arDatagridView1.AutoResizeColumns(); } catch (Exception ex) { @@ -227,24 +234,6 @@ namespace FCM0000 btFind.PerformClick(); } - private void autoToolStripMenuItem_Click(object sender, EventArgs e) - { - this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true; - - for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) - this.fpSpread1.ActiveSheet.SetRowHeight(i, 25); - } - - private void saveToolStripMenuItem_Click(object sender, EventArgs e) - { - FPUtil.ColsizeSave(this.fpSpread1, fn_fpcolsize); - } - - private void loadToolStripMenuItem_Click(object sender, EventArgs e) - { - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - } - private void exportListToolStripMenuItem_Click(object sender, EventArgs e) { SaveFileDialog sd = new SaveFileDialog(); @@ -252,12 +241,9 @@ namespace FCM0000 sd.FileName = "inventory.xls"; if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - fpSpread1.SaveExcel(sd.FileName, - FarPoint.Excel.ExcelSaveFlags.SaveAsViewed - | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered - | FarPoint.Excel.ExcelSaveFlags.NoFormulas - | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); - FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); + arDatagridView1.ExportData(sd.FileName); + var dlg = FCOMMON.Util.MsgQ("다음 파일이 생성 되었습니다.\n파일을 확인할까요?\n" + sd.FileName); + if(dlg == DialogResult.Yes) FCOMMON.Util.RunExplorer(sd.FileName); } } @@ -434,10 +420,6 @@ namespace FCM0000 f.ShowDialog(); } - private void 인쇄ToolStripMenuItem_Click(object sender, EventArgs e) - { - FPUtil.printsheet(this.fpSpread1, "재고등록현황"); - } private void 입고등록ToolStripMenuItem_Click(object sender, EventArgs e) { @@ -508,5 +490,10 @@ namespace FCM0000 } else newdr.Delete(); } + + private void toolStripLabel7_Click(object sender, EventArgs e) + { + updateplace(); + } } } diff --git a/SubProject/FCM0000/Inventory/fInventory.resx b/SubProject/FCM0000/Inventory/fInventory.resx index cef9b8b..2140e3c 100644 --- a/SubProject/FCM0000/Inventory/fInventory.resx +++ b/SubProject/FCM0000/Inventory/fInventory.resx @@ -118,13 +118,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 17, 17 + 79, 17 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -135,7 +135,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -144,7 +144,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -153,7 +153,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -164,7 +164,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/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 @@ -187,7 +187,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -233,7 +233,7 @@ - 83, 17 + 145, 17 @@ -257,35 +257,15 @@ - 371, 17 - - - - R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh - e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw - QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK - HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC - un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= - - - - - R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7 - 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ - IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj - SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG - vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - - - 501, 17 + 433, 17 - 189, 17 + 251, 17 - 253, 17 + 315, 17 + + + 17, 17 \ No newline at end of file diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs b/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs index 468f0b1..668ea39 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs @@ -57,15 +57,10 @@ this.입고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.출고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.인쇄ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dSReport = new FCM0000.DSReport(); this.ta = new FCM0000.DSReportTableAdapters.jagosummaryPlaceTableAdapter(); - this.초기화ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.arDatagridView1 = new arCtl.arDatagridView(); this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.boxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -257,6 +252,7 @@ this.toolStripLabel2.Name = "toolStripLabel2"; this.toolStripLabel2.Size = new System.Drawing.Size(43, 34); this.toolStripLabel2.Text = "보관소"; + this.toolStripLabel2.Click += new System.EventHandler(this.toolStripLabel2_Click); // // cmbPlace // @@ -295,11 +291,9 @@ this.입고등록ToolStripMenuItem, this.출고등록ToolStripMenuItem, this.toolStripMenuItem2, - this.columnSizeToolStripMenuItem, - this.exportListToolStripMenuItem, - this.인쇄ToolStripMenuItem}); + this.exportListToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(241, 190); + this.cm.Size = new System.Drawing.Size(241, 140); // // 입고등록ToolStripMenuItem // @@ -320,32 +314,6 @@ this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Size = new System.Drawing.Size(237, 6); // - // columnSizeToolStripMenuItem - // - this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveToolStripMenuItem, - this.loadToolStripMenuItem, - this.초기화ToolStripMenuItem}); - this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(240, 36); - this.columnSizeToolStripMenuItem.Text = "열 크기"; - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(264, 36); - this.saveToolStripMenuItem.Text = "현재 상태 저장"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // loadToolStripMenuItem - // - this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); - this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(264, 36); - this.loadToolStripMenuItem.Text = "저장값 불러오기"; - this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); - // // exportListToolStripMenuItem // this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem"; @@ -353,13 +321,6 @@ this.exportListToolStripMenuItem.Text = "목록 내보내기"; this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); // - // 인쇄ToolStripMenuItem - // - this.인쇄ToolStripMenuItem.Name = "인쇄ToolStripMenuItem"; - this.인쇄ToolStripMenuItem.Size = new System.Drawing.Size(240, 36); - this.인쇄ToolStripMenuItem.Text = "인쇄"; - this.인쇄ToolStripMenuItem.Click += new System.EventHandler(this.인쇄ToolStripMenuItem_Click); - // // bs // this.bs.DataMember = "jagosummaryPlace"; @@ -374,13 +335,6 @@ // this.ta.ClearBeforeFill = true; // - // 초기화ToolStripMenuItem - // - this.초기화ToolStripMenuItem.Name = "초기화ToolStripMenuItem"; - this.초기화ToolStripMenuItem.Size = new System.Drawing.Size(264, 36); - this.초기화ToolStripMenuItem.Text = "초기화"; - this.초기화ToolStripMenuItem.Click += new System.EventHandler(this.초기화ToolStripMenuItem_Click); - // // arDatagridView1 // this.arDatagridView1.A_DelCurrentCell = true; @@ -531,21 +485,16 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.BindingSource bs; private System.Windows.Forms.ContextMenuStrip cm; - private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportListToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripButton btFind; private System.Windows.Forms.ToolStripButton toolStripButton2; private DSReport dSReport; private DSReportTableAdapters.jagosummaryPlaceTableAdapter ta; - private System.Windows.Forms.ToolStripMenuItem 인쇄ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel2; private System.Windows.Forms.ToolStripComboBox cmbPlace; private System.Windows.Forms.ToolStripMenuItem 입고등록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 출고등록ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 초기화ToolStripMenuItem; private arCtl.arDatagridView arDatagridView1; private System.Windows.Forms.DataGridViewTextBoxColumn placeDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn boxDataGridViewTextBoxColumn; diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs index 7defa37..ef30f90 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs @@ -58,13 +58,7 @@ namespace FCM0000 this.Show(); Application.DoEvents(); - //보관소 목록 업데이트 - cmbPlace.Items.Clear(); - cmbPlace.Items.Add("--전체--"); - var list = FCOMMON.DBM.getPlaceList(FCOMMON.info.Login.gcode); - foreach (var item in list) - cmbPlace.Items.Add(item); - cmbPlace.SelectedIndex = 0; + updateplace(); dtSD.Text = DateTime.Now.ToShortDateString(); RefreshData(); @@ -182,12 +176,9 @@ namespace FCM0000 sd.FileName = "inventoryjagolist.xls"; if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - //fpSpread1.SaveExcel(sd.FileName, - // FarPoint.Excel.ExcelSaveFlags.SaveAsViewed - // | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered - // | FarPoint.Excel.ExcelSaveFlags.NoFormulas - // | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); - //FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); + arDatagridView1.ExportData(sd.FileName); + var dlg = FCOMMON.Util.MsgQ("다음 파일이 생성 되었습니다.\n파일을 확인할까요?\n" + sd.FileName); + if (dlg == DialogResult.Yes) FCOMMON.Util.RunExplorer(sd.FileName); } } @@ -309,5 +300,19 @@ namespace FCM0000 { // FPUtil.ColsizeSave(this.fpSpread1, fn_fpcolsize); } + void updateplace() + { + var pretex = cmbPlace.Text; + var PlaceList = FCOMMON.DBM.GetItemStorageList(); + cmbPlace.Items.Clear(); + cmbPlace.Items.Add("--전체--"); + foreach (var item in PlaceList) + cmbPlace.Items.Add(item); + cmbPlace.SelectedIndex = 0; + } + private void toolStripLabel2_Click(object sender, EventArgs e) + { + updateplace(); + } } } diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.resx b/SubProject/FCM0000/Inventory/fInventoryJagoList.resx index af9b1aa..109fb1a 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.resx +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -135,7 +135,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -144,7 +144,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -153,7 +153,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -214,26 +214,6 @@ 253, 17 - - - R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh - e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw - QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK - HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC - un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= - - - - - R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7 - 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ - IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj - SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG - vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - 189, 17