diff --git a/Test_Project/.vs/Test_Project/v16/.suo b/Test_Project/.vs/Test_Project/v16/.suo index 53f253d..a203520 100644 Binary files a/Test_Project/.vs/Test_Project/v16/.suo and b/Test_Project/.vs/Test_Project/v16/.suo differ diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 2b0021a..7c2642c 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs index 827333d..d1984da 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -74,11 +74,11 @@ namespace WindowsFormsApp1 cmd = _DB.DB_Select_Search("`idx`", "Comp", "comp_name", result[4]); com_idx = _DB.DB_Send_CMD_Search(cmd).Replace("|", ""); - if (com_idx != "1") - { + // if (com_idx != "1") + // { + // } 납품관리ToolStripMenuItem.Visible = false; 회계ToolStripMenuItem.Visible = false; - } if (result[7] != "관리자") { 마스터ToolStripMenuItem.Visible = false; } Settings.Default.compidx = com_idx; diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 1880a89..38ae77e 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 440f50b..353cfdf 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 67793af..b1dc4f6 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.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 1880a89..38ae77e 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 440f50b..353cfdf 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 67793af..b1dc4f6 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/마크/Mac_List_Add.cs b/unimarc/unimarc/마크/Mac_List_Add.cs index 9bebe5d..15a34f0 100644 --- a/unimarc/unimarc/마크/Mac_List_Add.cs +++ b/unimarc/unimarc/마크/Mac_List_Add.cs @@ -69,7 +69,6 @@ namespace UniMarc.마크 return; } - string InBook_Area = "`compidx`, `list_name`, `date`, `header`, `num`, " + "`book_name`, `author`, `book_comp`, `pay`, `count`, " + "`total`, `isbn_marc`"; diff --git a/unimarc/unimarc/마크/Mac_Output.cs b/unimarc/unimarc/마크/Mac_Output.cs index 870b37a..3d7d20a 100644 --- a/unimarc/unimarc/마크/Mac_Output.cs +++ b/unimarc/unimarc/마크/Mac_Output.cs @@ -172,6 +172,7 @@ namespace WindowsFormsApp1.Mac private void btn_file_save_Click(object sender, EventArgs e) { + String_Text st = new String_Text(); string Marc_data = string.Empty; for (int a = 0; a < dataGridView1.Rows.Count; a++) { @@ -179,7 +180,13 @@ namespace WindowsFormsApp1.Mac dataGridView1.Rows[a].Cells["Marc"].Value == null) continue; - Marc_data += dataGridView1.Rows[a].Cells["Marc"].Value.ToString().Replace("₩", "\\"); + string marc = dataGridView1.Rows[a].Cells["Marc"].Value.ToString(); + + marc = st.ConvertMarcType(marc); + marc = st.ApplyMark(marc); + marc = st.made_Ori_marc(marc); + + Marc_data += marc.Replace("₩", "\\"); } string FileName; diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 24c5ea2..9c4526f 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -572,6 +572,7 @@ namespace ExcelTest } string table_name = "Marc"; int row_idx = List_Book.CurrentCell.RowIndex; + string BaseText = richTextBox1.Text; string tag056 = Tag056(); string[] grid_data = { List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString(), @@ -589,15 +590,15 @@ namespace ExcelTest if (Midx != "") { isNewData = false; - } // 필수태그 확인 if (!isMustTag(orimarc)) { + richTextBox1.Text = BaseText; return; } - if (List_Book.Rows[row_idx].DefaultCellStyle.BackColor != Color.LightGray) + if (List_Book.Rows[row_idx].DefaultCellStyle.ForeColor != Color.Orange) { string[] Edit_tbl = { "compidx", "marc", "marc_chk", "marc_chk1", "비고1", @@ -850,6 +851,11 @@ namespace ExcelTest string res = db.DB_Send_CMD_Search(cmd); string[] ary = res.Split('|'); + if (res.Length < 1) { + etc1.Text = res; + etc2.Text = ""; + return; + } etc1.Text = ary[0]; etc2.Text = ary[1]; } @@ -1477,10 +1483,9 @@ namespace ExcelTest private void List_Book_KeyDown(object sender, KeyEventArgs e) { + int row = List_Book.CurrentCell.RowIndex; if (e.KeyCode == Keys.Space) { - int row = List_Book.CurrentCell.RowIndex; - if (List_Book.Rows[row].Cells["colCheck"].Value.ToString() == "V") List_Book.Rows[row].Cells["colCheck"].Value = ""; diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs index 5a1a897..496f7d0 100644 --- a/unimarc/unimarc/마크/Marc_Plan.cs +++ b/unimarc/unimarc/마크/Marc_Plan.cs @@ -155,6 +155,8 @@ namespace WindowsFormsApp1.Mac int row = e.RowIndex; int col = e.ColumnIndex; + if (row < 0) return; + string idx = dataGridView1.Rows[row].Cells["idx"].Value.ToString(); if (dataGridView1.Rows[row].Cells[col].ReadOnly) { @@ -305,6 +307,7 @@ namespace WindowsFormsApp1.Mac private void btn_Output_Click(object sender, EventArgs e) { + String_Text st = new String_Text(); string Marc_data = string.Empty; for (int a = 0; a < dataGridView1.Rows.Count; a++) @@ -316,7 +319,12 @@ namespace WindowsFormsApp1.Mac if (dataGridView1.Rows[a].Cells["colCheck"].Value.ToString() != "T") continue; - Marc_data += dataGridView1.Rows[a].Cells["marc"].Value.ToString().Replace("₩", "\\"); + string marc = dataGridView1.Rows[a].Cells["Marc"].Value.ToString(); + marc = st.ConvertMarcType(marc); + marc = st.ApplyMark(marc); + marc = st.made_Ori_marc(marc); + + Marc_data += marc.Replace("₩", "\\"); } string FileName; @@ -479,6 +487,8 @@ namespace WindowsFormsApp1.Mac string AddTagInMarc(string Tag, string TypeView) { + if (Tag.Length < 3) return ""; + int TargetTagNum = Convert.ToInt32(Tag.Substring(0, 3)); string[] SplitView = TypeView.Split('\n');