diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 89a9491..88fd13c 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs index b0a2f1f..a39f6a8 100644 --- a/unimarc/unimarc/Main.Designer.cs +++ b/unimarc/unimarc/Main.Designer.cs @@ -120,6 +120,7 @@ this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.botUserLabel = new System.Windows.Forms.ToolStripLabel(); + this.VersionText = new System.Windows.Forms.ToolStripLabel(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.menuStrip1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -395,7 +396,7 @@ this.불용어, this.작업지시서}); this.마크설정.Name = "마크설정"; - this.마크설정.Size = new System.Drawing.Size(180, 22); + this.마크설정.Size = new System.Drawing.Size(142, 22); this.마크설정.Text = "설정"; // // 단축키설정 @@ -435,7 +436,7 @@ this.복본조사1, this.iSBN조회}); this.마크작업.Name = "마크작업"; - this.마크작업.Size = new System.Drawing.Size(180, 22); + this.마크작업.Size = new System.Drawing.Size(142, 22); this.마크작업.Text = "마크 작업"; // // 마크목록 @@ -462,7 +463,7 @@ // 복본조사1 // this.복본조사1.Name = "복본조사1"; - this.복본조사1.Size = new System.Drawing.Size(180, 22); + this.복본조사1.Size = new System.Drawing.Size(146, 22); this.복본조사1.Text = "복본조사"; this.복본조사1.Click += new System.EventHandler(this.복본조사ToolStripMenuItem1_Click); // @@ -479,7 +480,7 @@ this.마크반입, this.마크반출}); this.반입및반출.Name = "반입및반출"; - this.반입및반출.Size = new System.Drawing.Size(180, 22); + this.반입및반출.Size = new System.Drawing.Size(142, 22); this.반입및반출.Text = "반입 및 반출"; // // 마크반입 @@ -504,7 +505,7 @@ this.검수, this.저자기호}); this.부가기능.Name = "부가기능"; - this.부가기능.Size = new System.Drawing.Size(180, 22); + this.부가기능.Size = new System.Drawing.Size(142, 22); this.부가기능.Text = "부가기능"; // // 마크수집 @@ -541,20 +542,20 @@ this.DLS조회, this.dLS복본조사}); this.DLS.Name = "DLS"; - this.DLS.Size = new System.Drawing.Size(180, 22); + this.DLS.Size = new System.Drawing.Size(142, 22); this.DLS.Text = "DLS"; // // DLS조회 // this.DLS조회.Name = "DLS조회"; - this.DLS조회.Size = new System.Drawing.Size(180, 22); + this.DLS조회.Size = new System.Drawing.Size(154, 22); this.DLS조회.Text = "DLS_조회/입력"; this.DLS조회.Click += new System.EventHandler(this.dLS조회ToolStripMenuItem_Click); // // dLS복본조사 // this.dLS복본조사.Name = "dLS복본조사"; - this.dLS복본조사.Size = new System.Drawing.Size(180, 22); + this.dLS복본조사.Size = new System.Drawing.Size(154, 22); this.dLS복본조사.Text = "DLS 복본조사"; this.dLS복본조사.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click); // @@ -565,7 +566,7 @@ this.마크통계, this.장비관리}); this.마크기타.Name = "마크기타"; - this.마크기타.Size = new System.Drawing.Size(180, 22); + this.마크기타.Size = new System.Drawing.Size(142, 22); this.마크기타.Text = "기타"; // // 서류작성 @@ -898,7 +899,8 @@ this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel2, - this.botUserLabel}); + this.botUserLabel, + this.VersionText}); this.toolStrip1.Location = new System.Drawing.Point(0, 607); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(1252, 25); @@ -917,6 +919,13 @@ this.botUserLabel.Size = new System.Drawing.Size(43, 22); this.botUserLabel.Text = "이용자"; // + // VersionText + // + this.VersionText.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.VersionText.Name = "VersionText"; + this.VersionText.Size = new System.Drawing.Size(116, 22); + this.VersionText.Text = "UniMarc Ver 0.0000"; + // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1036,5 +1045,6 @@ public System.Windows.Forms.ToolStripLabel botUserLabel; private System.Windows.Forms.ToolStripMenuItem 복본조사1; private System.Windows.Forms.ToolStripMenuItem dLS복본조사; + private System.Windows.Forms.ToolStripLabel VersionText; } } \ No newline at end of file diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs index 1ff4b6a..d7df9bb 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -47,6 +47,8 @@ namespace WindowsFormsApp1 login login = new login(); + VersionInfo(); + if (DialogResult.OK == login.ShowDialog(this)) { this.Visible = true; } @@ -69,10 +71,11 @@ namespace WindowsFormsApp1 User = result[3]; } - if (result[8] != "관리자") { 마스터ToolStripMenuItem.Visible = false; } + if (result[7] != "관리자") { 마스터ToolStripMenuItem.Visible = false; } - cmd = _DB.DB_Select_Search("`idx`", "Comp", "comp_name", result[5]); + cmd = _DB.DB_Select_Search("`idx`", "Comp", "comp_name", result[4]); com_idx = _DB.DB_Send_CMD_Search(cmd).Replace("|", ""); + Settings.Default.compidx = com_idx; Settings.Default.User = botUserLabel.Text; @@ -84,6 +87,21 @@ namespace WindowsFormsApp1 catch (Exception ex) { MessageBox.Show(ex.ToString()); } } + private void VersionInfo() + { + StreamReader sr = new StreamReader(Application.StartupPath + "\\update.inf"); + int i = -1; + while (!sr.EndOfStream) + { + string line = sr.ReadLine(); + if (line.IndexOf("count=", 0) != -1) + { + string version = line.Replace("count=", ""); + VersionText.Text = string.Format("UniMarc Ver {0}", version); + } + } + } + #region 즐겨찾기 버튼 세팅 public void SetBtnName() { diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 9ce89d2..493c9e6 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb index 8024ba0..2dac6d2 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll index 2e7b280..b9de734 100644 Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index 87ce804..fcc3d04 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 9ce89d2..493c9e6 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb index 8024ba0..2dac6d2 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index 2e7b280..b9de734 100644 Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/마크/Check_copy.Designer.cs b/unimarc/unimarc/마크/Check_copy.Designer.cs index fee80ea..b1001a0 100644 --- a/unimarc/unimarc/마크/Check_copy.Designer.cs +++ b/unimarc/unimarc/마크/Check_copy.Designer.cs @@ -40,6 +40,9 @@ this.label1 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.webBrowser1 = new System.Windows.Forms.WebBrowser(); this.btn_ApplyFilter = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); @@ -48,9 +51,6 @@ this.chk_RemoveBrit = new System.Windows.Forms.CheckBox(); this.chk_spChar = new System.Windows.Forms.CheckBox(); this.panel5 = new System.Windows.Forms.Panel(); - this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.SearchCount)).BeginInit(); this.panel2.SuspendLayout(); @@ -101,6 +101,7 @@ this.btn_Stop.TabIndex = 2; this.btn_Stop.Text = "검색중지"; this.btn_Stop.UseVisualStyleBackColor = true; + this.btn_Stop.Click += new System.EventHandler(this.btn_Stop_Click); // // SearchCount // @@ -190,6 +191,24 @@ this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // + // book_name + // + this.book_name.HeaderText = "도서명(총서명)"; + this.book_name.Name = "book_name"; + this.book_name.Width = 350; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.Width = 150; + // + // Count + // + this.Count.HeaderText = "검색 수"; + this.Count.Name = "Count"; + this.Count.Width = 70; + // // webBrowser1 // this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -272,24 +291,6 @@ this.panel5.Size = new System.Drawing.Size(717, 732); this.panel5.TabIndex = 4; // - // book_name - // - this.book_name.HeaderText = "도서명(총서명)"; - this.book_name.Name = "book_name"; - this.book_name.Width = 350; - // - // book_comp - // - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - this.book_comp.Width = 150; - // - // Count - // - this.Count.HeaderText = "검색 수"; - this.Count.Name = "Count"; - this.Count.Width = 70; - // // Check_copy // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs index 6262ee7..89d2592 100644 --- a/unimarc/unimarc/마크/Check_copy.cs +++ b/unimarc/unimarc/마크/Check_copy.cs @@ -20,6 +20,7 @@ namespace WindowsFormsApp1.Mac public string URL; public string lib_Category; public string Code; + private bool isStop = false; Main main; public Check_copy(Main _main) { @@ -62,11 +63,17 @@ namespace WindowsFormsApp1.Mac { Skill_Grid sg = new Skill_Grid(); sg.Excel_to_DataGridView(sender, e); + + SearchCount.Value = dataGridView1.Rows.Count; } private void btn_Start_Click(object sender, EventArgs e) { - for (int a = 0; a < dataGridView1.Rows.Count - 1; a++) + int SCount = Convert.ToInt32(SearchCount.Value); + + isStop = false; + + for (int a = 0; a < SCount; a++) { if (dataGridView1.Rows[a].Cells["book_name"].Value == null) continue; @@ -74,8 +81,17 @@ namespace WindowsFormsApp1.Mac if (dataGridView1.Rows[a].Cells["book_name"].Value.ToString() == "") continue; - dataGridView1.Rows[a].Cells["Count"].Value = - CopyCount(dataGridView1.Rows[a].Cells["book_name"].Value.ToString()); + if (isStop) + break; + + string BookSearchCount = CopyCount(dataGridView1.Rows[a].Cells["book_name"].Value.ToString()); + + if (BookSearchCount == "false") { + MessageBox.Show("검색대상이 설정되지않았습니다!"); + return; + } + + dataGridView1.Rows[a].Cells["Count"].Value = BookSearchCount; dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; } } @@ -84,6 +100,9 @@ namespace WindowsFormsApp1.Mac { string result = ""; + if (lib_Category is null) + return "false"; + string[] Detail = lib_Category.Split('_'); switch (Detail[0]) { @@ -99,6 +118,11 @@ namespace WindowsFormsApp1.Mac return result; } + private void btn_Stop_Click(object sender, EventArgs e) + { + isStop = true; + } + #region 광주 string 광주(string detail, string Text) { @@ -140,11 +164,12 @@ namespace WindowsFormsApp1.Mac webBrowser1.Document.GetElementById("searchKeyword").SetAttribute("value", text); webBrowser1.Document.GetElementById("libCode").SetAttribute("value", Code); + Delay(500); HtmlElementCollection button = webBrowser1.Document.GetElementsByTagName("button"); foreach (HtmlElement SearchButton in button) { - if (SearchButton.InnerText == "검색") + if (SearchButton.GetAttribute("className").IndexOf("bookSearchBtn") > -1) SearchButton.InvokeMember("click"); } Delay(1500); @@ -165,6 +190,7 @@ namespace WindowsFormsApp1.Mac } } } + Delay(500); return result; } @@ -569,19 +595,12 @@ namespace WindowsFormsApp1.Mac int count = dataGridView1.Rows.Count; if (count <= 1) return; - - // 특수문자 제거 - if (chk_spChar.Checked) - { + + if (chk_spChar.Checked) // 특수문자 제거 RemoveSpecialChar(count); - } - // 괄호안의 문자 제거 - if (chk_RemoveBrit.Checked) - { + if (chk_RemoveBrit.Checked) // 괄호안의 문자 제거 RemoveInBrit(count); - } - } /// diff --git a/unimarc/unimarc/마크/Mac_Input.cs b/unimarc/unimarc/마크/Mac_Input.cs index 9e7e13b..654c561 100644 --- a/unimarc/unimarc/마크/Mac_Input.cs +++ b/unimarc/unimarc/마크/Mac_Input.cs @@ -151,7 +151,7 @@ namespace WindowsFormsApp1.Mac dataGridView1.Rows[a].Cells["author"].Value.ToString(), dataGridView1.Rows[a].Cells["book_comp"].Value.ToString(), dataGridView1.Rows[a].Cells["price"].Value.ToString(), - Marc, "1", compidx, "3", Time, user }; + Marc, "1", compidx, "2", Time, user }; // string Incmd = db.DB_INSERT_DUPLICATE(table, col, data); string Incmd = db.DB_INSERT(table, col, data); diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 7a6c553..53b4ede 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -84,7 +84,7 @@ namespace ExcelTest /// /// 가져온 목록을 책목록과 연동하여 Grid에 집어넣음. /// - /// 목록idx + /// 목록일자 /// 목록명 public void input_list(string date, string value) { @@ -103,6 +103,7 @@ namespace ExcelTest "", "", "", "", "", "", "", "", "", "", "", "", "V", "", "" }; + for (int a = 0; a < db_data.Length; a++) { if (a % 10 == 0) { grid[0] = db_data[a]; } // 0: idx @@ -120,6 +121,7 @@ namespace ExcelTest } chk_Marc(); } + /// /// 마크 유무 확인하는 함수 /// @@ -127,56 +129,45 @@ namespace ExcelTest { for (int a = 0; a < List_Book.Rows.Count; a++) { - string[] sear_tbl = { "ISBN" }; - string[] sear_col = { List_Book.Rows[a].Cells["ISBN13"].Value.ToString() }; + string Area = "`idx`, `marc`, `grade`, `008tag`, `user`, `date`, `compidx`"; + string Table = "Marc"; - string tmp_cmd = db.More_DB_Search("Marc", sear_tbl, sear_col, "`marc_chk`, `marc_chk1`, `marc_chk2`"); - string tmp_res = db.DB_Send_CMD_Search(tmp_cmd); - string[] tmp_ary = tmp_res.Split('|'); + string ChkMarcArea = "`marc_chk`, `marc_chk1`, `marc_chk2`"; - string cmd = ""; - if (tmp_ary.Length <= 1) - { - cmd = db.More_DB_Search("Marc", sear_tbl, sear_col, "`idx`, `marc`, `grade`"); + string[] sear_tbl = { "compidx", "ISBN" }; + string[] sear_col = { compidx, List_Book.Rows[a].Cells["ISBN13"].Value.ToString() }; + + string Chk_Cmd = db.More_DB_Search(Table, sear_tbl, sear_col, ChkMarcArea); + string Chk_Res = db.DB_Send_CMD_Search(Chk_Cmd); + string[] Chk_Arr = Chk_Res.Split('|'); + + bool isMyData; + string cmd; + if (Chk_Arr.Length <= 1) { + cmd = string.Format( + "SELECT {0} FROM {1} WHERE `{2}` = \"{3}\" " + + "AND (`marc_chk` = 1 OR `marc_chk1` = 1 OR `marc_chk2` = 1);", + Area, Table, sear_tbl[1], sear_col[1]); + isMyData = false; + } + else { + cmd = string.Format( + "SELECT {0} FROM {1} WHERE `{2}` = \"{3}\" AND `{4}` = \"{5}\" " + + "AND (`marc_chk` = 1 OR `marc_chk1` = 1 OR `marc_chk2` = 1);", + Area, Table, sear_tbl[0], sear_col[0], sear_tbl[1], sear_col[1]); + isMyData = true; + } + string db_res = db.DB_Send_CMD_Search(cmd); + string[] db_data = db_res.Split('|'); + + if (db_data.Length < 2) { + List_Book.Rows[a].Cells["grade"].Value = "3"; + List_Book.Rows[a].DefaultCellStyle.ForeColor = Color.Red; } else { - if (tmp_ary[0] == "1") - cmd = string.Format( - "SELECT `idx`, `marc`, `grade`, `008tag`, `user`, `date` FROM `Marc` WHERE `{0}` = \"{1}\" " + - "AND (`marc_chk` = 1 OR `marc_chk1` = 1 OR `marc_chk2` = 1);", sear_tbl[0], sear_col[0]); - else if (tmp_ary[1] == "1") - cmd = string.Format( - "SELECT `idx`, `marc1`, `grade`, `008tag`, `user`, `date` FROM `Marc` WHERE `{0}` = \"{1}\" " + - "AND (`marc_chk` = 1 OR `marc_chk1` = 1 OR `marc_chk2` = 1);", sear_tbl[0], sear_col[0]); - else if (tmp_ary[2] == "1") - cmd = string.Format( - "SELECT `idx`, `marc2`, `grade`, `008tag`, `user`, `date` FROM `Marc` WHERE `{0}` = \"{1}\" " + - "AND (`marc_chk` = 1 OR `marc_chk1` = 1 OR `marc_chk2` = 1);", sear_tbl[0], sear_col[0]); - } + List_Book.Rows[a].DefaultCellStyle.ForeColor = SetGradeColor(db_data[2], isMyData); - string db_res = db.DB_Send_CMD_Search(cmd); - string[] db_data = db_res.Split('|'); - if (db_data.Length < 2) { - List_Book.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; - List_Book.Rows[a].Cells["grade"].Value = "2"; - } - else { - switch (db_data[2]) - { - case "0": // A - List_Book.Rows[a].DefaultCellStyle.ForeColor = Color.Blue; - break; - case "1": // B - List_Book.Rows[a].DefaultCellStyle.ForeColor = Color.Red; - break; - case "2": // C - List_Book.Rows[a].DefaultCellStyle.ForeColor = Color.Black; - break; - case "3": // D - List_Book.Rows[a].DefaultCellStyle.ForeColor = Color.Gray; - break; - } List_Book.Rows[a].Cells["marc_idx"].Value = db_data[0]; List_Book.Rows[a].Cells["db_marc"].Value = db_data[1]; List_Book.Rows[a].Cells["grade"].Value = db_data[2]; @@ -184,11 +175,42 @@ namespace ExcelTest List_Book.Rows[a].Cells["user"].Value = db_data[4]; List_Book.Rows[a].Cells["SaveDate"].Value = db_data[5]; - SaveDateCheck(db_data[5], a); + if (isMyData) + SaveDateCheck(db_data[5], a); + + else { + string FindCompCmd = string.Format("SELECT `comp_name` FROM `Comp` WHERE `idx` = {0}", db_data[6]); + List_Book.Rows[a].Cells["user"].Value = db.DB_Send_CMD_Search(FindCompCmd).Replace("|", ""); + List_Book.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; + } } } } + private Color SetGradeColor(string Grade, bool isMyData = true) + { + if (!isMyData) + return Color.Orange; + + switch (Grade) + { + case "0": // A + return Color.Blue; + + case "1": // B + return Color.Black; + + case "2": // C + return Color.Gray; + + case "3": // D + return Color.Red; + + default: + return Color.Black; + } + } + /// /// 마지막 저장시각 14일이전일 경우 배경 색 변경 /// @@ -522,13 +544,17 @@ namespace ExcelTest private void Btn_Save_Click(object sender, EventArgs e) { int TabIndex = tabControl1.SelectedIndex; + int grade = cb_grade.SelectedIndex; if (TabIndex == 1) { MessageBox.Show("칸채우기가 아닌 편집창에서 저장해주세요!"); return; } + if (grade == 3) { + MessageBox.Show("등급을 설정해주세요. (C 이상)"); + return; + } string table_name = "Marc"; int row_idx = List_Book.CurrentCell.RowIndex; - int grade = cb_grade.SelectedIndex; string tag056 = Tag056(); string[] grid_data = { List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString(), @@ -606,22 +632,8 @@ namespace ExcelTest List_Book.Rows[row_idx].Cells["user"].Value = user_name; List_Book.Rows[row_idx].Cells["db_marc"].Value = orimarc; - List_Book.Rows[row_idx].DefaultCellStyle.BackColor = Color.White; - switch (grade) - { - case 0: // A - List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = Color.Blue; - break; - case 1: // B - List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = Color.Red; - break; - case 2: // C - List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = Color.Black; - break; - case 3: // D - List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = Color.Gray; - break; - } + List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = SetGradeColor(grade.ToString()); + MessageBox.Show("저장되었습니다!"); } #region Save_Click_Sub @@ -769,6 +781,7 @@ namespace ExcelTest string Date = List_Book.Rows[row].Cells["SaveDate"].Value.ToString(); lbl_SaveData.Text = string.Format("[{0}] [{1}]", User, Date); + lbl_ISBN.Text = "[" + List_Book.Rows[row].Cells["ISBN13"].Value.ToString() + "]"; } void ReadRemark(int row) { @@ -777,7 +790,6 @@ namespace ExcelTest string cmd = db.More_DB_Search("Marc", sear_tbl, sear_col, "`비고1`, `비고2`"); string res = db.DB_Send_CMD_Search(cmd); - lbl_ISBN.Text = "[" + List_Book.Rows[row].Cells["ISBN13"].Value.ToString() + "]"; string[] ary = res.Split('|'); etc1.Text = ary[0]; etc2.Text = ary[1]; @@ -1250,17 +1262,17 @@ namespace ExcelTest if (isSort) { if (combo == 0) { - List_Book.Sort(grade, System.ComponentModel.ListSortDirection.Ascending); + List_Book.Sort(List_Book.Columns["grade"], System.ComponentModel.ListSortDirection.Ascending); } else { - List_Book.Sort(ISBN13, System.ComponentModel.ListSortDirection.Ascending); + List_Book.Sort(List_Book.Columns["ISBN13"], System.ComponentModel.ListSortDirection.Ascending); } } else { - string text; + int comboIdx; if (combo == 0) { - text = comboBox9.SelectedIndex.ToString(); - Search_Filter("grade", text); + comboIdx = comboBox9.SelectedIndex; + Search_Filter("grade", comboIdx); } else { // 수정필요 @@ -1277,11 +1289,11 @@ namespace ExcelTest } } - private void Search_Filter(string target, string text) + private void Search_Filter(string target, int comboIdx) { int count = List_Book.Rows.Count; DataGridViewBand band; - if (text == "0") { + if (comboIdx == 0) { for (int a = 0; a < count; a++) { band = List_Book.Rows[a]; @@ -1289,9 +1301,11 @@ namespace ExcelTest } return; } + + comboIdx--; for (int a = 0; a < count; a++) { - if (List_Book.Rows[a].Cells[target].Value.ToString() != text) { + if (List_Book.Rows[a].Cells[target].Value.ToString() != comboIdx.ToString()) { band = List_Book.Rows[a]; band.Visible = false; } @@ -1328,24 +1342,6 @@ namespace ExcelTest private void btn_mk_marcList_Click(object sender, EventArgs e) { - // 회색배경과 V를 체크한 후 - // 반출을 도와주는 창이 표출됨 - /* - string msg = ""; - bool isSuccess = true; - - for (int a = 0; a < List_Book.Rows.Count; a++) - { - if (!Check_BackColor(a) && Check_List_V(a)) { - isSuccess = false; - msg += string.Format("『{0}』 ", List_Book.Rows[a].Cells["book_name"].Value.ToString()); - } - } - if (!isSuccess) { - MessageBox.Show(string.Format("표시된 도서명을 확인해주세요.\n{0}", msg)); - return; - } - */ Marc_mkList mkList = new Marc_mkList(this); mkList.Show(); } @@ -1399,6 +1395,32 @@ namespace ExcelTest } } + #region DataGridView 드래그 행이동 이벤트 함수 + + Skill_Grid sg = new Skill_Grid(); + + private void List_Book_MouseMove(object sender, MouseEventArgs e) + { + sg.MouseMove(sender, e); + } + + private void List_Book_MouseDown(object sender, MouseEventArgs e) + { + sg.MouseDown(sender, e); + } + + private void List_Book_DragOver(object sender, DragEventArgs e) + { + sg.DragOver(sender, e); + } + + private void List_Book_DragDrop(object sender, DragEventArgs e) + { + sg.DragDrop(sender, e); + } + + #endregion + private void btn_FillBlank_Click(object sender, EventArgs e) { tabControl1.SelectedIndex = 1; @@ -2119,8 +2141,7 @@ namespace ExcelTest richTextBox1.Text = ""; - // dataGridView1.Sort(dataGridView1.Columns["tag"], System.ComponentModel.ListSortDirection.Ascending); - Sort_text(); + dataGridView1.Sort(dataGridView1.Columns["tag"], System.ComponentModel.ListSortDirection.Ascending); for (int a = 0; a < dataGridView1.Rows.Count; a++) { @@ -2132,13 +2153,6 @@ namespace ExcelTest } } - private void Sort_text() - { - dataGridView1.Sort(new DGVComparer()); - dataGridView1.Columns[0].HeaderCell.SortGlyphDirection = SortOrder.Ascending; - dataGridView1.Columns[1].HeaderCell.SortGlyphDirection = SortOrder.Ascending; - } - private List MakeMarcLine() { List LineMarc = new List(); diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index 30f8b2b..aa2904b 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -28,17 +28,18 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = 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.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = 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(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.etc1 = new System.Windows.Forms.RichTextBox(); this.etc2 = new System.Windows.Forms.RichTextBox(); @@ -66,21 +67,6 @@ this.comboBox7 = new System.Windows.Forms.ComboBox(); this.Btn_Memo = new System.Windows.Forms.Button(); this.List_Book = new System.Windows.Forms.DataGridView(); - this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pay = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.url = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.marc_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.db_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colCheck = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.user = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.SaveDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.btn_Save = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text008 = new System.Windows.Forms.TextBox(); @@ -252,6 +238,21 @@ this.lbl_SaveData = new System.Windows.Forms.Label(); this.lbl_ISBN = new System.Windows.Forms.Label(); this.lbl_BookList = new System.Windows.Forms.Label(); + this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pay = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.url = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.marc_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.db_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCheck = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.user = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SaveDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.List_Book)).BeginInit(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -297,7 +298,7 @@ // this.etc1.BackColor = System.Drawing.SystemColors.ScrollBar; this.etc1.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.etc1.Location = new System.Drawing.Point(1466, 348); + this.etc1.Location = new System.Drawing.Point(1470, 348); this.etc1.Name = "etc1"; this.etc1.Size = new System.Drawing.Size(287, 187); this.etc1.TabIndex = 32; @@ -308,7 +309,7 @@ // this.etc2.BackColor = System.Drawing.SystemColors.ScrollBar; this.etc2.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.etc2.Location = new System.Drawing.Point(1466, 541); + this.etc2.Location = new System.Drawing.Point(1470, 541); this.etc2.Name = "etc2"; this.etc2.Size = new System.Drawing.Size(287, 184); this.etc2.TabIndex = 32; @@ -539,7 +540,7 @@ // // Btn_Memo // - this.Btn_Memo.Location = new System.Drawing.Point(1466, 158); + this.Btn_Memo.Location = new System.Drawing.Point(1470, 158); this.Btn_Memo.Name = "Btn_Memo"; this.Btn_Memo.Size = new System.Drawing.Size(77, 23); this.Btn_Memo.TabIndex = 215; @@ -549,17 +550,18 @@ // // List_Book // + this.List_Book.AllowDrop = true; this.List_Book.AllowUserToAddRows = false; this.List_Book.AllowUserToDeleteRows = false; this.List_Book.AllowUserToResizeColumns = false; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + 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; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, this.ISBN13, @@ -588,127 +590,15 @@ this.List_Book.Size = new System.Drawing.Size(502, 821); this.List_Book.TabIndex = 217; this.List_Book.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.List_Book_CellClick); + this.List_Book.DragDrop += new System.Windows.Forms.DragEventHandler(this.List_Book_DragDrop); + this.List_Book.DragOver += new System.Windows.Forms.DragEventHandler(this.List_Book_DragOver); this.List_Book.KeyDown += new System.Windows.Forms.KeyEventHandler(this.List_Book_KeyDown); - // - // list_idx - // - this.list_idx.HeaderText = "list_idx"; - this.list_idx.Name = "list_idx"; - this.list_idx.ReadOnly = true; - this.list_idx.Visible = false; - this.list_idx.Width = 30; - // - // ISBN13 - // - this.ISBN13.FillWeight = 136.2398F; - this.ISBN13.HeaderText = "ISBN13"; - this.ISBN13.Name = "ISBN13"; - this.ISBN13.ReadOnly = true; - this.ISBN13.Visible = false; - // - // num - // - this.num.HeaderText = "연번"; - this.num.Name = "num"; - this.num.ReadOnly = true; - this.num.Width = 50; - // - // book_name - // - this.book_name.FillWeight = 135.5107F; - this.book_name.HeaderText = "도서명"; - this.book_name.Name = "book_name"; - this.book_name.ReadOnly = true; - this.book_name.Width = 150; - // - // author - // - this.author.FillWeight = 67.49011F; - this.author.HeaderText = "저자"; - this.author.Name = "author"; - this.author.ReadOnly = true; - this.author.Width = 80; - // - // book_comp - // - this.book_comp.FillWeight = 76.49199F; - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - this.book_comp.ReadOnly = true; - this.book_comp.Width = 80; - // - // count - // - this.count.HeaderText = "C"; - this.count.Name = "count"; - this.count.ReadOnly = true; - this.count.Width = 30; - // - // pay - // - this.pay.FillWeight = 84.26746F; - this.pay.HeaderText = "정가"; - this.pay.Name = "pay"; - this.pay.ReadOnly = true; - this.pay.Width = 62; - // - // url - // - this.url.HeaderText = "url"; - this.url.Name = "url"; - this.url.ReadOnly = true; - this.url.Visible = false; - // - // marc_idx - // - this.marc_idx.HeaderText = "marc_idx"; - this.marc_idx.Name = "marc_idx"; - this.marc_idx.ReadOnly = true; - this.marc_idx.Visible = false; - this.marc_idx.Width = 30; - // - // db_marc - // - this.db_marc.HeaderText = "marc"; - this.db_marc.Name = "db_marc"; - this.db_marc.ReadOnly = true; - this.db_marc.Visible = false; - // - // grade - // - this.grade.HeaderText = "등급"; - this.grade.Name = "grade"; - this.grade.ReadOnly = true; - this.grade.Visible = false; - this.grade.Width = 50; - // - // colCheck - // - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.colCheck.DefaultCellStyle = dataGridViewCellStyle12; - this.colCheck.HeaderText = "V"; - this.colCheck.Name = "colCheck"; - this.colCheck.ReadOnly = true; - this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCheck.Width = 30; - // - // user - // - this.user.HeaderText = "작업자"; - this.user.Name = "user"; - this.user.ReadOnly = true; - this.user.Visible = false; - // - // SaveDate - // - this.SaveDate.HeaderText = "저장시각"; - this.SaveDate.Name = "SaveDate"; - this.SaveDate.ReadOnly = true; - this.SaveDate.Visible = false; + this.List_Book.MouseDown += new System.Windows.Forms.MouseEventHandler(this.List_Book_MouseDown); + this.List_Book.MouseMove += new System.Windows.Forms.MouseEventHandler(this.List_Book_MouseMove); // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(1466, 186); + this.btn_Save.Location = new System.Drawing.Point(1470, 186); this.btn_Save.Name = "btn_Save"; this.btn_Save.Size = new System.Drawing.Size(77, 23); this.btn_Save.TabIndex = 215; @@ -742,7 +632,7 @@ this.panel3.Controls.Add(this.btn_Reflesh008); this.panel3.Controls.Add(this.text008); this.panel3.Controls.Add(this.label4); - this.panel3.Location = new System.Drawing.Point(520, 12); + this.panel3.Location = new System.Drawing.Point(519, 12); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(364, 30); this.panel3.TabIndex = 219; @@ -762,7 +652,7 @@ // // btn_close // - this.btn_close.Location = new System.Drawing.Point(1466, 244); + this.btn_close.Location = new System.Drawing.Point(1470, 244); this.btn_close.Name = "btn_close"; this.btn_close.Size = new System.Drawing.Size(77, 23); this.btn_close.TabIndex = 215; @@ -788,9 +678,9 @@ // this.pictureBox1.BackColor = System.Drawing.SystemColors.ControlLight; this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.pictureBox1.Location = new System.Drawing.Point(1545, 57); + this.pictureBox1.Location = new System.Drawing.Point(1549, 53); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(208, 285); + this.pictureBox1.Size = new System.Drawing.Size(208, 289); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 221; this.pictureBox1.TabStop = false; @@ -798,7 +688,7 @@ // // btn_preview // - this.btn_preview.Location = new System.Drawing.Point(1466, 215); + this.btn_preview.Location = new System.Drawing.Point(1470, 215); this.btn_preview.Name = "btn_preview"; this.btn_preview.Size = new System.Drawing.Size(77, 23); this.btn_preview.TabIndex = 215; @@ -815,7 +705,7 @@ "B", "C", "D"}); - this.cb_grade.Location = new System.Drawing.Point(1467, 93); + this.cb_grade.Location = new System.Drawing.Point(1471, 93); this.cb_grade.Name = "cb_grade"; this.cb_grade.Size = new System.Drawing.Size(75, 20); this.cb_grade.TabIndex = 222; @@ -824,7 +714,7 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label6.Location = new System.Drawing.Point(1473, 79); + this.label6.Location = new System.Drawing.Point(1477, 79); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(62, 12); this.label6.TabIndex = 223; @@ -943,7 +833,7 @@ // // btn_FillBlank // - this.btn_FillBlank.Location = new System.Drawing.Point(1466, 119); + this.btn_FillBlank.Location = new System.Drawing.Point(1470, 119); this.btn_FillBlank.Name = "btn_FillBlank"; this.btn_FillBlank.Size = new System.Drawing.Size(77, 33); this.btn_FillBlank.TabIndex = 228; @@ -955,7 +845,7 @@ // this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(516, 57); + this.tabControl1.Location = new System.Drawing.Point(520, 57); this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; @@ -1075,8 +965,8 @@ this.GridView020.Name = "GridView020"; this.GridView020.RowHeadersVisible = false; this.GridView020.RowHeadersWidth = 30; - dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle4; this.GridView020.RowTemplate.Height = 23; this.GridView020.Size = new System.Drawing.Size(408, 80); this.GridView020.TabIndex = 244; @@ -1143,8 +1033,8 @@ this.GridView505.Name = "GridView505"; this.GridView505.RowHeadersVisible = false; this.GridView505.RowHeadersWidth = 30; - dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle5; this.GridView505.RowTemplate.Height = 23; this.GridView505.Size = new System.Drawing.Size(401, 71); this.GridView505.TabIndex = 246; @@ -1276,14 +1166,14 @@ this.GridView246.AllowDrop = true; this.GridView246.AllowUserToAddRows = false; this.GridView246.AllowUserToResizeRows = false; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle15.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; this.GridView246.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Text246Jisi, this.Text246i, @@ -1295,8 +1185,8 @@ this.GridView246.Name = "GridView246"; this.GridView246.RowHeadersVisible = false; this.GridView246.RowHeadersWidth = 30; - dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle7; this.GridView246.RowTemplate.Height = 23; this.GridView246.Size = new System.Drawing.Size(493, 138); this.GridView246.TabIndex = 250; @@ -1444,14 +1334,14 @@ this.GridView440.AllowDrop = true; this.GridView440.AllowUserToAddRows = false; this.GridView440.AllowUserToResizeRows = false; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle17.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, 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.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; this.GridView440.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView440.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text440a, @@ -1464,8 +1354,8 @@ this.GridView440.Name = "GridView440"; this.GridView440.RowHeadersVisible = false; this.GridView440.RowHeadersWidth = 30; - dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle9; this.GridView440.RowTemplate.Height = 23; this.GridView440.Size = new System.Drawing.Size(597, 71); this.GridView440.TabIndex = 245; @@ -1562,14 +1452,14 @@ this.GridView490.AllowDrop = true; this.GridView490.AllowUserToAddRows = false; this.GridView490.AllowUserToResizeRows = false; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle19.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle10.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; this.GridView490.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView490.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text490a, @@ -1578,8 +1468,8 @@ this.GridView490.Name = "GridView490"; this.GridView490.RowHeadersVisible = false; this.GridView490.RowHeadersWidth = 30; - dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle11; this.GridView490.RowTemplate.Height = 23; this.GridView490.Size = new System.Drawing.Size(321, 71); this.GridView490.TabIndex = 247; @@ -2445,7 +2335,7 @@ this.tag, this.jisi, this.MarcValue}); - this.dataGridView1.Location = new System.Drawing.Point(1466, 731); + this.dataGridView1.Location = new System.Drawing.Point(1470, 731); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; @@ -2481,7 +2371,7 @@ this.lbl_SaveData.AutoSize = true; this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.lbl_SaveData.ForeColor = System.Drawing.Color.PaleTurquoise; - this.lbl_SaveData.Location = new System.Drawing.Point(1132, 53); + this.lbl_SaveData.Location = new System.Drawing.Point(848, 53); this.lbl_SaveData.Name = "lbl_SaveData"; this.lbl_SaveData.Size = new System.Drawing.Size(64, 19); this.lbl_SaveData.TabIndex = 318; @@ -2491,7 +2381,7 @@ // this.lbl_ISBN.AutoSize = true; this.lbl_ISBN.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); - this.lbl_ISBN.Location = new System.Drawing.Point(964, 53); + this.lbl_ISBN.Location = new System.Drawing.Point(680, 53); this.lbl_ISBN.Name = "lbl_ISBN"; this.lbl_ISBN.Size = new System.Drawing.Size(31, 19); this.lbl_ISBN.TabIndex = 33; @@ -2500,12 +2390,132 @@ // lbl_BookList // this.lbl_BookList.AutoSize = true; + this.lbl_BookList.BackColor = System.Drawing.Color.LightGray; this.lbl_BookList.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); - this.lbl_BookList.Location = new System.Drawing.Point(8, 12); + this.lbl_BookList.Location = new System.Drawing.Point(13, 12); this.lbl_BookList.Name = "lbl_BookList"; - this.lbl_BookList.Size = new System.Drawing.Size(306, 19); + this.lbl_BookList.Size = new System.Drawing.Size(64, 19); this.lbl_BookList.TabIndex = 33; - this.lbl_BookList.Text = "[장성공공희45]열린서적(장성)"; + this.lbl_BookList.Text = " "; + // + // list_idx + // + this.list_idx.HeaderText = "list_idx"; + this.list_idx.Name = "list_idx"; + this.list_idx.ReadOnly = true; + this.list_idx.Visible = false; + this.list_idx.Width = 30; + // + // ISBN13 + // + this.ISBN13.FillWeight = 136.2398F; + this.ISBN13.HeaderText = "ISBN13"; + this.ISBN13.Name = "ISBN13"; + this.ISBN13.ReadOnly = true; + this.ISBN13.Visible = false; + // + // num + // + this.num.HeaderText = "연번"; + this.num.Name = "num"; + this.num.ReadOnly = true; + this.num.Width = 50; + // + // book_name + // + this.book_name.FillWeight = 135.5107F; + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + this.book_name.ReadOnly = true; + this.book_name.Width = 150; + // + // author + // + this.author.FillWeight = 67.49011F; + this.author.HeaderText = "저자"; + this.author.Name = "author"; + this.author.ReadOnly = true; + this.author.Width = 80; + // + // book_comp + // + this.book_comp.FillWeight = 76.49199F; + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.ReadOnly = true; + this.book_comp.Width = 80; + // + // count + // + this.count.HeaderText = "C"; + this.count.Name = "count"; + this.count.ReadOnly = true; + this.count.Width = 30; + // + // pay + // + this.pay.FillWeight = 84.26746F; + this.pay.HeaderText = "정가"; + this.pay.Name = "pay"; + this.pay.ReadOnly = true; + this.pay.Width = 62; + // + // url + // + this.url.HeaderText = "url"; + this.url.Name = "url"; + this.url.ReadOnly = true; + this.url.Visible = false; + // + // marc_idx + // + this.marc_idx.HeaderText = "marc_idx"; + this.marc_idx.Name = "marc_idx"; + this.marc_idx.ReadOnly = true; + this.marc_idx.Visible = false; + this.marc_idx.Width = 30; + // + // db_marc + // + this.db_marc.HeaderText = "marc"; + this.db_marc.Name = "db_marc"; + this.db_marc.ReadOnly = true; + this.db_marc.Visible = false; + // + // grade + // + dataGridViewCellStyle2.Format = "N0"; + dataGridViewCellStyle2.NullValue = null; + this.grade.DefaultCellStyle = dataGridViewCellStyle2; + this.grade.HeaderText = "등급"; + this.grade.Name = "grade"; + this.grade.ReadOnly = true; + this.grade.Visible = false; + this.grade.Width = 50; + // + // colCheck + // + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colCheck.DefaultCellStyle = dataGridViewCellStyle3; + this.colCheck.HeaderText = "V"; + this.colCheck.Name = "colCheck"; + this.colCheck.ReadOnly = true; + this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheck.Width = 30; + // + // user + // + this.user.HeaderText = "작업자"; + this.user.Name = "user"; + this.user.ReadOnly = true; + this.user.Visible = false; + // + // SaveDate + // + this.SaveDate.HeaderText = "저장시각"; + this.SaveDate.Name = "SaveDate"; + this.SaveDate.ReadOnly = true; + this.SaveDate.Visible = false; // // Marc // @@ -2799,6 +2809,11 @@ private System.Windows.Forms.Button Btn_interlock; private System.Windows.Forms.Label lbl_ISBN; private System.Windows.Forms.Label lbl_BookList; + private System.Windows.Forms.Button btn_FilterReturn; + private System.Windows.Forms.DataGridViewTextBoxColumn turnNum; + private System.Windows.Forms.DataGridViewTextBoxColumn tag; + private System.Windows.Forms.DataGridViewTextBoxColumn jisi; + private System.Windows.Forms.DataGridViewTextBoxColumn MarcValue; private System.Windows.Forms.DataGridViewTextBoxColumn list_idx; private System.Windows.Forms.DataGridViewTextBoxColumn ISBN13; private System.Windows.Forms.DataGridViewTextBoxColumn num; @@ -2814,10 +2829,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn user; private System.Windows.Forms.DataGridViewTextBoxColumn SaveDate; - private System.Windows.Forms.Button btn_FilterReturn; - private System.Windows.Forms.DataGridViewTextBoxColumn turnNum; - private System.Windows.Forms.DataGridViewTextBoxColumn tag; - private System.Windows.Forms.DataGridViewTextBoxColumn jisi; - private System.Windows.Forms.DataGridViewTextBoxColumn MarcValue; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs index b7254b0..35c9863 100644 --- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs @@ -36,6 +36,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); + this.btn_Output = new System.Windows.Forms.Button(); this.btn_Excel = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); this.cb_authorType = new System.Windows.Forms.ComboBox(); @@ -76,7 +77,6 @@ this.search_tag = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.btn_Output = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); @@ -95,11 +95,21 @@ this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.btn_Select_List); - this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Location = new System.Drawing.Point(11, 12); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1516, 36); + this.panel1.Size = new System.Drawing.Size(1501, 36); this.panel1.TabIndex = 0; // + // btn_Output + // + this.btn_Output.Location = new System.Drawing.Point(907, 6); + this.btn_Output.Name = "btn_Output"; + this.btn_Output.Size = new System.Drawing.Size(75, 23); + this.btn_Output.TabIndex = 9; + this.btn_Output.Text = "마크 반출"; + this.btn_Output.UseVisualStyleBackColor = true; + this.btn_Output.Click += new System.EventHandler(this.btn_Output_Click); + // // btn_Excel // this.btn_Excel.Location = new System.Drawing.Point(825, 6); @@ -289,10 +299,10 @@ this.marc, this.search_tag, this.colCheck}); - this.dataGridView1.Location = new System.Drawing.Point(13, 57); + this.dataGridView1.Location = new System.Drawing.Point(11, 57); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1515, 647); + this.dataGridView1.Size = new System.Drawing.Size(1501, 647); this.dataGridView1.TabIndex = 1; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); @@ -487,21 +497,11 @@ this.checkBox1.UseVisualStyleBackColor = true; this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); // - // btn_Output - // - this.btn_Output.Location = new System.Drawing.Point(907, 6); - this.btn_Output.Name = "btn_Output"; - this.btn_Output.Size = new System.Drawing.Size(75, 23); - this.btn_Output.TabIndex = 9; - this.btn_Output.Text = "마크 반출"; - this.btn_Output.UseVisualStyleBackColor = true; - this.btn_Output.Click += new System.EventHandler(this.btn_Output_Click); - // // Marc_Plan // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1540, 716); + this.ClientSize = new System.Drawing.Size(1525, 716); this.Controls.Add(this.checkBox1); this.Controls.Add(this.dataGridView1); this.Controls.Add(this.panel1); diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs index addb342..7045470 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs @@ -89,6 +89,8 @@ namespace UniMarc.마크 this.etcBox1 = new System.Windows.Forms.RichTextBox(); this.etcBox2 = new System.Windows.Forms.RichTextBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.label12 = new System.Windows.Forms.Label(); + this.cb_grade = new System.Windows.Forms.ComboBox(); this.panel1.SuspendLayout(); this.panel5.SuspendLayout(); this.panel6.SuspendLayout(); @@ -102,6 +104,8 @@ namespace UniMarc.마크 // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.label12); + this.panel1.Controls.Add(this.cb_grade); this.panel1.Controls.Add(this.lbl_SaveData); this.panel1.Controls.Add(this.lbl_ClassSymbol); this.panel1.Controls.Add(this.lbl_AuthorSymbol); @@ -683,7 +687,7 @@ namespace UniMarc.마크 // this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label11.Location = new System.Drawing.Point(867, 8); + this.label11.Location = new System.Drawing.Point(919, 8); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(162, 12); this.label11.TabIndex = 206; @@ -734,6 +738,30 @@ namespace UniMarc.마크 this.tableLayoutPanel1.Size = new System.Drawing.Size(236, 456); this.tableLayoutPanel1.TabIndex = 0; // + // label12 + // + this.label12.AutoSize = true; + this.label12.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label12.Location = new System.Drawing.Point(851, 116); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(62, 12); + this.label12.TabIndex = 321; + this.label12.Text = "마크 등급"; + // + // cb_grade + // + this.cb_grade.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_grade.FormattingEnabled = true; + this.cb_grade.Items.AddRange(new object[] { + "D", + "C", + "B", + "A"}); + this.cb_grade.Location = new System.Drawing.Point(845, 130); + this.cb_grade.Name = "cb_grade"; + this.cb_grade.Size = new System.Drawing.Size(75, 20); + this.cb_grade.TabIndex = 320; + // // Marc_Plan_Sub_MarcEdit // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -825,5 +853,7 @@ namespace UniMarc.마크 private System.Windows.Forms.RichTextBox etcBox2; private System.Windows.Forms.RichTextBox etcBox1; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.ComboBox cb_grade; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs index 6147417..0c5d1e1 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs @@ -409,6 +409,9 @@ namespace UniMarc.마크 }; string[] SearchBookTag = st.Take_Tag(oriMarc, Search_Tag); + string etc1 = etcBox1.Text; + string etc2 = etcBox2.Text; + // 도서명 (본서명 = 대등서명 : 부서명) string[] BookTag = { "245a", "245x", "245b" }; string[] BookNameTag = st.Take_Tag(oriMarc, BookTag); @@ -420,12 +423,12 @@ namespace UniMarc.마크 string[] Search_data = { idx }; string[] Update_Col = { - "marc", "book_name", + "marc", "book_name", "etc1", "etc2", "r_num", "class_symbol", "author_symbol", "prefix", "s_book_name1", "s_book_num1", "author", "book_comp", "price", "ISBN" }; string[] Update_data = { - oriMarc, BookName, + oriMarc, BookName, etc1, etc2, SearchBookTag[0], SearchBookTag[1], SearchBookTag[2], SearchBookTag[5], SearchBookTag[6], SearchBookTag[7], SearchBookTag[8], SearchBookTag[9], SearchBookTag[10], SearchBookTag[11] }; @@ -446,13 +449,24 @@ namespace UniMarc.마크 string today = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string user = UserName; string MarcIndex = tb_Mcode.Text; + + string etc1 = etcBox1.Text; + string etc2 = etcBox2.Text; + string grade = cb_grade.SelectedIndex.ToString(); + string Table = "Marc"; string[] Search_Col = { "idx" }; string[] Search_data = { MarcIndex }; - string[] Update_Col = { "marc", "marc_chk", "marc_chk2", "date", "user" }; - string[] Update_data = { oriMarc, "1", "0", today, user }; + string[] Update_Col = { + "marc", "marc_chk", "marc_chk2", "date", "user", + "비고1", "비고2", "grade" + }; + string[] Update_data = { + oriMarc, "1", "0", today, user, + etc1, etc2, grade + }; string res = Sub_marc_chk(MarcIndex); switch (res) diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs index f563cd1..eebe65d 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs @@ -29,7 +29,7 @@ namespace UniMarc.마크 /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.tb_Search = new System.Windows.Forms.TextBox(); this.cb_gu = new System.Windows.Forms.ComboBox(); @@ -42,14 +42,15 @@ namespace UniMarc.마크 this.btn_Delete = new System.Windows.Forms.Button(); this.btn_Close = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.panel2 = new System.Windows.Forms.Panel(); - this.panel3 = new System.Windows.Forms.Panel(); - this.btn_Morge = new System.Windows.Forms.Button(); this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.date = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.user = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btn_Morge = new System.Windows.Forms.Button(); + this.panel3 = new System.Windows.Forms.Panel(); + this.btn_OpenFile = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel2.SuspendLayout(); @@ -66,14 +67,14 @@ namespace UniMarc.마크 this.panel1.Controls.Add(this.label1); this.panel1.Location = new System.Drawing.Point(2, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(353, 27); + this.panel1.Size = new System.Drawing.Size(310, 27); this.panel1.TabIndex = 0; // // tb_Search // this.tb_Search.Location = new System.Drawing.Point(136, 2); this.tb_Search.Name = "tb_Search"; - this.tb_Search.Size = new System.Drawing.Size(212, 21); + this.tb_Search.Size = new System.Drawing.Size(169, 21); this.tb_Search.TabIndex = 2; this.tb_Search.Enter += new System.EventHandler(this.tb_Search_Enter); this.tb_Search.Leave += new System.EventHandler(this.tb_Search_Leave); @@ -108,9 +109,9 @@ namespace UniMarc.마크 // // btn_Search // - this.btn_Search.Location = new System.Drawing.Point(358, 2); + this.btn_Search.Location = new System.Drawing.Point(314, 1); this.btn_Search.Name = "btn_Search"; - this.btn_Search.Size = new System.Drawing.Size(61, 27); + this.btn_Search.Size = new System.Drawing.Size(61, 29); this.btn_Search.TabIndex = 1; this.btn_Search.Text = "검 색"; this.btn_Search.UseVisualStyleBackColor = true; @@ -118,9 +119,9 @@ namespace UniMarc.마크 // // btn_Complite // - this.btn_Complite.Location = new System.Drawing.Point(421, 2); + this.btn_Complite.Location = new System.Drawing.Point(375, 1); this.btn_Complite.Name = "btn_Complite"; - this.btn_Complite.Size = new System.Drawing.Size(61, 27); + this.btn_Complite.Size = new System.Drawing.Size(61, 29); this.btn_Complite.TabIndex = 1; this.btn_Complite.Text = "완료처리"; this.btn_Complite.UseVisualStyleBackColor = true; @@ -128,9 +129,9 @@ namespace UniMarc.마크 // // btn_Progress // - this.btn_Progress.Location = new System.Drawing.Point(482, 2); + this.btn_Progress.Location = new System.Drawing.Point(436, 1); this.btn_Progress.Name = "btn_Progress"; - this.btn_Progress.Size = new System.Drawing.Size(61, 27); + this.btn_Progress.Size = new System.Drawing.Size(61, 29); this.btn_Progress.TabIndex = 1; this.btn_Progress.Text = "진행처리"; this.btn_Progress.UseVisualStyleBackColor = true; @@ -138,9 +139,9 @@ namespace UniMarc.마크 // // btn_Edit // - this.btn_Edit.Location = new System.Drawing.Point(543, 2); + this.btn_Edit.Location = new System.Drawing.Point(497, 1); this.btn_Edit.Name = "btn_Edit"; - this.btn_Edit.Size = new System.Drawing.Size(61, 27); + this.btn_Edit.Size = new System.Drawing.Size(61, 29); this.btn_Edit.TabIndex = 1; this.btn_Edit.Text = "수 정"; this.btn_Edit.UseVisualStyleBackColor = true; @@ -148,9 +149,9 @@ namespace UniMarc.마크 // // btn_Delete // - this.btn_Delete.Location = new System.Drawing.Point(665, 2); + this.btn_Delete.Location = new System.Drawing.Point(619, 1); this.btn_Delete.Name = "btn_Delete"; - this.btn_Delete.Size = new System.Drawing.Size(61, 27); + this.btn_Delete.Size = new System.Drawing.Size(61, 29); this.btn_Delete.TabIndex = 1; this.btn_Delete.Text = "삭 제"; this.btn_Delete.UseVisualStyleBackColor = true; @@ -158,9 +159,9 @@ namespace UniMarc.마크 // // btn_Close // - this.btn_Close.Location = new System.Drawing.Point(726, 2); + this.btn_Close.Location = new System.Drawing.Point(741, 1); this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(61, 27); + this.btn_Close.Size = new System.Drawing.Size(61, 29); this.btn_Close.TabIndex = 1; this.btn_Close.Text = "닫 기"; this.btn_Close.UseVisualStyleBackColor = true; @@ -171,14 +172,14 @@ namespace UniMarc.마크 this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCellsExceptHeaders; - 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.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, @@ -197,42 +198,6 @@ namespace UniMarc.마크 this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // - // panel2 - // - this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel2.Controls.Add(this.panel1); - this.panel2.Controls.Add(this.btn_Search); - this.panel2.Controls.Add(this.btn_Morge); - this.panel2.Controls.Add(this.btn_Close); - this.panel2.Controls.Add(this.btn_Complite); - this.panel2.Controls.Add(this.btn_Delete); - this.panel2.Controls.Add(this.btn_Progress); - this.panel2.Controls.Add(this.btn_Edit); - this.panel2.Dock = System.Windows.Forms.DockStyle.Top; - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(806, 33); - this.panel2.TabIndex = 3; - // - // panel3 - // - this.panel3.Controls.Add(this.dataGridView1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 33); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(806, 324); - this.panel3.TabIndex = 4; - // - // btn_Morge - // - this.btn_Morge.Location = new System.Drawing.Point(604, 2); - this.btn_Morge.Name = "btn_Morge"; - this.btn_Morge.Size = new System.Drawing.Size(61, 27); - this.btn_Morge.TabIndex = 1; - this.btn_Morge.Text = "병 합"; - this.btn_Morge.UseVisualStyleBackColor = true; - this.btn_Morge.Click += new System.EventHandler(this.btn_Morge_Click); - // // idx // this.idx.HeaderText = "idx"; @@ -268,6 +233,53 @@ namespace UniMarc.마크 this.colCheck.TrueValue = "T"; this.colCheck.Width = 35; // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.panel1); + this.panel2.Controls.Add(this.btn_Search); + this.panel2.Controls.Add(this.btn_Morge); + this.panel2.Controls.Add(this.btn_OpenFile); + this.panel2.Controls.Add(this.btn_Close); + this.panel2.Controls.Add(this.btn_Complite); + this.panel2.Controls.Add(this.btn_Delete); + this.panel2.Controls.Add(this.btn_Progress); + this.panel2.Controls.Add(this.btn_Edit); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(806, 33); + this.panel2.TabIndex = 3; + // + // btn_Morge + // + this.btn_Morge.Location = new System.Drawing.Point(558, 1); + this.btn_Morge.Name = "btn_Morge"; + this.btn_Morge.Size = new System.Drawing.Size(61, 29); + this.btn_Morge.TabIndex = 1; + this.btn_Morge.Text = "병 합"; + this.btn_Morge.UseVisualStyleBackColor = true; + this.btn_Morge.Click += new System.EventHandler(this.btn_Morge_Click); + // + // panel3 + // + this.panel3.Controls.Add(this.dataGridView1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 33); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(806, 324); + this.panel3.TabIndex = 4; + // + // btn_OpenFile + // + this.btn_OpenFile.Location = new System.Drawing.Point(680, 1); + this.btn_OpenFile.Name = "btn_OpenFile"; + this.btn_OpenFile.Size = new System.Drawing.Size(61, 29); + this.btn_OpenFile.TabIndex = 1; + this.btn_OpenFile.Text = "파일열기"; + this.btn_OpenFile.UseVisualStyleBackColor = true; + this.btn_OpenFile.Click += new System.EventHandler(this.btn_OpenFile_Click); + // // Marc_Plan_Sub_SelectList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -309,5 +321,6 @@ namespace UniMarc.마크 private System.Windows.Forms.DataGridViewTextBoxColumn date; private System.Windows.Forms.DataGridViewTextBoxColumn user; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; + private System.Windows.Forms.Button btn_OpenFile; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs index 63e5658..5e17cfd 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs @@ -218,6 +218,37 @@ namespace UniMarc.마크 } #endregion + private void btn_OpenFile_Click(object sender, EventArgs e) + { + OpenFileDialog OpenFileDialog = new OpenFileDialog(); + string filePath = ""; + if (OpenFileDialog.ShowDialog() == DialogResult.OK) + { + filePath = OpenFileDialog.FileName; + try + { + System.IO.StreamReader r = new System.IO.StreamReader(filePath, Encoding.Default); + r.Close(); + } + catch (Exception ex) + { + MessageBox.Show(ex.ToString()); + } + } + } + #region OpenFileSub + + void InputGrid(string text) + { + string[] grid = text.Split(''); + for (int a = 0; a < grid.Length - 1; a++) + { + + } + } + + #endregion + private void btn_Close_Click(object sender, EventArgs e) { this.Close(); diff --git a/unimarc/unimarc/마크/Search_Infor.cs b/unimarc/unimarc/마크/Search_Infor.cs index 1baf692..aad80cd 100644 --- a/unimarc/unimarc/마크/Search_Infor.cs +++ b/unimarc/unimarc/마크/Search_Infor.cs @@ -166,29 +166,29 @@ namespace WindowsFormsApp1.Mac switch (idx) { case "0": - result = "D"; + result = "A"; break; case "1": - result = "C"; - break; - case "2": result = "B"; break; + case "2": + result = "C"; + break; case "3": - result = "A"; + result = "D"; break; case "D": - result = "0"; + result = "3"; break; case "C": - result = "1"; - break; - case "B": result = "2"; break; + case "B": + result = "1"; + break; case "A": - result = "3"; + result = "0"; break; } return result;