diff --git a/unimarc/.vs/unimarc/FileContentIndex/680bd614-a1dd-47e4-a104-4341f9b91d3d.vsidx b/unimarc/.vs/unimarc/FileContentIndex/680bd614-a1dd-47e4-a104-4341f9b91d3d.vsidx new file mode 100644 index 0000000..c302ca0 Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/680bd614-a1dd-47e4-a104-4341f9b91d3d.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/99e19393-caeb-4688-b6a8-cc14a4748c59.vsidx b/unimarc/.vs/unimarc/FileContentIndex/99e19393-caeb-4688-b6a8-cc14a4748c59.vsidx deleted file mode 100644 index ba01f1d..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/99e19393-caeb-4688-b6a8-cc14a4748c59.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/2ad6f2b9-9215-495e-ae43-fbcc64a90c00.vsidx b/unimarc/.vs/unimarc/FileContentIndex/a6b964b5-4509-43f9-882a-0704c4dc047b.vsidx similarity index 58% rename from unimarc/.vs/unimarc/FileContentIndex/2ad6f2b9-9215-495e-ae43-fbcc64a90c00.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/a6b964b5-4509-43f9-882a-0704c4dc047b.vsidx index b85e0a1..e0275c2 100644 Binary files a/unimarc/.vs/unimarc/FileContentIndex/2ad6f2b9-9215-495e-ae43-fbcc64a90c00.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/a6b964b5-4509-43f9-882a-0704c4dc047b.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/cdde9afe-fb6d-488c-ae49-2b1d39179805.vsidx b/unimarc/.vs/unimarc/FileContentIndex/cdde9afe-fb6d-488c-ae49-2b1d39179805.vsidx deleted file mode 100644 index ada49b7..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/cdde9afe-fb6d-488c-ae49-2b1d39179805.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/f2b880d4-4871-47cb-919d-2e929cf66176.vsidx b/unimarc/.vs/unimarc/FileContentIndex/f2b880d4-4871-47cb-919d-2e929cf66176.vsidx new file mode 100644 index 0000000..b85ef72 Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/f2b880d4-4871-47cb-919d-2e929cf66176.vsidx differ diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo index 54975bf..c3c305c 100644 Binary files a/unimarc/.vs/unimarc/v17/.suo and b/unimarc/.vs/unimarc/v17/.suo differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 86b037f..437fd45 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 daa2f02..512069a 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 f6b5e60..672c28b 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/Interop.SHDocVw.dll b/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll index c154e47..206e065 100644 Binary files a/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll and b/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index fc5ad78..56aa80e 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.csproj.ResolveComReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache index 8af6187..3bb77e5 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 86b037f..437fd45 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 daa2f02..512069a 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 f6b5e60..672c28b 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.cs b/unimarc/unimarc/마크/Check_copy.cs index 6dc45d8..da6e3f0 100644 --- a/unimarc/unimarc/마크/Check_copy.cs +++ b/unimarc/unimarc/마크/Check_copy.cs @@ -312,6 +312,12 @@ namespace WindowsFormsApp1.Mac 익산통합도서관입력(text); } + // 안산 중앙도서관 + else if (URL.IndexOf("lib.ansan.go.kr") > -1) + { + BookCount = 안산중앙도서관입력(text); + } + int tmp = RowCount - 1; if (tmp < 0) tmp = 0; @@ -1169,6 +1175,41 @@ namespace WindowsFormsApp1.Mac #endregion + #region 경기 소재 도서관 + + string 안산중앙도서관입력(string text) + { + // 콤보박스 적용 + webBrowser1.Document.GetElementById("srcKind").SetAttribute("value", Code); + + // 검색어 적용 + webBrowser1.Document.GetElementById("srcWord").SetAttribute("value", text); + + foreach (HtmlElement button in webBrowser1.Document.GetElementsByTagName("button")) + { + if (button.InnerText.IndexOf("검색하기") > -1) + { + button.InvokeMember("click"); + break; + } + } + + Delay(3000); + string result = ""; + foreach (HtmlElement span in webBrowser1.Document.GetElementsByTagName("span")) + { + string tmp = span.InnerText; + if (tmp.IndexOf("검색결과:") > -1) + { + result = Regex.Replace(tmp, @"[^0-9]", ""); + break; + } + } + + return result; + } + #endregion + public string CopyCount(string Text) { string result = ""; diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs index a1e87f3..abc7e52 100644 --- a/unimarc/unimarc/마크/Mac_List.cs +++ b/unimarc/unimarc/마크/Mac_List.cs @@ -299,9 +299,12 @@ namespace WindowsFormsApp1.Mac marc.MdiParent = main; marc.WindowState = FormWindowState.Maximized; marc.Show(); - //marc.input_list(dataGridView1.Rows[idx_row].Cells["start_date"].Value.ToString(), - // dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx); - marc.input_list(dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(), dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx); + /// marc.input_list( + /// dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(), + /// dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx); + marc.input_list( + dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(), + dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString()); } if (((DataGridView)sender).Columns[idx_col].Name == "check") { diff --git a/unimarc/unimarc/마크/Mac_List_Add.cs b/unimarc/unimarc/마크/Mac_List_Add.cs index 63fbeda..f8cad12 100644 --- a/unimarc/unimarc/마크/Mac_List_Add.cs +++ b/unimarc/unimarc/마크/Mac_List_Add.cs @@ -82,21 +82,22 @@ namespace UniMarc.마크 MessageBox.Show("목록이 중복되었습니다! 다시 확인해주세요.", "Error"); return; } + if (tb_ExpectList.Text == "") { + MessageBox.Show("목록명이 비어있습니다! 다시 확인해주세요.", "Error"); + return; + } string InBook_Area = "`compidx`, `list_name`, `date`, `header`, `num`, " + "`book_name`, `author`, `book_comp`, `pay`, `count`, " + "`total`, `isbn_marc`, `l_idx`"; List InBook_List = new List(); - int TotalCount = dataGridView1.Rows.Count; + int TotalCount = 0; + string InList_Idx = "㏓InList_Idx♠"; + string[] InList_Tbl = { "comp_num", "date", "list_name", "m_charge", "state", "vol", "chk_marc" }; string[] InList_Col = { compidx, Today, listName, charge, "진행", TotalCount.ToString(), "1" }; - string InList_Cmd = db.DB_INSERT("Obj_List", InList_Tbl, InList_Col); - db.DB_Send_CMD_reVoid(InList_Cmd); - - string InList_Idx = db.DB_Send_CMD_Search(db.More_DB_Search("Obj_List", InList_Tbl, InList_Col, "`idx`")).Replace("|", ""); - for (int a = 0; a < dataGridView1.Rows.Count; a++) { GridNotNull(a); @@ -122,9 +123,18 @@ namespace UniMarc.마크 bookname, author, bookcomp, price, count, total, isbn, InList_Idx); + TotalCount += Convert.ToInt32(count); + InBook_List.Add(tmp); } - string InBook_Col = string.Join(", ", InBook_List); + + InList_Col[5] = TotalCount.ToString(); + string InList_Cmd = db.DB_INSERT("Obj_List", InList_Tbl, InList_Col); + + db.DB_Send_CMD_reVoid(InList_Cmd); + + string listIdx = db.DB_Send_CMD_Search(db.More_DB_Search("Obj_List", InList_Tbl, InList_Col, "`idx`")).Replace("|", ""); + string InBook_Col = string.Join(", ", InBook_List).Replace(InList_Idx, listIdx); string InBook_Cmd = string.Format("INSERT INTO `Obj_List_Book` ({0}) VALUES {1};", InBook_Area, InBook_Col); db.DB_Send_CMD_reVoid(InBook_Cmd); @@ -166,10 +176,17 @@ namespace UniMarc.마크 { for (int a = 0; a < dataGridView1.Columns.Count; a++) { - if (dataGridView1.Columns[a].Name == "Count") - dataGridView1.Rows[row].Cells[a].Value = "1"; + if (a == 5 || a == 7) { + if (dataGridView1.Rows[row].Cells[a].Value == null) + dataGridView1.Rows[row].Cells[a].Value = "0"; + } - if (dataGridView1.Rows[row].Cells[a].Value == null) + else if (a == 6) { + if (dataGridView1.Rows[row].Cells[a].Value == null) + dataGridView1.Rows[row].Cells[a].Value = "1"; + } + + else if (dataGridView1.Rows[row].Cells[a].Value == null) dataGridView1.Rows[row].Cells[a].Value = ""; } } diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index cad8b9d..e85b220 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -19,7 +19,7 @@ namespace ExcelTest string[] data_book = { "", "", "", "", "" }; int SaveRowIdx = -1; public string user_name; - string compidx; + string compidx = UniMarc.Properties.Settings.Default.compidx; public string find; public string change; public string call = ""; @@ -80,8 +80,107 @@ namespace ExcelTest comboBox8.SelectedIndex = 0; #endregion + } - compidx = UniMarc.Properties.Settings.Default.compidx; + public void input_list(string l_idx, string value) + { + db.DBcon(); + + lbl_BookList.Text = value; + + string Area = + // 0 1 2 3 + "olb.idx, olb.isbn_marc, olb.header, olb.num, " + + // 4 5 6 7 8 9 + "olb.book_name, olb.author, olb.book_comp, olb.`count`, olb.price, olb.image_url, " + + // 10 11 12 13 14 15 16 + "mac.idx, mac.marc, mac.marc_chk, mac.marc1, mac.marc_chk1, mac.marc2, mac.marc_chk2, " + + // 17 18 19 20 + "mac.grade, mac.compidx, mac.`user`, mac.date"; + + string CMD = string.Format("" + + "SELECT {0} " + + "FROM Obj_List_Book AS olb " + + "LEFT JOIN Marc AS mac " + + // "ON if (olb.m_idx = 0, mac.ISBN = olb.isbn_marc, mac.idx = olb.m_idx) " + + "ON mac.ISBN = olb.isbn_marc " + + "WHERE olb.l_idx = {1} " + + "GROUP BY olb.book_name " + + "ORDER BY olb.idx ASC;", Area, l_idx); + string db_res = db.DB_Send_CMD_Search(CMD); + string[] db_data = db_res.Split('|'); + + string[] grid = { + "", "", "", "", "", + "", "", "", "", "", + "", "", "V", "", "" }; + + string[] MarcData = { "", "", "", "", "", "" }; + + for (int a = 0; a < db_data.Length; a++) + { + if (a % 21 == 00) grid[0] = db_data[a]; + if (a % 21 == 01) grid[1] = db_data[a]; + if (a % 21 == 02) grid[2] = db_data[a]; + if (a % 21 == 03) grid[2] += db_data[a]; + if (a % 21 == 04) grid[3] = db_data[a]; + if (a % 21 == 05) grid[4] = db_data[a]; + if (a % 21 == 06) grid[5] = db_data[a]; + if (a % 21 == 07) grid[6] = db_data[a]; + if (a % 21 == 08) grid[7] = db_data[a]; + if (a % 21 == 09) grid[8] = db_data[a]; + if (a % 21 == 10) grid[9] = db_data[a]; + if (a % 21 == 11) MarcData[0] = db_data[a]; + if (a % 21 == 12) MarcData[1] = db_data[a]; + if (a % 21 == 13) MarcData[2] = db_data[a]; + if (a % 21 == 14) MarcData[3] = db_data[a]; + if (a % 21 == 15) MarcData[4] = db_data[a]; + if (a % 21 == 16) MarcData[5] = db_data[a]; + if (a % 21 == 17) + { + grid[10] = RealMarc(MarcData); + if (grid[10] == "") grid[11] = "3"; + else grid[11] = db_data[a]; + } + if (a % 21 == 18) { + if (db_data[a] == "") grid[13] = ""; + else if (compidx != db_data[a]) { + string FindCompCmd = string.Format("SELECT `comp_name` FROM `Comp` WHERE `idx` = {0}", db_data[a]); + grid[13] = db.DB_Send_CMD_Search(FindCompCmd).Replace("|", ""); + } + } + if (a % 21 == 19) { + if (grid[13] == "") + grid[13] = db_data[a]; + } + if (a % 21 == 20) + { + grid[14] = db_data[a]; + List_Book.Rows.Add(grid); + } + } + + for (int a = 0; a < List_Book.Rows.Count; a++) + { + string Grade = List_Book.Rows[a].Cells["grade"].Value.ToString(); + List_Book.Rows[a].DefaultCellStyle.ForeColor = SetGradeColor(Grade); + } + + } + + private string RealMarc(string[] MarcData) + { + string result = ""; + if (MarcData[1] == "1") + result = MarcData[0]; + + if (MarcData[3] == "1") + result = MarcData[2]; + + if (MarcData[5] == "1") + result = MarcData[4]; + + return result; } /// @@ -160,7 +259,7 @@ namespace ExcelTest string Chk_Res = db.DB_Send_CMD_Search(Chk_Cmd); string[] Chk_Arr = Chk_Res.Split('|'); - bool isMyData; + bool isMyData = true; if (Chk_Arr.Length < 2) { List_Book.Rows[a].Cells["grade"].Value = "3"; List_Book.Rows[a].DefaultCellStyle.ForeColor = Color.Red; @@ -169,8 +268,6 @@ namespace ExcelTest if (Chk_Arr[1] != compidx) isMyData = false; - else - isMyData = true; string[] MarcData = { Chk_Arr[2], Chk_Arr[4], Chk_Arr[6] }; string[] CheckData = { Chk_Arr[3], Chk_Arr[5], Chk_Arr[7] }; diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index c8a6586..71c7ede 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -731,7 +731,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(6, 7); + this.label4.Location = new System.Drawing.Point(6, 8); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(49, 12); this.label4.TabIndex = 206; diff --git a/unimarc/unimarc/마크/Marc_FillBlank.cs b/unimarc/unimarc/마크/Marc_FillBlank.cs index 4e07563..1ee68fe 100644 --- a/unimarc/unimarc/마크/Marc_FillBlank.cs +++ b/unimarc/unimarc/마크/Marc_FillBlank.cs @@ -62,12 +62,13 @@ namespace UniMarc private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e) { tb_URL.Text = webBrowser1.Url.AbsoluteUri; - //if (this.webBrowser1.ReadyState == WebBrowserReadyState.Complete) + + if (isAll) { if (tb_URL.Text.Contains("searchResultAllList")) InitCrowling(); - if (tb_URL.Text.Contains("searchResultEditonList") && isAll) // 전체 옮기기 클릭때만 실행. + if (tb_URL.Text.Contains("searchResultEditonList")) SearchResultEditonList(); if (tb_URL.Text.Contains("searchResultDetail")) diff --git a/unimarc/unimarc/마크/Marc_Macro_Sub.cs b/unimarc/unimarc/마크/Marc_Macro_Sub.cs index 3740937..a556792 100644 --- a/unimarc/unimarc/마크/Marc_Macro_Sub.cs +++ b/unimarc/unimarc/마크/Marc_Macro_Sub.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Web.UI.WebControls; +using System.Diagnostics; using System.Windows.Forms; using WindowsFormsApp1; @@ -20,6 +21,7 @@ namespace UniMarc.마크 } bool isAuthorTag = false; + string Author_Idx_6768 = ""; public string FileType = "ANSI"; @@ -39,7 +41,6 @@ namespace UniMarc.마크 for (int a = 0; a < SplitMarc.Count; a++) { - isAuthorTag = false; if (SplitMarc[a].Length < 2) continue; string ContentTag = SplitMarc[a].Substring(0, 3); @@ -56,7 +57,6 @@ namespace UniMarc.마크 } ViewMarc = String.Join("\n", result); - for (int a = 0; a < idx.Length; a++) { ViewMarc = ChangeTagByIndex(idx[a], TagArray[a], RunCode[a], ViewMarc); @@ -77,7 +77,7 @@ namespace UniMarc.마크 string TargetTagNum = CodeSplit[0].Substring(0, 3); string TargetTag = CodeSplit[0].Substring(3, 1); string MoveTagNum = CodeSplit[1].Substring(0, 3); - string MoveTag = CodeSplit[0].Substring(3, 1); + string MoveTag = CodeSplit[1].Substring(3, 1); #region 방식이 달라 특별관리 @@ -168,19 +168,19 @@ namespace UniMarc.마크 } #endregion - private string Macro_Index(string[] idx, string[] TagArray, string[] RunCode, string ContentTag, string Content) + private string Macro_Index(string[] index, string[] TagArray, string[] RunCode, string ContentTag, string Content) { string[] SplitContent = Content.Split('\t'); string Jisi = SplitContent[1]; string Target = SplitContent[2]; - for (int a = 0; a < idx.Length; a++) - { - Jisi = ChangeJisi(idx[a], RunCode[a], TagArray[a], ContentTag, Jisi, Target); - if (RunCode[a] == "del") - { - if (TagArray[a] == ContentTag) - { + int cout = 0; + foreach (string idx in index) + { + Jisi = ChangeJisi(idx, RunCode[cout], TagArray[cout], ContentTag, Jisi, Target); + + if (RunCode[cout] == "del") { + if (TagArray[cout] == ContentTag) { Target = ""; break; } @@ -188,18 +188,21 @@ namespace UniMarc.마크 switch (ContentTag) { - case "020": Target = Index_020(idx[a], Target.Split('▼')); break; - case "100": Target = Index_100(idx[a], Target.Split('▼')); isAuthorTag = true; break; - case "110": Target = Index_110(idx[a], Target.Split('▼')); isAuthorTag = true; break; - case "111": Target = Index_111(idx[a], Target.Split('▼')); break; - case "245": Target = Index_245(idx[a], Target.Split('▼')); break; - case "246": Target = Index_246(idx[a], Target.Split('▼')); break; - case "260": Target = Index_260(idx[a], Target.Split('▼')); break; - case "300": Target = Index_300(idx[a], Target.Split('▼')); break; - case "440": Target = Index_440(idx[a], Target.Split('▼')); break; - case "830": Target = Index_830(idx[a], Target.Split('▼')); break; - case "950": Target = Index_950(idx[a], Target.Split('▼')); break; + case "020": Target = Index_020(idx, Target.Split('▼')); break; + case "100": Target = Index_100(idx, Target.Split('▼')); isAuthorTag = true; break; + case "110": Target = Index_110(idx, Target.Split('▼')); isAuthorTag = true; break; + case "111": Target = Index_111(idx, Target.Split('▼')); break; + case "245": Target = Index_245(idx, Target.Split('▼')); break; + case "246": Target = Index_246(idx, Target.Split('▼')); break; + case "260": Target = Index_260(idx, Target.Split('▼')); break; + case "300": Target = Index_300(idx, Target.Split('▼')); break; + case "440": Target = Index_440(idx, Target.Split('▼')); break; + case "700": Target = Index_700(idx, Target.Split('▼')); break; + case "710": Target = Index_710(idx, Target.Split('▼')); break; + case "830": Target = Index_830(idx, Target.Split('▼')); break; + case "950": Target = Index_950(idx, Target.Split('▼')); break; } + cout++; } if (Target == "" || !Target.Contains("▲")) return ""; @@ -262,7 +265,6 @@ namespace UniMarc.마크 #region IDX TAG NUM - /// /// 020 매크로 /// @@ -273,17 +275,17 @@ namespace UniMarc.마크 for (int a = 0; a < SplitContent.Length; a++) { - if (a <= -1) continue; + // $c 원표시 제거 + if (SplitContent[a].StartsWith("c") && idx == "63") + SplitContent[a] = SplitContent[a].Replace("\\", ""); + + if (a <= 1) continue; // $c 앞에 $g가 있을 경우 $c 앞에 ":" if (SplitContent[a].StartsWith("c") && idx == "0") if (SplitContent[a - 1].StartsWith("g")) if (!SplitContent[a - 1].EndsWith(":")) SplitContent[a - 1] += ":"; - - // $c 원표시 제거 - if (SplitContent[a].StartsWith("c") && idx == "63") - SplitContent[a] = SplitContent[a].Replace("\\", ""); } return string.Join("▼", SplitContent); @@ -298,7 +300,11 @@ namespace UniMarc.마크 { for (int a = 0; a < SplitContent.Length; a++) { + if (SplitContent[a].StartsWith("a") && idx == "67") + Author_Idx_6768 = SplitContent[a].Substring(1).Replace("▲", ""); + if (a <= 1) continue; + } return string.Join("▼", SplitContent); } @@ -310,10 +316,11 @@ namespace UniMarc.마크 /// 110태그 매크로 적용된 내용 private string Index_110(string idx, string[] SplitContent) { - if (idx == "55") - return ""; for (int a = 0; a < SplitContent.Length; a++) { + if (SplitContent[a].StartsWith("a") && idx == "68") + Author_Idx_6768 = SplitContent[a].Substring(1).Replace("▲", ""); + if (a <= 1) continue; if (idx == "1") @@ -528,13 +535,11 @@ namespace UniMarc.마크 // $p 앞에 $n이 나온 경우 "," 적용, $p앞에 $n이 없는 경우 "."적용 if (SplitContent[a].StartsWith("p") && idx == "22") { - if (SplitContent[a - 1].StartsWith("n")) - { + if (SplitContent[a - 1].StartsWith("n")) { if (SplitContent[a - 1].EndsWith(",")) SplitContent[a - 1] += ","; } - else - { + else { if (SplitContent[a - 1].EndsWith(".")) SplitContent[a - 1] += "."; } @@ -554,6 +559,32 @@ namespace UniMarc.마크 return string.Join("▼", SplitContent); } + private string Index_700(string idx, string[] SplitContent) + { + for (int a = 0; a < SplitContent.Length; a++) + { + if (idx == "67" && Author_Idx_6768 != "" && SplitContent[a].IndexOf(Author_Idx_6768) > -1) + return ""; + + if (a <= 1) continue; + } + + return string.Join("▼", SplitContent); + } + + private string Index_710(string idx, string[] SplitContent) + { + for (int a = 0; a < SplitContent.Length; a++) + { + if (idx == "68" && Author_Idx_6768 != "" && SplitContent[a].IndexOf(Author_Idx_6768) > -1) + return ""; + + if (a <= 1) continue; + } + + return string.Join("▼", SplitContent); + } + private string Index_830(string idx, string[] SplitContent) { for (int a = 0; a < SplitContent.Length; a++) @@ -594,12 +625,11 @@ namespace UniMarc.마크 for (int a = 0; a < SplitContent.Length; a++) { - if (a <= -1) continue; - // $b 원표시 제거 if (SplitContent[a].StartsWith("b") && idx == "63") SplitContent[a] = SplitContent[a].Replace("\\", ""); + if (a <= 1) continue; } return string.Join("▼", SplitContent); } diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs index a017730..19d2670 100644 --- a/unimarc/unimarc/마크/Marc_mkList.cs +++ b/unimarc/unimarc/마크/Marc_mkList.cs @@ -137,9 +137,11 @@ namespace UniMarc.마크 int[] row = checkGridRow(); int num = 0; progressBar1.Maximum = row.Length + 1; - string cmdByMarc = string.Format("INSERT INTO {0} {1}", "Specs_Marc", db.DB_INSERT_SUB("", insert_marc_col)); + string cmdByMarc = string.Format("INSERT INTO {0} {1} value", "Specs_Marc", db.DB_INSERT_SUB("", insert_marc_col)); bool CountSplit = chk_countSplit.Checked; + int listCount = 1; + int addCount = 1; // 필터링하여 DB에 집어넣는 작업 for (int a = 0; a < row.Length; a++) @@ -148,13 +150,14 @@ namespace UniMarc.마크 continue; num += 1; + listCount = Convert.ToInt32(marc.List_Book.Rows[row[a]].Cells["count"].Value.ToString()); // ISBN, book_name, s_book_name1, s_book_num1, author, book_comp, pubdate, price, tag008, class_symbol string[] Search = { "020a", "245a", "440a", "440v", "245d", "260b", "260c", "950b", "008", "056a" }; - + insert_marc_data[14] = marc.List_Book.Rows[row[a]].Cells["db_marc"].Value.ToString(); insert_marc_data[15] = marc.List_Book.Rows[row[a]].Cells["url"].Value.ToString(); - insert_marc_data[16] = marc.List_Book.Rows[row[a]].Cells["count"].Value.ToString(); + insert_marc_data[16] = addCount.ToString(); insert_marc_data[17] = num.ToString(); insert_marc_data[18] = outnum; insert_marc_data[19] = marc.List_Book.Rows[row[a]].Cells["marc_idx"].Value.ToString(); @@ -212,31 +215,24 @@ namespace UniMarc.마크 string res_Author = sb.SymbolAuthor(Author[0], Author[1], authorType, isType); insert_marc_data[13] = res_Author; - int count = Convert.ToInt32(marc.List_Book.Rows[row[a]].Cells["count"].Value.ToString()); - if (CountSplit) - { - for (int b = 1; b <= count; b++) - { - if (a == 0) - cmdByMarc += "value" + db.DB_INSERT_SUB("value", insert_marc_data) + ","; - else - cmdByMarc += db.DB_INSERT_SUB("value", insert_marc_data) + ","; - } + cmdByMarc += db.DB_INSERT_SUB("value", insert_marc_data) + ","; + + if (CountSplit && listCount > addCount) { + a--; + addCount++; + continue; } - else - { - if (a == 0) - cmdByMarc += "value" + db.DB_INSERT_SUB("value", insert_marc_data) + ","; - else - cmdByMarc += db.DB_INSERT_SUB("value", insert_marc_data) + ","; + else { + addCount = 1; + progressBar1.PerformStep(); } - progressBar1.PerformStep(); } cmdByMarc = cmdByMarc.TrimEnd(','); cmdByMarc += ";"; + db.DB_Send_CMD_reVoid(cmdByList); db.DB_Send_CMD_reVoid(cmdByMarc); progressBar1.PerformStep(); diff --git a/unimarc/unimarc/홈/Transaction_manage.Designer.cs b/unimarc/unimarc/홈/Transaction_manage.Designer.cs index 3057996..942c198 100644 --- a/unimarc/unimarc/홈/Transaction_manage.Designer.cs +++ b/unimarc/unimarc/홈/Transaction_manage.Designer.cs @@ -28,14 +28,14 @@ /// private void InitializeComponent() { - 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 dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - 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 dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); this.NameLabel = new System.Windows.Forms.Label(); this.tb_sangho = new System.Windows.Forms.TextBox(); this.tb_addr = new System.Windows.Forms.TextBox(); @@ -124,10 +124,10 @@ this.tb_gearEmpty = new System.Windows.Forms.Button(); this.tb_marcSave = new System.Windows.Forms.Button(); this.panel4 = new System.Windows.Forms.Panel(); - this.panel5 = new System.Windows.Forms.Panel(); - this.panel6 = new System.Windows.Forms.Panel(); - this.panel7 = new System.Windows.Forms.Panel(); this.panel8 = new System.Windows.Forms.Panel(); + this.panel7 = new System.Windows.Forms.Panel(); + this.panel6 = new System.Windows.Forms.Panel(); + this.panel5 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); @@ -135,21 +135,21 @@ ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gearGrid)).BeginInit(); this.panel4.SuspendLayout(); - this.panel5.SuspendLayout(); - this.panel6.SuspendLayout(); - this.panel7.SuspendLayout(); this.panel8.SuspendLayout(); + this.panel7.SuspendLayout(); + this.panel6.SuspendLayout(); + this.panel5.SuspendLayout(); this.SuspendLayout(); // // NameLabel // this.NameLabel.AutoSize = true; this.NameLabel.ForeColor = System.Drawing.SystemColors.ControlText; - this.NameLabel.Location = new System.Drawing.Point(31, 10); + this.NameLabel.Location = new System.Drawing.Point(21, 10); this.NameLabel.Name = "NameLabel"; - this.NameLabel.Size = new System.Drawing.Size(41, 12); + this.NameLabel.Size = new System.Drawing.Size(49, 12); this.NameLabel.TabIndex = 0; - this.NameLabel.Text = "업체명"; + this.NameLabel.Text = "업 체 명"; // // tb_sangho // @@ -170,11 +170,11 @@ // this.label3.AutoSize = true; this.label3.ForeColor = System.Drawing.SystemColors.ControlText; - this.label3.Location = new System.Drawing.Point(23, 106); + this.label3.Location = new System.Drawing.Point(19, 106); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(49, 12); + this.label3.Size = new System.Drawing.Size(53, 12); this.label3.TabIndex = 24; - this.label3.Text = "주 소"; + this.label3.Text = "주 소"; // // tb_man // @@ -204,17 +204,17 @@ // this.label6.AutoSize = true; this.label6.ForeColor = System.Drawing.SystemColors.ControlText; - this.label6.Location = new System.Drawing.Point(307, 58); + this.label6.Location = new System.Drawing.Point(303, 58); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(49, 12); + this.label6.Size = new System.Drawing.Size(53, 12); this.label6.TabIndex = 15; - this.label6.Text = "팩 스"; + this.label6.Text = "팩 스"; // // label7 // this.label7.AutoSize = true; this.label7.ForeColor = System.Drawing.SystemColors.ControlText; - this.label7.Location = new System.Drawing.Point(23, 130); + this.label7.Location = new System.Drawing.Point(21, 130); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(49, 12); this.label7.TabIndex = 27; @@ -260,11 +260,11 @@ // this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.SystemColors.ControlText; - this.label1.Location = new System.Drawing.Point(307, 10); + this.label1.Location = new System.Drawing.Point(303, 10); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(49, 12); + this.label1.Size = new System.Drawing.Size(53, 12); this.label1.TabIndex = 3; - this.label1.Text = "구 분"; + this.label1.Text = "구 분"; // // label2 // @@ -305,14 +305,14 @@ // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle25.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, @@ -343,14 +343,14 @@ this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.ControlDark; - dataGridViewCellStyle10.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, 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.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.ControlDark; + dataGridViewCellStyle26.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle26; this.dataGridView1.RowHeadersWidth = 21; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -525,11 +525,11 @@ // this.label5.AutoSize = true; this.label5.ForeColor = System.Drawing.SystemColors.ControlText; - this.label5.Location = new System.Drawing.Point(23, 177); + this.label5.Location = new System.Drawing.Point(19, 177); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(49, 12); + this.label5.Size = new System.Drawing.Size(53, 12); this.label5.TabIndex = 37; - this.label5.Text = "비 고"; + this.label5.Text = "비 고"; // // label8 // @@ -590,11 +590,11 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(307, 34); + this.label11.Location = new System.Drawing.Point(303, 34); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(49, 12); + this.label11.Size = new System.Drawing.Size(53, 12); this.label11.TabIndex = 9; - this.label11.Text = "업 태"; + this.label11.Text = "업 태"; // // tb_uptae // @@ -606,11 +606,11 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(591, 34); + this.label12.Location = new System.Drawing.Point(587, 34); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(49, 12); + this.label12.Size = new System.Drawing.Size(53, 12); this.label12.TabIndex = 11; - this.label12.Text = "종 목"; + this.label12.Text = "종 목"; // // tb_jongmok // @@ -629,11 +629,11 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(591, 58); + this.label13.Location = new System.Drawing.Point(587, 58); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(49, 12); + this.label13.Size = new System.Drawing.Size(53, 12); this.label13.TabIndex = 17; - this.label13.Text = "메 일"; + this.label13.Text = "메 일"; // // label14 // @@ -664,11 +664,11 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(315, 154); + this.label16.Location = new System.Drawing.Point(305, 154); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(41, 12); + this.label16.Size = new System.Drawing.Size(49, 12); this.label16.TabIndex = 33; - this.label16.Text = "띠라벨"; + this.label16.Text = "띠 라 벨"; // // tb_division // @@ -837,14 +837,14 @@ // this.marcGrid.AllowUserToAddRows = false; this.marcGrid.AllowUserToDeleteRows = 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.marcGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle27.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.marcGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; this.marcGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.marcGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column1, @@ -862,8 +862,8 @@ // // Column1 // - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.Column1.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Column1.DefaultCellStyle = dataGridViewCellStyle28; this.Column1.HeaderText = "내용"; this.Column1.Name = "Column1"; this.Column1.Width = 150; @@ -876,8 +876,8 @@ // // Column3 // - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.Column3.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Column3.DefaultCellStyle = dataGridViewCellStyle29; this.Column3.HeaderText = "내용"; this.Column3.Name = "Column3"; this.Column3.Width = 150; @@ -908,14 +908,14 @@ // this.gearGrid.AllowUserToAddRows = false; this.gearGrid.AllowUserToDeleteRows = false; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle14.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gearGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle30.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gearGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle30; this.gearGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gearGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, @@ -933,8 +933,8 @@ // // dataGridViewTextBoxColumn1 // - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle31; this.dataGridViewTextBoxColumn1.HeaderText = "내용"; this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; this.dataGridViewTextBoxColumn1.Width = 150; @@ -947,8 +947,8 @@ // // dataGridViewTextBoxColumn3 // - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle32; this.dataGridViewTextBoxColumn3.HeaderText = "내용"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; this.dataGridViewTextBoxColumn3.Width = 150; @@ -995,26 +995,14 @@ this.panel4.Size = new System.Drawing.Size(830, 844); this.panel4.TabIndex = 51; // - // panel5 + // panel8 // - this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel5.Controls.Add(this.marcLabel); - this.panel5.Controls.Add(this.tb_marcEmpty); - this.panel5.Controls.Add(this.tb_marcSave); - this.panel5.Dock = System.Windows.Forms.DockStyle.Top; - this.panel5.Location = new System.Drawing.Point(0, 0); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(830, 35); - this.panel5.TabIndex = 51; - // - // panel6 - // - this.panel6.Controls.Add(this.marcGrid); - this.panel6.Dock = System.Windows.Forms.DockStyle.Top; - this.panel6.Location = new System.Drawing.Point(0, 35); - this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(830, 502); - this.panel6.TabIndex = 52; + this.panel8.Controls.Add(this.gearGrid); + this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel8.Location = new System.Drawing.Point(0, 572); + this.panel8.Name = "panel8"; + this.panel8.Size = new System.Drawing.Size(830, 272); + this.panel8.TabIndex = 54; // // panel7 // @@ -1027,14 +1015,26 @@ this.panel7.Size = new System.Drawing.Size(830, 35); this.panel7.TabIndex = 53; // - // panel8 + // panel6 // - this.panel8.Controls.Add(this.gearGrid); - this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel8.Location = new System.Drawing.Point(0, 572); - this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(830, 272); - this.panel8.TabIndex = 54; + this.panel6.Controls.Add(this.marcGrid); + this.panel6.Dock = System.Windows.Forms.DockStyle.Top; + this.panel6.Location = new System.Drawing.Point(0, 35); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(830, 502); + this.panel6.TabIndex = 52; + // + // panel5 + // + this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel5.Controls.Add(this.marcLabel); + this.panel5.Controls.Add(this.tb_marcEmpty); + this.panel5.Controls.Add(this.tb_marcSave); + this.panel5.Dock = System.Windows.Forms.DockStyle.Top; + this.panel5.Location = new System.Drawing.Point(0, 0); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(830, 35); + this.panel5.TabIndex = 51; // // Transaction_manage // @@ -1054,12 +1054,12 @@ ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gearGrid)).EndInit(); this.panel4.ResumeLayout(false); - this.panel5.ResumeLayout(false); - this.panel5.PerformLayout(); - this.panel6.ResumeLayout(false); + this.panel8.ResumeLayout(false); this.panel7.ResumeLayout(false); this.panel7.PerformLayout(); - this.panel8.ResumeLayout(false); + this.panel6.ResumeLayout(false); + this.panel5.ResumeLayout(false); + this.panel5.PerformLayout(); this.ResumeLayout(false); }