diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index feb15e6..6db5775 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -360,6 +360,7 @@ Help_008.cs + Form diff --git a/unimarc/unimarc/마크/Mac_List.Designer.cs b/unimarc/unimarc/마크/Mac_List.Designer.cs index ee289fe..21103e7 100644 --- a/unimarc/unimarc/마크/Mac_List.Designer.cs +++ b/unimarc/unimarc/마크/Mac_List.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Mac_List)); this.label1 = new System.Windows.Forms.Label(); this.tb_Search = new System.Windows.Forms.TextBox(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); @@ -74,9 +76,25 @@ this.panel4 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); + this.bn1 = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); + this.bs1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bn1)).BeginInit(); + this.bn1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs1)).BeginInit(); this.SuspendLayout(); // // label1 @@ -153,6 +171,7 @@ // // idx // + this.idx.DataPropertyName = "idx"; this.idx.HeaderText = "idx"; this.idx.MinimumWidth = 6; this.idx.Name = "idx"; @@ -161,6 +180,7 @@ // // start_date // + this.start_date.DataPropertyName = "start_date"; this.start_date.HeaderText = "목록일자"; this.start_date.MinimumWidth = 6; this.start_date.Name = "start_date"; @@ -168,6 +188,7 @@ // // end_date // + this.end_date.DataPropertyName = "end_date"; this.end_date.HeaderText = "완료일자"; this.end_date.MinimumWidth = 6; this.end_date.Name = "end_date"; @@ -175,6 +196,7 @@ // // dvc_custname // + this.dvc_custname.DataPropertyName = "customer_name"; this.dvc_custname.HeaderText = "납품처"; this.dvc_custname.MinimumWidth = 6; this.dvc_custname.Name = "dvc_custname"; @@ -182,6 +204,7 @@ // // list_name // + this.list_name.DataPropertyName = "list_name"; this.list_name.HeaderText = "목록명"; this.list_name.MinimumWidth = 6; this.list_name.Name = "list_name"; @@ -189,6 +212,7 @@ // // work_name // + this.work_name.DataPropertyName = "work_name"; this.work_name.HeaderText = "작업명"; this.work_name.MinimumWidth = 6; this.work_name.Name = "work_name"; @@ -196,6 +220,7 @@ // // count // + this.count.DataPropertyName = "count"; this.count.HeaderText = "수량"; this.count.MinimumWidth = 6; this.count.Name = "count"; @@ -203,6 +228,7 @@ // // stock // + this.stock.DataPropertyName = "stock"; this.stock.HeaderText = "입고"; this.stock.MinimumWidth = 6; this.stock.Name = "stock"; @@ -211,6 +237,7 @@ // // unstock // + this.unstock.DataPropertyName = "unstock"; this.unstock.HeaderText = "미입고"; this.unstock.MinimumWidth = 6; this.unstock.Name = "unstock"; @@ -219,6 +246,7 @@ // // state // + this.state.DataPropertyName = "state"; this.state.HeaderText = "상태"; this.state.MinimumWidth = 6; this.state.Name = "state"; @@ -226,6 +254,7 @@ // // etc // + this.etc.DataPropertyName = "etc"; this.etc.HeaderText = "비고"; this.etc.MinimumWidth = 6; this.etc.Name = "etc"; @@ -233,6 +262,7 @@ // // charge // + this.charge.DataPropertyName = "charge"; this.charge.HeaderText = "담당자"; this.charge.MinimumWidth = 6; this.charge.Name = "charge"; @@ -240,6 +270,7 @@ // // dvc_cust // + this.dvc_cust.DataPropertyName = "customer"; this.dvc_cust.HeaderText = "CustomerIDX"; this.dvc_cust.MinimumWidth = 6; this.dvc_cust.Name = "dvc_cust"; @@ -248,6 +279,7 @@ // // check // + this.check.DataPropertyName = "check"; this.check.HeaderText = "V"; this.check.MinimumWidth = 6; this.check.Name = "check"; @@ -544,6 +576,7 @@ // // panel2 // + this.panel2.Controls.Add(this.bn1); this.panel2.Controls.Add(this.dataGridView1); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(0, 34); @@ -551,6 +584,121 @@ this.panel2.Size = new System.Drawing.Size(1638, 624); this.panel2.TabIndex = 53; // + // bn1 + // + this.bn1.AddNewItem = this.bindingNavigatorAddNewItem; + this.bn1.BindingSource = this.bs1; + this.bn1.CountItem = this.bindingNavigatorCountItem; + this.bn1.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2, + this.bindingNavigatorAddNewItem, + this.bindingNavigatorDeleteItem}); + this.bn1.Location = new System.Drawing.Point(0, 0); + this.bn1.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bn1.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bn1.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bn1.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bn1.Name = "bn1"; + this.bn1.PositionItem = this.bindingNavigatorPositionItem; + this.bn1.Size = new System.Drawing.Size(1638, 25); + this.bn1.TabIndex = 49; + this.bn1.Text = "bindingNavigator1"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorPositionItem + // + 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"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorAddNewItem + // + this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); + this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; + this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorAddNewItem.Text = "새로 추가"; + // + // bindingNavigatorDeleteItem + // + this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); + this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; + this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorDeleteItem.Text = "삭제"; + // // Mac_List // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -566,6 +714,11 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bn1)).EndInit(); + this.bn1.ResumeLayout(false); + this.bn1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs1)).EndInit(); this.ResumeLayout(false); } @@ -616,5 +769,18 @@ private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Panel panel13; + private System.Windows.Forms.BindingNavigator bn1; + private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; + private System.Windows.Forms.BindingSource bs1; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs index 1ff4455..981ef99 100644 --- a/unimarc/unimarc/마크/Mac_List.cs +++ b/unimarc/unimarc/마크/Mac_List.cs @@ -22,6 +22,9 @@ namespace UniMarc main = _main; compidx = main.com_idx; user_name = main.botUserLabel.Text; + + dataGridView1.AutoGenerateColumns = false; + dataGridView1.DataSource = bs1; } private void Mac_List_Load(object sender, EventArgs e) { @@ -39,6 +42,7 @@ namespace UniMarc dataGridView1.Columns["end_date"].ReadOnly = false; dataGridView1.Columns["work_name"].ReadOnly = false; dataGridView1.Columns["etc"].ReadOnly = false; + dataGridView1.Columns["check"].ReadOnly = false; } private void tb_Search_KeyDown(object sender, KeyEventArgs e) { @@ -67,53 +71,41 @@ namespace UniMarc "AND `state` = \"{4}\" " + "AND `chk_marc` > 0;", Area, table, compidx, search, state); - string db_res = db.DB_Send_CMD_Search(cmd); - string[] data = db_res.Split('|'); + + DataTable dt = db.ExecuteQueryData(cmd); + List items = new List(); - input_Grid(data); - } - - #region 목록조회 서브함수 - - /// - /// Grid에 데이터를 집어넣는 함수. - /// - /// - private void input_Grid(string[] data) - { - /* idx / 목록일자 / 완료일자 / 납품처 / 목록명 / 작업명 - * 전체수량 / 입고 / 미입고 / 상태 / 비고 - * 마크담당자 */ - - string[] grid = { "", "", "", "", "", - "", "", "", "", "", - "", "" ,"","","","","",""}; - int area_count = 13; - dataGridView1.Rows.Clear(); - for (int a = 0; a < data.Length; a++) + if (dt == null || dt.Rows.Count == 0) { - if (a % area_count == 0) { grid[0] = data[a]; } - if (a % area_count == 1) { grid[1] = data[a]; } - if (a % area_count == 2) { grid[2] = data[a]; } - if (a % area_count == 3) { grid[3] = data[a]; } - if (a % area_count == 4) { grid[4] = data[a]; } - if (a % area_count == 5) { grid[5] = data[a]; } - if (a % area_count == 6) { grid[6] = data[a]; } - if (a % area_count == 7) { grid[7] = data[a]; } - if (a % area_count == 8) { grid[8] = data[a]; } - if (a % area_count == 9) { grid[9] = data[a]; } - if (a % area_count == 10) { grid[10] = data[a]; } - if (a % area_count == 11) { grid[11] = data[a]; } - //if (a % area_count == 12) { grid[12] = data[a]; } - if (a % area_count == 12) - { //cutomeridx - grid[12] = data[a]; - dataGridView1.Rows.Add(grid); - } + bs1.DataSource = items; + return; } - } - #endregion + foreach (DataRow row in dt.Rows) + { + items.Add(new MacListItem + { + idx = row["idx"].ToString(), + start_date = row["date"].ToString(), + end_date = row["date_res"].ToString(), + customer_name = row["custname"]?.ToString() ?? string.Empty, + list_name = row["list_name"].ToString(), + work_name = row["work_name"].ToString(), + count = row["vol"].ToString(), + stock = row["stock"].ToString(), + unstock = row["unstock"].ToString(), + state = row["state"].ToString(), + etc = row["m_etc"].ToString(), + charge = row["m_charge"].ToString(), + customer = row["customer"]?.ToString() ?? string.Empty, + check = "" + }); + } + bs1.DataSource = items; + } + + + private void btn_AddList_Click(object sender, EventArgs e) { Mac_List_Add listAdd = new Mac_List_Add(this); @@ -127,38 +119,25 @@ namespace UniMarc return; string table = "Obj_List"; - for (int a = 0; a < dataGridView1.Rows.Count; a++) - { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") - { - string[] edit_col = { - "date", "date_res","custname", "list_name", "work_name", "vol", - "stock", "unstock", "state", "m_etc", "m_charge","customer" - }; - string[] edit_tbl = { - dataGridView1.Rows[a].Cells["start_date"].Value.ToString(), - dataGridView1.Rows[a].Cells["end_date"].Value.ToString(), - dataGridView1.Rows[a].Cells["custname"].Value.ToString(), - dataGridView1.Rows[a].Cells["list_name"].Value.ToString(), - dataGridView1.Rows[a].Cells["work_name"].Value.ToString(), - dataGridView1.Rows[a].Cells["count"].Value.ToString(), - dataGridView1.Rows[a].Cells["stock"].Value.ToString(), - dataGridView1.Rows[a].Cells["unstock"].Value.ToString(), - dataGridView1.Rows[a].Cells["state"].Value.ToString(), - dataGridView1.Rows[a].Cells["etc"].Value.ToString(), - dataGridView1.Rows[a].Cells["charge"].Value.ToString(), - dataGridView1.Rows[a].Cells["customer"].Value.ToString(), + string[] edit_col = { "date_res", "work_name", "m_etc" }; - }; + List items = bs1.List.Cast().ToList(); + + foreach (var item in items) + { + if (item.check == "V") + { + string[] edit_tbl = { item.end_date, item.work_name, item.etc }; string[] sear_col = { "idx", "comp_num" }; - string[] sear_tbl = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(), compidx }; + string[] sear_tbl = { item.idx, compidx }; string U_cmd = db.More_Update(table, edit_col, edit_tbl, sear_col, sear_tbl); db.DB_Send_CMD_reVoid(U_cmd); - dataGridView1.Rows[a].Cells["check"].Value = ""; + item.check = ""; } } + bs1.ResetBindings(false); MessageBox.Show("저장되었습니다!"); } @@ -167,28 +146,26 @@ namespace UniMarc Excel_text et = new Excel_text(); string[] Excel_title = { "NO", "목록일자", "완료일자", "납품처","목록명", "마크담당자", - //"작업명", "수량", "입고", "미입고", "상태", "비고" }; "작업명", "수량", "상태", "비고" }; - int rowCount = dataGridView1.RowCount; - // string[,] inputExcel = new string[rowCount, 11]; - string[,] inputExcel = new string[rowCount, 9]; + + List items = bs1.List.Cast().ToList(); + int rowCount = items.Count; + string[,] inputExcel = new string[rowCount, 10]; for (int a = 0; a < rowCount; a++) { - int row_idx = dataGridView1.Rows[a].HeaderCell.RowIndex + 1; - + var item = items[a]; var seq = 0; - inputExcel[a, seq++] = row_idx.ToString(); - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["start_date"].Value.ToString(); - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["end_date"].Value.ToString(); - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["custname"]?.Value.ToString() ?? ""; - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["list_name"].Value.ToString(); - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["charge"].Value.ToString(); - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["work_name"].Value.ToString(); - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["count"].Value.ToString(); - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["state"].Value.ToString(); - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["etc"].Value.ToString(); - inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["customer"]?.Value.ToString() ?? ""; + inputExcel[a, seq++] = (a + 1).ToString(); + inputExcel[a, seq++] = item.start_date; + inputExcel[a, seq++] = item.end_date; + inputExcel[a, seq++] = item.customer_name ?? ""; + inputExcel[a, seq++] = item.list_name; + inputExcel[a, seq++] = item.charge; + inputExcel[a, seq++] = item.work_name; + inputExcel[a, seq++] = item.count; + inputExcel[a, seq++] = item.state; + inputExcel[a, seq++] = item.etc; } et.Mk_Excel(Excel_title, inputExcel); } @@ -203,27 +180,18 @@ namespace UniMarc private void btn_Progress_Click(object sender, EventArgs e) { - for (int a = 0; a < dataGridView1.Rows.Count; a++) + List items = bs1.List.Cast().ToList(); + bool hasProgress = items.Any(i => i.check == "V" && i.state == "진행"); + if (hasProgress) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") - { - if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") - { - MessageBox.Show("체크된 목록이 현재 진행중입니다."); - return; - } - } + MessageBox.Show("체크된 목록이 현재 진행중입니다."); + return; } - for (int a = 0; a < dataGridView1.Rows.Count; a++) + + foreach (var item in items.Where(i => i.check == "V" && i.state == "완료")) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") - { - if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") - { - dataGridView1.Rows[a].Cells["state"].Value = "진행"; - state_Save(a); - } - } + item.state = "진행"; + state_Save_Object(item); } MessageBox.Show("진행처리되었습니다.", "목록진행"); @@ -232,27 +200,18 @@ namespace UniMarc private void btn_Completion_Click(object sender, EventArgs e) { - for (int a = 0; a < dataGridView1.Rows.Count; a++) + List items = bs1.List.Cast().ToList(); + bool hasCompletion = items.Any(i => i.check == "V" && i.state == "완료"); + if (hasCompletion) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") - { - if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") - { - MessageBox.Show("체크된 목록은 현재 완료되어있습니다."); - return; - } - } + MessageBox.Show("체크된 목록은 현재 완료되어있습니다."); + return; } - for (int a = 0; a < dataGridView1.Rows.Count; a++) + + foreach (var item in items.Where(i => i.check == "V" && i.state == "진행")) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") - { - if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") - { - dataGridView1.Rows[a].Cells["state"].Value = "완료"; - state_Save(a); - } - } + item.state = "완료"; + state_Save_Object(item); } MessageBox.Show("완료처리되었습니다.", "목록완료"); @@ -261,38 +220,37 @@ namespace UniMarc #region 진행/완료처리 서브함수 - /// - /// 목록의 상태를 바꾸기 위한 함수. - /// DB내 적용됨. - /// - /// - void state_Save(int row) + void state_Save_Object(MacListItem item) { string[] edit_col = { "state" }; - string[] edit_tbl = { dataGridView1.Rows[row].Cells["state"].Value.ToString() }; + string[] edit_tbl = { item.state }; string[] sear_col = { "idx", "comp_num" }; - string[] sear_tbl = { dataGridView1.Rows[row].Cells["idx"].Value.ToString(), compidx }; + string[] sear_tbl = { item.idx, compidx }; string U_cmd = db.More_Update("Obj_List", edit_col, edit_tbl, sear_col, sear_tbl); db.DB_Send_CMD_reVoid(U_cmd); } + + void state_Save(int row) + { + // Deprecated + } #endregion private void btn_Delete_Click(object sender, EventArgs e) { - for (int a = 0; a < dataGridView1.Rows.Count; a++) - { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") - { - string l_idx = dataGridView1.Rows[a].Cells["idx"].Value.ToString(); - string D_cmd = db.DB_Delete("Obj_List", "comp_num", compidx, - "idx", l_idx); - db.DB_Send_CMD_reVoid(D_cmd); + if (MessageBox.Show("정말로 삭제하시겠습니까?", "삭제경고", MessageBoxButtons.YesNo) == DialogResult.No) { return; } - string[] delete_tbl = { "l_idx" }; - string[] deleteData = { l_idx }; - D_cmd = db.DB_Delete_No_Limit("Obj_List_Book", "compidx", compidx, delete_tbl, deleteData); - db.DB_Send_CMD_reVoid(D_cmd); - } + List items = bs1.List.Cast().ToList(); + foreach (var item in items.Where(i => i.check == "V")) + { + string l_idx = item.idx; + string D_cmd = db.DB_Delete("Obj_List", "comp_num", compidx, "idx", l_idx); + db.DB_Send_CMD_reVoid(D_cmd); + + string[] delete_tbl = { "l_idx" }; + string[] deleteData = { l_idx }; + D_cmd = db.DB_Delete_No_Limit("Obj_List_Book", "compidx", compidx, delete_tbl, deleteData); + db.DB_Send_CMD_reVoid(D_cmd); } MessageBox.Show("삭제되었습니다."); @@ -306,59 +264,55 @@ namespace UniMarc private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int idx_row = e.RowIndex; + if (e.RowIndex < 0) return; + + var item = bs1[e.RowIndex] as MacListItem; + if (item == null) return; + int idx_col = e.ColumnIndex; if (3 <= idx_col && idx_col <= 8) { if (chkEditorTest.Checked == false) { var marc = this.main.OpenFormInTab(() => new Marc2(this), allowMultiple: true); - marc.input_list( - dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(), - dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx, - (dataGridView1.Rows[idx_row].Cells["dvc_cust"]?.Value.ToString() ?? string.Empty), - (dataGridView1.Rows[idx_row].Cells["dvc_custname"]?.Value.ToString() ?? string.Empty) - ); + marc.input_list(item); + //item.idx, + //item.list_name, + //compidx, + //item.customer, + //item.customer_name + //); } else { var marc = this.main.OpenFormInTab(() => new Marc(this), allowMultiple: true); marc.input_list( - dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(), - dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx, - (dataGridView1.Rows[idx_row].Cells["dvc_cust"]?.Value.ToString() ?? string.Empty), - (dataGridView1.Rows[idx_row].Cells["dvc_custname"]?.Value.ToString() ?? string.Empty) + item.idx, + item.list_name, + compidx, + item.customer, + item.customer_name ); } - } - if (((DataGridView)sender).Columns[idx_col].Name == "check") + if (dataGridView1.Columns[idx_col].Name == "check") { - if (((DataGridView)sender).Rows[idx_row].Cells[idx_col].Value.ToString() == "V") - ((DataGridView)sender).Rows[idx_row].Cells[idx_col].Value = ""; - - else - ((DataGridView)sender).Rows[idx_row].Cells[idx_col].Value = "V"; + item.check = (item.check == "V") ? "" : "V"; + bs1.ResetItem(e.RowIndex); } } private void dataGridView1_KeyDown(object sender, KeyEventArgs e) { - int row = dataGridView1.CurrentCell.RowIndex; - int col = dataGridView1.CurrentCell.ColumnIndex; - - if (dataGridView1.Columns[col].Name == "check") + if (e.KeyCode == Keys.Space) { - if (e.KeyCode == Keys.Space) + var item = bs1.Current as MacListItem; + if (item != null) { - if (dataGridView1.Rows[row].Cells[col].Value.ToString() == "V") - dataGridView1.Rows[row].Cells[col].Value = ""; - - else - dataGridView1.Rows[row].Cells[col].Value = "V"; + item.check = (item.check == "V") ? "" : "V"; + bs1.ResetCurrentItem(); } } - } private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) @@ -369,10 +323,10 @@ namespace UniMarc private void btnSearchISBN_Click(object sender, EventArgs e) { - if (this.dataGridView1.RowCount < 1) return; - if (dataGridView1.SelectedRows[0].Index < 0) return; - string tSearchText = dataGridView1.SelectedRows[0].Cells["list_name"].Value.ToString(); - string tSearchIDX = dataGridView1.SelectedRows[0].Cells["idx"].Value.ToString(); + var item = bs1.Current as MacListItem; + if (item == null) return; + string tSearchText = item.list_name; + string tSearchIDX = item.idx; var isbn = main.OpenFormInTab(() => new Check_ISBN(main, tSearchText, tSearchIDX)); isbn.tb_list_name.Enabled = true; } diff --git a/unimarc/unimarc/마크/Mac_List.resx b/unimarc/unimarc/마크/Mac_List.resx index e23f8dd..f4c2138 100644 --- a/unimarc/unimarc/마크/Mac_List.resx +++ b/unimarc/unimarc/마크/Mac_List.resx @@ -162,6 +162,77 @@ 17, 17 + + 154, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFXSURBVDhPzc9LSwJhFAZgd5FkaAlFRCEhVCRm9TssIiqw + 7CKWXZCQJA1Lw0JIo1Ckm1SL2rSoTYvaBEUQBhEF4YyXaex3fN/3hrNo4SxkNtELZ3U4D+9Rqf5tCmdV + yJ5U4zOlxvuBBuX7ismk1CDfGyDFENIJrXLgbV/zCzzE9MqB57gOpLgOIq7iNtJQGfg4rMFrshbpuA5P + u3W4j+pBxBVQwYPrUDMuAy248Btw6m3DkccoB18SWpBiEERcAxH9IMIyiOAGLcyB5h2gOTsYPwrGDyG+ + 2CEHHnfqpbr0ywsiLIEWFkDzTtDcJFjWBsYPg3GDYBkrtmdMcuAu0oibcBOupLqtOPcZQLNjYPwIku52 + 7M13IuoyIeI0IzxlkQPlOfYYpbqMG0DM1VX5oDylPxnXD8ZZseUwKweisybp39IE7T3Kgc3pboQmLAiM + 98Jv61MO/Fl+ACQj2J5cFZvRAAAAAElFTkSuQmCC + + + + 308, 17 + + + + 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 + + 55 diff --git a/unimarc/unimarc/마크/Marc2.cs b/unimarc/unimarc/마크/Marc2.cs index 2834fe0..7dde685 100644 --- a/unimarc/unimarc/마크/Marc2.cs +++ b/unimarc/unimarc/마크/Marc2.cs @@ -1,5 +1,6 @@ using AR; using OpenQA.Selenium.DevTools.V136.Animation; +using OpenQA.Selenium.DevTools.V136.Overlay; using Org.BouncyCastle.Asn1.CryptoPro; using System; using System.Collections.Generic; @@ -39,15 +40,10 @@ namespace UniMarc Skill_Search_Text search_Text = new Skill_Search_Text(); String_Text st = new String_Text(); Mac_List ml; + + MacListItem pItem = null; - //목록다시불러오기를 위해서 임시로 추가 - string p_lidx = ""; - string p_value = ""; - string p_cidx = ""; - string p_cust = ""; - string p_name = ""; - private void MarcEditorControl1_NextButton(object sender, EventArgs e) { @@ -72,8 +68,7 @@ namespace UniMarc marcEditorControl1.CloseButton += (s1, e1) => { this.Close(); }; } - string l_idx = string.Empty; - string c_idx = string.Empty; + private void Marc_Load(object sender, EventArgs e) { // 콤보박스 정렬및 필터 @@ -88,7 +83,7 @@ namespace UniMarc { var dlg = UTIL.MsgQ("데이터베이스 내용을 다시 불러옵니다\n저장되지 않은 사항은 손실됩니다.다시 불러올까요?"); if (dlg != DialogResult.Yes) return; - input_list(p_lidx, p_value, p_cidx, p_cust, p_name); + input_list(pItem); } (string remark1, string remark2) ReadRemark(int row) @@ -103,39 +98,51 @@ namespace UniMarc return (ary[0], ary[1]); } - + /// /// 가져온 목록을 책목록과 연동하여 Grid에 집어넣음. /// /// 목록일자 /// 목록명 - public void input_list(string l_idx, string value, string C_idx, string custidx, string custname) + public void input_list(MacListItem item)// ) { - p_lidx = l_idx; - p_value = value; - p_cidx = C_idx; - p_cust = custidx; - p_name = custname; + this.pItem = item; + //string l_idx, string value, string C_idx, string custidx, string custname + + //p_lidx = l_idx; + //p_value = value; + //p_cidx = C_idx; + //p_cust = custidx; + //p_name = custname; + + //item.idx, + //item.list_name, + //compidx, + //item.customer, + //item.customer_name + //); + db.DBcon(); + + //var value = item.list_name; //this.List_Book.Rows.Clear(); - if (value.isEmpty() == false) + if (item.list_name.isEmpty() == false) { - if (value.IndexOf("]") != -1) - this.Text = $"마크 작성(1)-{value.Substring(value.IndexOf("]") + 1)}"; + if (item.list_name.IndexOf("]") != -1) + this.Text = $"마크 작성(1)-{item.list_name.Substring(item.list_name.IndexOf("]") + 1)}"; else - this.Text = $"마크 작성(1){value}"; + this.Text = $"마크 작성(1){item.list_name}"; } - this.l_idx = l_idx; - this.c_idx = C_idx; + string Area = "`idx`, `isbn_marc`, `header`, `num`, `book_name`, `author`, `book_comp`, `count`, `pay`, `image_url`, `m_idx`"; string[] sear_tbl = { "l_idx", "compidx" }; - string[] sear_col = { l_idx, C_idx }; + string[] sear_col = { item.idx, Properties.Settings.Default.compidx }; - lbl_BookList.Text = value; - tbCustName.Text = custname; - lbCustIDX.Text = custidx; + lbl_BookList.Text = item.list_name; + tbCustName.Text = item.customer_name; + lbCustIDX.Text = item.customer; string cmd = string.Format("SELECT {0} " + @@ -154,19 +161,19 @@ namespace UniMarc for (int a = 0; a < db_data.Length - 1; a += 11) { - MarcBookItem item = new MarcBookItem(); - item.ListIdx = db_data[a]; // 0: idx - item.ISBN13 = db_data[a + 1]; // 1: isbn - item.Num = db_data[a + 2] + db_data[a + 3]; // 2: header + num - item.BookName = db_data[a + 4]; // 3: book_num - item.Author = db_data[a + 5]; // 4: author - item.BookComp = db_data[a + 6]; // 5: book_comp - item.Count = db_data[a + 7]; // 6: count - item.Pay = db_data[a + 8]; // 7: pay - item.Url = db_data[a + 9]; // 8: image_url - item.MarcIdx = db_data[a + 10]; // 9: m_idx + MarcBookItem bitem = new MarcBookItem(); + bitem.ListIdx = db_data[a]; // 0: idx + bitem.ISBN13 = db_data[a + 1]; // 1: isbn + bitem.Num = db_data[a + 2] + db_data[a + 3]; // 2: header + num + bitem.BookName = db_data[a + 4]; // 3: book_num + bitem.Author = db_data[a + 5]; // 4: author + bitem.BookComp = db_data[a + 6]; // 5: book_comp + bitem.Count = db_data[a + 7]; // 6: count + bitem.Pay = db_data[a + 8]; // 7: pay + bitem.Url = db_data[a + 9]; // 8: image_url + bitem.MarcIdx = db_data[a + 10]; // 9: m_idx - dataList.Add(item); + dataList.Add(bitem); } bs1.DataSource = dataList; List_Book.AutoGenerateColumns = false; @@ -920,7 +927,7 @@ namespace UniMarc if (int.TryParse(lbCustIDX.Text, out int custidx) && custidx >= 0) { - var sql = $"update Obj_List set customer={custidx} where idx = {l_idx} and comp_num={c_idx}"; + var sql = $"update Obj_List set customer={custidx} where idx = {pItem.idx} and comp_num={Properties.Settings.Default.compidx}"; var cnt = DB2.ExcuteNonQuery(sql); if (cnt != 1) UTIL.MsgE($"데이터 저장시 오류가 발생했습니다. 영향을 받은 행 수 = {cnt}"); diff --git a/unimarc/unimarc/마크/Marc2.designer.cs b/unimarc/unimarc/마크/Marc2.designer.cs index 3d33aa2..47ddff8 100644 --- a/unimarc/unimarc/마크/Marc2.designer.cs +++ b/unimarc/unimarc/마크/Marc2.designer.cs @@ -39,10 +39,10 @@ System.Windows.Forms.Label label25; System.Windows.Forms.Label label26; System.Windows.Forms.Label label27; - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc2)); this.List_Book = new System.Windows.Forms.DataGridView(); this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -77,12 +77,13 @@ this.lbl_BookList = new System.Windows.Forms.ToolStripStatusLabel(); this.btClose = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); - this.marcEditorControl1 = new MarcEditorControl(); + this.marcEditorControl1 = new UniMarc.MarcEditorControl(); this.panel3 = new System.Windows.Forms.Panel(); + this.panel4 = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); - this.bs1 = new System.Windows.Forms.BindingSource(this.components); this.bn1 = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bs1 = new System.Windows.Forms.BindingSource(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -93,7 +94,7 @@ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.panel4 = new System.Windows.Forms.Panel(); + this.lblBookDate = new System.Windows.Forms.ToolStripStatusLabel(); label31 = new System.Windows.Forms.Label(); label30 = new System.Windows.Forms.Label(); label33 = new System.Windows.Forms.Label(); @@ -109,10 +110,10 @@ this.statusStrip1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs1)).BeginInit(); + this.panel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bn1)).BeginInit(); this.bn1.SuspendLayout(); - this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs1)).BeginInit(); this.SuspendLayout(); // // label31 @@ -192,14 +193,14 @@ this.List_Book.AllowUserToDeleteRows = false; this.List_Book.BackgroundColor = System.Drawing.Color.SkyBlue; this.List_Book.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; this.List_Book.ColumnHeadersHeight = 29; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, @@ -223,14 +224,14 @@ this.List_Book.MultiSelect = false; this.List_Book.Name = "List_Book"; this.List_Book.ReadOnly = true; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.ControlDark; - dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.ControlDark; + dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; this.List_Book.RowHeadersWidth = 51; this.List_Book.RowTemplate.Height = 23; this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -356,9 +357,9 @@ // grade // this.grade.DataPropertyName = "Grade"; - dataGridViewCellStyle2.Format = "N0"; - dataGridViewCellStyle2.NullValue = null; - this.grade.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle6.Format = "N0"; + dataGridViewCellStyle6.NullValue = null; + this.grade.DefaultCellStyle = dataGridViewCellStyle6; this.grade.HeaderText = "등급"; this.grade.MinimumWidth = 6; this.grade.Name = "grade"; @@ -369,8 +370,8 @@ // colCheck // this.colCheck.DataPropertyName = "ColCheck"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.colCheck.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colCheck.DefaultCellStyle = dataGridViewCellStyle7; this.colCheck.HeaderText = "V"; this.colCheck.MinimumWidth = 6; this.colCheck.Name = "colCheck"; @@ -549,6 +550,7 @@ this.statusStrip1.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.lblBookDate, this.lbl_BookList}); this.statusStrip1.Location = new System.Drawing.Point(0, 634); this.statusStrip1.Name = "statusStrip1"; @@ -609,6 +611,19 @@ this.panel3.Size = new System.Drawing.Size(555, 634); this.panel3.TabIndex = 325; // + // panel4 + // + this.panel4.Controls.Add(this.tbCustName); + this.panel4.Controls.Add(this.lbCustIDX); + this.panel4.Controls.Add(this.btClose); + this.panel4.Controls.Add(this.button1); + this.panel4.Dock = System.Windows.Forms.DockStyle.Top; + this.panel4.Location = new System.Drawing.Point(0, 0); + this.panel4.Name = "panel4"; + this.panel4.Padding = new System.Windows.Forms.Padding(3); + this.panel4.Size = new System.Drawing.Size(555, 33); + this.panel4.TabIndex = 327; + // // button1 // this.button1.Dock = System.Windows.Forms.DockStyle.Left; @@ -736,18 +751,11 @@ this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // - // panel4 + // lblBookDate // - this.panel4.Controls.Add(this.tbCustName); - this.panel4.Controls.Add(this.lbCustIDX); - this.panel4.Controls.Add(this.btClose); - this.panel4.Controls.Add(this.button1); - this.panel4.Dock = System.Windows.Forms.DockStyle.Top; - this.panel4.Location = new System.Drawing.Point(0, 0); - this.panel4.Name = "panel4"; - this.panel4.Padding = new System.Windows.Forms.Padding(3); - this.panel4.Size = new System.Drawing.Size(555, 33); - this.panel4.TabIndex = 327; + this.lblBookDate.Name = "lblBookDate"; + this.lblBookDate.Size = new System.Drawing.Size(119, 19); + this.lblBookDate.Text = "{bookdate}"; // // Marc2 // @@ -772,11 +780,11 @@ this.panel2.ResumeLayout(false); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs1)).EndInit(); + this.panel4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bn1)).EndInit(); this.bn1.ResumeLayout(false); this.bn1.PerformLayout(); - this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.bs1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -837,5 +845,6 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.ToolStripStatusLabel lblBookDate; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc2.resx b/unimarc/unimarc/마크/Marc2.resx index 8997eba..a2fe968 100644 --- a/unimarc/unimarc/마크/Marc2.resx +++ b/unimarc/unimarc/마크/Marc2.resx @@ -198,11 +198,14 @@ 273, 17 + + 273, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAVdJREFUOE/Nz0tLAmEUBmB3kWRoCUVEISFUJGb1OywiKrDsIpZdkJAkDUvDQkij + wQAADsEBuJFr7QAAAVdJREFUOE/Nz0tLAmEUBmB3kWRoCUVEISFUJGb1OywiKrDsIpZdkJAkDUvDQkij UKSbVIvatKhNi9oERRAGEQXhjJdp7Hd83/eGs2jhLGQ20QtndTgP71Gp/m0KZ1XInlTjM6XG+4EG5fuK yaTUIN8bIMUQ0gmtcuBtX/MLPMT0yoHnuA6kuA4iruI20lAZ+DiswWuyFum4Dk+7dbiP6kHEFVDBg+tQ My4DLbjwG3DqbcORxygHXxJakGIQRFwDEf0gwjKI4AYtzIHmHaA5Oxg/CsYPIb7YIQced+qluvTLCyIs @@ -217,7 +220,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAWtJREFUOE+1kE0ow2Ecx/9X5a2UiwtKOSCTmJBMhuQlMo3IvCUHDouEXHZwIOVC + wQAADsEBuJFr7QAAAWtJREFUOE+1kE0ow2Ecx/9X5a2UiwtKOSCTmJBMhuQlMo3IvCUHDouEXHZwIOVC DrhIDiQl5USy07zNa2tKf2laaRf84/J8xBCetab4XL/f76fn+SnKX4DrGLqrwbHDzywkWJlHdJYjLEbY Wg8q4eYKlma+d1hbgF4TotWIaC+FuYmAktcXCksx2HrknBOHX1KbiTDngrXhW0kMdSBM2TA5Io+/wuI0 oiz5TcRwB7hPYazfLx3rDz7+gCsXNBb4v1SdgajTQ19TaOMP2NtFmPSIilSo0v1y7FHBnAdZMWi6aO51 @@ -229,7 +232,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+ + wQAADsEBuJFr7QAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+ +8H/4IZrWOXAIGPK0/8L933Aqii+5+H/pfv///evvoAhBwcJPU/+T9vyHkNRRPt9sObMWf//e5WewG1A ZNej/72rP6AoCm29B9bcuu7/f//Ov/9d8g/gNiCw+eH/uvnv4IqCW+7+X7T3//+Odf//Z8z5+d+u7ud/ +4ztuA3wqLr/P3/aGxRFdsW3/6fP+f3fv+vbf53Cd/8tEtbjNsC+9O7/7MmvMRTpp5z/b1L04r9K1qf/ @@ -240,7 +243,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33 + wQAADsEBuJFr7QAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33 wZozZ/3/71V6gjQDQlvvgTW3rvv/37/z73+X/APEGxDccvf/or3//3es+/8/Y87P/3Z1P//bZ2wn3gAQ sCu+/T99zu///l3f/usUvvtvkbCeNANAQD/l/H+Tohf/VbI+/TeOXEa6ASBgkHTiv2za1/+6wfPIMwAE 9FMv/9fwnUa+ASCg4jGBMgMGLwAA0BRgmCws/7cAAAAASUVORK5CYII= @@ -249,7 +252,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5 + wQAADsEBuJFr7QAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5 8n/2vl//O7f+/e9Wepl0QyK7Hv2fsu3X/5Klf/8nTP/73yb3LGmGBDY//N+69j1Ys3HJl//S0df+G0cu I94Qj6r7/0vmvoNrVnTpIV4zCNiX3v0f2PKMPM0gYJF3579NwRXyNIOAYdZt8jWDgE7aDfI1D00AAKB+ X6Bjq5qXAAAAAElFTkSuQmCC @@ -258,7 +261,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe + wQAADsEBuJFr7QAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe /w9vf4BVHgwypjz9P2//7/8JXXcwFIHkFu778D+44RqGHBwk9Dz5P3vfr/+dW//+dyu9jKIQJDdty/v/ /tUXcBsQ2fXo/5Rtv/6XLP37P2H63/82uWfhikFyvas//PcqPYHbgMDmh/9b174HazYu+fJfOvraf+PI ZWANILm6+e/+u+QfwG2AR9X9/yVz38E1K7r0wBWD5PKnvflvn7EdtwH2pXf/B7Y8w9AMk8ue/Pq/RcJ6