diff --git a/.gitignore b/.gitignore index b2644cc..3c1be9e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,6 @@ AuthorSymbol/ TestGrid/ Split_Marc/ Test_Update/ -Barum_TestProject/ \ No newline at end of file +Barum_TestProject/ +MacroTest/ +AlarmTest/ \ No newline at end of file diff --git a/Test_Project/.vs/Test_Project/v16/.suo b/Test_Project/.vs/Test_Project/v16/.suo index 988eb0a..d0633a8 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 e4cbe88..9088945 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 a51c995..aafb76c 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -22,6 +22,7 @@ using WindowsFormsApp1.마크; using WindowsFormsApp1.회계; using WindowsFormsApp1.납품관리; using UniMarc.회계; +using UniMarc.Properties; namespace WindowsFormsApp1 { @@ -70,8 +71,8 @@ namespace WindowsFormsApp1 cmd = _DB.DB_Select_Search("`idx`", "Comp", "comp_name", result[5]); com_idx = _DB.DB_Send_CMD_Search(cmd).Replace("|", ""); - UniMarc.Properties.Settings.Default.compidx = com_idx; - UniMarc.Properties.Settings.Default.User = toolStripLabel1.Text; + Settings.Default.compidx = com_idx; + Settings.Default.User = toolStripLabel1.Text; this.Text = "[ '" + com_idx + "' : " + result[5] + " - " + result[3] + "]"; } diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index 3be96ef..23c9ed5 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -97,7 +97,6 @@ Reference.svcmap - Form @@ -195,6 +194,12 @@ Marc_Plan_Sub_SelectList.cs + + Form + + + Marc_Plan_Sub_SelectList_Edit.cs + Form @@ -717,6 +722,9 @@ Marc_Plan_Sub_SelectList.cs + + Marc_Plan_Sub_SelectList_Edit.cs + Marc_Preview.cs diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index c7dad01..4a4b7c8 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 a89418d..4a560de 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 4708456..6133912 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/DesignTimeResolveAssemblyReferences.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 941d6fd..84660dd 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache index b10daa3..83b6e0f 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache index 6a0ba3b..bb63ff9 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -61865f8557e13cf94cb54354fa0d20fa0fb41da2 +89b339d175dcfbb49c4dfa5feca9d6593ebfae6d diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt index c2520c3..ef7bfd5 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt @@ -123,3 +123,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크. C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp1.Mac.Marc_Plan.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_Plan_Sub_SelectList.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_mkList.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_Plan_Sub_SelectList_Edit.resources diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index 7924ebc..3155d0e 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 c7dad01..4a4b7c8 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 a89418d..4a560de 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/UniMarc.마크.Marc_Plan_Sub_SelectList_Edit.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_Plan_Sub_SelectList_Edit.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_Plan_Sub_SelectList_Edit.resources differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index 4708456..6133912 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/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index e3ece39..01043cb 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -763,8 +763,8 @@ namespace ExcelTest if (List_Book.Rows[row].Cells[col].Value.ToString() == "V") List_Book.Rows[row].Cells[col].Value = ""; - else if (List_Book.Rows[row].Cells[col].Value.ToString() == "") - List_Book.Rows[row].Cells[col].Value = "V"; + else// if (List_Book.Rows[row].Cells[col].Value.ToString() == "") + List_Book.Rows[row].Cells["colCheck"].Value = "V"; return true; } @@ -796,7 +796,6 @@ namespace ExcelTest { TagNum.Add(data[0].Substring(startidx, 3)); startidx += 12; - field.Add(data[a] + "▲"); } @@ -872,16 +871,13 @@ namespace ExcelTest string Empty_008 = yyMMdd + "s" + yyyy + " 000 kor ▲"; text008.Text = Empty_008.Replace("▲", ""); data008 = text008.Text; - string Empty_text = string.Format("008\t \t{0}\n" + - "020\t \t▼a{1}▼c\\{5}▲\n" + - "245\t \t▼a{2}▲\n" + - "260\t \t▼b{4}▲\n" + - "700\t \t▼a{3}▲\n" + - "950\t \t▼b\\{5}▲\n", - Empty_008, data_book[0], data_book[1], data_book[2], data_book[3], data_book[4]); -/* "008\t \t" + Empty_008 + "\n020\t \t▼a" + data_book[0] + "▲\n" + - "245\t \t▼a" + data_book[1] + " ▲\n" + "260\t \t▼b" + data_book[3] + " ▲\n" + - "653\t \t▼▲\n" + "700\t \t▼▲\n" + "950\t \t▼▲\n";*/ + string Empty_text = string.Format( + "008\t \t{0}\n" + + "020\t \t▼a{1}▼c\\{5}▲\n" + + "245\t \t▼a{2}▼d{3}▲\n" + + "260\t \t▼b{4}▲\n" + + "950\t \t▼b￦{5}▲\n", + Empty_008, data_book[0], data_book[1], data_book[2], data_book[3], data_book[4]); return Empty_text; } /// @@ -1182,5 +1178,24 @@ namespace ExcelTest return false; } #endregion + + private void checkBox3_CheckedChanged(object sender, EventArgs e) + { + bool isCheck = checkBox3.Checked; + if (isCheck) + { + for (int a = 0; a < List_Book.Rows.Count; a++) + { + List_Book.Rows[a].Cells["colCheck"].Value = "V"; + } + } + else + { + for (int a = 0; a < List_Book.Rows.Count; a++) + { + List_Book.Rows[a].Cells["colCheck"].Value = ""; + } + } + } } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index 3154051..86c6e34 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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(); @@ -57,6 +57,19 @@ 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.btn_Save = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text008 = new System.Windows.Forms.TextBox(); @@ -75,19 +88,7 @@ this.panel2 = new System.Windows.Forms.Panel(); this.btn_mk_marcList = new System.Windows.Forms.Button(); this.btn_Search = new System.Windows.Forms.Button(); - 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.checkBox3 = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.List_Book)).BeginInit(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -362,14 +363,14 @@ this.List_Book.AllowUserToAddRows = false; this.List_Book.AllowUserToDeleteRows = false; this.List_Book.AllowUserToResizeColumns = false; - 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; + 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.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, this.ISBN13, @@ -398,6 +399,108 @@ this.List_Book.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.List_Book_CellContentClick); this.List_Book.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView8_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 + // + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colCheck.DefaultCellStyle = dataGridViewCellStyle4; + this.colCheck.HeaderText = "V"; + this.colCheck.Name = "colCheck"; + this.colCheck.ReadOnly = true; + this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheck.Width = 30; + // // btn_Save // this.btn_Save.Location = new System.Drawing.Point(1403, 120); @@ -587,113 +690,24 @@ this.btn_Search.UseVisualStyleBackColor = true; this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click); // - // list_idx + // checkBox3 // - 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 - // - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.colCheck.DefaultCellStyle = dataGridViewCellStyle2; - this.colCheck.HeaderText = "V"; - this.colCheck.Name = "colCheck"; - this.colCheck.ReadOnly = true; - this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCheck.Width = 30; + this.checkBox3.AutoSize = true; + this.checkBox3.Checked = true; + this.checkBox3.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBox3.Location = new System.Drawing.Point(475, 62); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(15, 14); + this.checkBox3.TabIndex = 227; + this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox3.CheckedChanged += new System.EventHandler(this.checkBox3_CheckedChanged); // // Marc // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1489, 770); + this.Controls.Add(this.checkBox3); this.Controls.Add(this.panel1); this.Controls.Add(this.label6); this.Controls.Add(this.cb_grade); @@ -809,5 +823,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn grade; private System.Windows.Forms.DataGridViewTextBoxColumn colCheck; public System.Windows.Forms.DataGridView List_Book; + private System.Windows.Forms.CheckBox checkBox3; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs index f8eb1a9..9322dfd 100644 --- a/unimarc/unimarc/마크/Marc_Plan.cs +++ b/unimarc/unimarc/마크/Marc_Plan.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using UniMarc.마크; namespace WindowsFormsApp1.Mac { @@ -21,7 +22,9 @@ namespace WindowsFormsApp1.Mac private void btn_Select_List_Click(object sender, EventArgs e) { - dataGridView1.Rows.Add(1); + Marc_Plan_Sub_SelectList sub = new Marc_Plan_Sub_SelectList(); + sub.TopMost = true; + sub.Show(); } private void button1_Click(object sender, EventArgs e) diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs index 5df858a..67e357a 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs @@ -29,19 +29,20 @@ namespace UniMarc.마크 /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); - this.cb_gu = new System.Windows.Forms.ComboBox(); this.tb_Search = new System.Windows.Forms.TextBox(); - this.btn_Search = new System.Windows.Forms.Button(); + this.cb_gu = new System.Windows.Forms.ComboBox(); this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.btn_Search = new System.Windows.Forms.Button(); this.btn_Complite = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - this.button5 = new System.Windows.Forms.Button(); - this.button6 = new System.Windows.Forms.Button(); + this.btn_Progress = new System.Windows.Forms.Button(); + this.btn_Edit = new System.Windows.Forms.Button(); + this.btn_Delete = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.date = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); @@ -57,19 +58,19 @@ namespace UniMarc.마크 this.panel1.Controls.Add(this.cb_gu); this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.label1); - this.panel1.Location = new System.Drawing.Point(3, 3); + this.panel1.Location = new System.Drawing.Point(3, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(363, 27); + this.panel1.Size = new System.Drawing.Size(353, 27); this.panel1.TabIndex = 0; // - // label1 + // tb_Search // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 6); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 12); - this.label1.TabIndex = 0; - this.label1.Text = "구분"; + 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.TabIndex = 2; + this.tb_Search.Enter += new System.EventHandler(this.tb_Search_Enter); + this.tb_Search.Leave += new System.EventHandler(this.tb_Search_Leave); // // cb_gu // @@ -79,23 +80,7 @@ namespace UniMarc.마크 this.cb_gu.Name = "cb_gu"; this.cb_gu.Size = new System.Drawing.Size(60, 20); this.cb_gu.TabIndex = 1; - // - // tb_Search - // - this.tb_Search.BackColor = System.Drawing.Color.Khaki; - this.tb_Search.Location = new System.Drawing.Point(136, 2); - this.tb_Search.Name = "tb_Search"; - this.tb_Search.Size = new System.Drawing.Size(223, 21); - this.tb_Search.TabIndex = 2; - // - // btn_Search - // - this.btn_Search.Location = new System.Drawing.Point(369, 3); - this.btn_Search.Name = "btn_Search"; - this.btn_Search.Size = new System.Drawing.Size(57, 27); - this.btn_Search.TabIndex = 1; - this.btn_Search.Text = "검 색"; - this.btn_Search.UseVisualStyleBackColor = true; + this.cb_gu.SelectedIndexChanged += new System.EventHandler(this.cb_gu_SelectedIndexChanged); // // label2 // @@ -106,76 +91,109 @@ namespace UniMarc.마크 this.label2.TabIndex = 0; this.label2.Text = "검색"; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 6); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.TabIndex = 0; + this.label1.Text = "구분"; + // + // btn_Search + // + this.btn_Search.Location = new System.Drawing.Point(359, 2); + this.btn_Search.Name = "btn_Search"; + this.btn_Search.Size = new System.Drawing.Size(61, 27); + this.btn_Search.TabIndex = 1; + this.btn_Search.Text = "검 색"; + this.btn_Search.UseVisualStyleBackColor = true; + this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click); + // // btn_Complite // - this.btn_Complite.Location = new System.Drawing.Point(429, 3); + this.btn_Complite.Location = new System.Drawing.Point(422, 2); this.btn_Complite.Name = "btn_Complite"; - this.btn_Complite.Size = new System.Drawing.Size(57, 27); + this.btn_Complite.Size = new System.Drawing.Size(61, 27); this.btn_Complite.TabIndex = 1; - this.btn_Complite.Text = "완 료"; + this.btn_Complite.Text = "완료처리"; this.btn_Complite.UseVisualStyleBackColor = true; + this.btn_Complite.Click += new System.EventHandler(this.Change_State); // - // button3 + // btn_Progress // - this.button3.Location = new System.Drawing.Point(486, 3); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(57, 27); - this.button3.TabIndex = 1; - this.button3.Text = "진 행"; - this.button3.UseVisualStyleBackColor = true; + this.btn_Progress.Location = new System.Drawing.Point(483, 2); + this.btn_Progress.Name = "btn_Progress"; + this.btn_Progress.Size = new System.Drawing.Size(61, 27); + this.btn_Progress.TabIndex = 1; + this.btn_Progress.Text = "진행처리"; + this.btn_Progress.UseVisualStyleBackColor = true; + this.btn_Progress.Click += new System.EventHandler(this.Change_State); // - // button4 + // btn_Edit // - this.button4.Location = new System.Drawing.Point(546, 3); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(57, 27); - this.button4.TabIndex = 1; - this.button4.Text = "수 정"; - this.button4.UseVisualStyleBackColor = true; + this.btn_Edit.Location = new System.Drawing.Point(546, 2); + this.btn_Edit.Name = "btn_Edit"; + this.btn_Edit.Size = new System.Drawing.Size(61, 27); + this.btn_Edit.TabIndex = 1; + this.btn_Edit.Text = "수 정"; + this.btn_Edit.UseVisualStyleBackColor = true; + this.btn_Edit.Click += new System.EventHandler(this.btn_Edit_Click); // - // button5 + // btn_Delete // - this.button5.Location = new System.Drawing.Point(603, 3); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(57, 27); - this.button5.TabIndex = 1; - this.button5.Text = "삭 제"; - this.button5.UseVisualStyleBackColor = true; + this.btn_Delete.Location = new System.Drawing.Point(607, 2); + this.btn_Delete.Name = "btn_Delete"; + this.btn_Delete.Size = new System.Drawing.Size(61, 27); + this.btn_Delete.TabIndex = 1; + this.btn_Delete.Text = "삭 제"; + this.btn_Delete.UseVisualStyleBackColor = true; + this.btn_Delete.Click += new System.EventHandler(this.btn_Delete_Click); // - // button6 + // btn_Close // - this.button6.Location = new System.Drawing.Point(663, 3); - this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(57, 27); - this.button6.TabIndex = 1; - this.button6.Text = "닫 기"; - this.button6.UseVisualStyleBackColor = true; + this.btn_Close.Location = new System.Drawing.Point(670, 2); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(61, 27); + this.btn_Close.TabIndex = 1; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); // // dataGridView1 // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCellsExceptHeaders; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + 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; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.idx, this.list_name, this.date, this.colCheck}); - this.dataGridView1.Location = new System.Drawing.Point(3, 37); + this.dataGridView1.Location = new System.Drawing.Point(3, 34); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(717, 150); + this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView1.Size = new System.Drawing.Size(728, 305); this.dataGridView1.TabIndex = 2; + this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; + // // list_name // this.list_name.HeaderText = "목록명"; @@ -186,7 +204,7 @@ namespace UniMarc.마크 // this.date.HeaderText = "등록일시"; this.date.Name = "date"; - this.date.Width = 120; + this.date.Width = 130; // // colCheck // @@ -203,12 +221,12 @@ namespace UniMarc.마크 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(726, 450); + this.ClientSize = new System.Drawing.Size(733, 341); this.Controls.Add(this.dataGridView1); - this.Controls.Add(this.button6); - this.Controls.Add(this.button5); - this.Controls.Add(this.button4); - this.Controls.Add(this.button3); + this.Controls.Add(this.btn_Close); + this.Controls.Add(this.btn_Delete); + this.Controls.Add(this.btn_Edit); + this.Controls.Add(this.btn_Progress); this.Controls.Add(this.btn_Complite); this.Controls.Add(this.btn_Search); this.Controls.Add(this.panel1); @@ -231,11 +249,12 @@ namespace UniMarc.마크 private System.Windows.Forms.Button btn_Search; private System.Windows.Forms.Label label2; private System.Windows.Forms.Button btn_Complite; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; - private System.Windows.Forms.Button button5; - private System.Windows.Forms.Button button6; + private System.Windows.Forms.Button btn_Progress; + private System.Windows.Forms.Button btn_Edit; + private System.Windows.Forms.Button btn_Delete; + private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn idx; private System.Windows.Forms.DataGridViewTextBoxColumn list_name; private System.Windows.Forms.DataGridViewTextBoxColumn date; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs index 6a3d71c..3f01bec 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs @@ -7,27 +7,171 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using WindowsFormsApp1; namespace UniMarc.마크 { public partial class Marc_Plan_Sub_SelectList : Form { + Helper_DB db = new Helper_DB(); + string compidx; public Marc_Plan_Sub_SelectList() { InitializeComponent(); + compidx = Properties.Settings.Default.compidx; } private void Marc_Plan_Sub_SelectList_Load(object sender, EventArgs e) { + db.DBcon(); + string[] gu = { "진행", "완료" }; cb_gu.Items.AddRange(gu); cb_gu.SelectedIndex = 0; + + dataGridView1.Columns["list_name"].ReadOnly = true; + dataGridView1.Columns["date"].ReadOnly = true; } private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) { - WindowsFormsApp1.Skill_Grid sg = new WindowsFormsApp1.Skill_Grid(); + Skill_Grid sg = new Skill_Grid(); sg.Print_Grid_Num(sender, e); } + + private void tb_Search_Enter(object sender, EventArgs e) + { + ((TextBox)sender).BackColor = Color.Khaki; + } + + private void tb_Search_Leave(object sender, EventArgs e) + { + ((TextBox)sender).BackColor = Color.White; + } + + private void btn_Search_Click(object sender, EventArgs e) + { + dataGridView1.Rows.Clear(); + + string gu = cb_gu.Text; // 검색 필터 + string text = tb_Search.Text; // 검색어 DB LIKE 검색 + string Area = "`idx`, `work_list`, `date`"; + + string cmd = string.Format("SELECT {0} FROM `Specs_List` WHERE `compidx` = {1} AND `state` = \"{2}\" AND `work_list` LIKE \"%{3}%\"", + Area, compidx, gu, text); + + string res = db.DB_Send_CMD_Search(cmd); + string[] ary = res.Split('|'); + Input_Grid(ary); + } + #region Search_Sub + private void Input_Grid(string[] ary) + { + string[] grid = { "", "", "", "F" }; + for(int a = 0; a < ary.Length; a++) + { + if (a % 3 == 0) grid[0] = ary[a]; + if (a % 3 == 1) grid[1] = ary[a]; + if (a % 3 == 2) { + grid[2] = ary[a]; + dataGridView1.Rows.Add(grid); + } + } + } + #endregion + + private void Change_State(object sender, EventArgs e) // 완료, 진행처리 + { + string name = ((Button)sender).Text; + int row = dataGridView1.CurrentRow.Index; + + string msg = string.Format("【{0}】을(를) 완료처리 하시겠습니까?", dataGridView1.Rows[row].Cells["list_name"].Value.ToString()); + if (MessageBox.Show(msg, "완료처리", MessageBoxButtons.OKCancel) == DialogResult.Cancel) + return; + + string[] search_col = { "work_list", "date" }; + string[] update_col = { "state" }; + string[] search_data = { + dataGridView1.Rows[row].Cells["list_name"].Value.ToString(), + dataGridView1.Rows[row].Cells["date"].Value.ToString() }; + string[] update_data = { "" }; + + if (name == "완료처리") + update_data[0] = "완료"; + else + update_data[0] = "진행"; + + string cmd = db.More_Update("Specs_List", update_col, update_data, search_col, search_data); + db.DB_Send_CMD_reVoid(cmd); + + btn_Search_Click(null, e); + } + + private int[] Call_Check() + { + List chk_row = new List(); + for(int a= 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["colCheck"].Value.ToString() == "T") + chk_row.Add(a); + } + return chk_row.ToArray(); + } + + private void btn_Edit_Click(object sender, EventArgs e) // 편집 (V 확인필요) + { + int row = dataGridView1.CurrentRow.Index; + + Marc_Plan_Sub_SelectList_Edit edit = new Marc_Plan_Sub_SelectList_Edit(this); + edit.TopMost = true; + edit.Show(); + edit.BaseSetting(dataGridView1.Rows[row].Cells["idx"].Value.ToString()); + edit.TextBoxSetting(dataGridView1.Rows[row].Cells["list_name"].Value.ToString()); + } + + private void btn_Delete_Click(object sender, EventArgs e) // 삭제 (V 확인필요) + { + int row = dataGridView1.CurrentRow.Index; + + string msg = string.Format("【{0}】을(를) 삭제하시겠습니까?", dataGridView1.Rows[row].Cells["list_name"].Value.ToString()); + + if (MessageBox.Show(msg, "삭제하시겠습니까?", MessageBoxButtons.YesNo) == DialogResult.No) + return; + + string idx = dataGridView1.Rows[row].Cells["idx"].Value.ToString(); + string[] search_col = {"work_list", "date" }; + string[] search_data = { dataGridView1.Rows[row].Cells["list_name"].Value.ToString(), + dataGridView1.Rows[row].Cells["date"].Value.ToString() }; + + // 목록 제거 + string cmd = db.DB_Delete_More_term("Specs_List", "idx", idx, search_col, search_data); + db.DB_Send_CMD_reVoid(cmd); + + // 목록 내 마크 제거 + cmd = db.DB_Delete_No_Limit("Specs_Marc", "compidx", compidx, search_col, search_data); + db.DB_Send_CMD_reVoid(cmd); + } + + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void cb_gu_SelectedIndexChanged(object sender, EventArgs e) + { + if (cb_gu.SelectedIndex == 0) { + btn_Progress.Enabled = false; + btn_Complite.Enabled = true; + } + else { + btn_Complite.Enabled = false; + btn_Progress.Enabled = true; + } + } + + private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + { + + } } } diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx index 956a230..ec64978 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + True diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.Designer.cs new file mode 100644 index 0000000..67d5188 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.Designer.cs @@ -0,0 +1,199 @@ + +namespace UniMarc.마크 +{ + partial class Marc_Plan_Sub_SelectList_Edit + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.panel2 = new System.Windows.Forms.Panel(); + this.btn_Edit_Save = new System.Windows.Forms.Button(); + this.btn_Edit_Close = new System.Windows.Forms.Button(); + this.panel4 = new System.Windows.Forms.Panel(); + this.tb_listName = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.cb_authorType = new System.Windows.Forms.ComboBox(); + this.cb_divType = new System.Windows.Forms.ComboBox(); + this.cb_divNum = new System.Windows.Forms.ComboBox(); + this.cb_FirstBook = new System.Windows.Forms.ComboBox(); + this.cb_FirstAuthor = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.panel2.SuspendLayout(); + this.panel4.SuspendLayout(); + this.SuspendLayout(); + // + // panel2 + // + this.panel2.BackColor = System.Drawing.SystemColors.Info; + this.panel2.Controls.Add(this.btn_Edit_Save); + this.panel2.Controls.Add(this.btn_Edit_Close); + this.panel2.Controls.Add(this.panel4); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(567, 123); + this.panel2.TabIndex = 4; + // + // btn_Edit_Save + // + this.btn_Edit_Save.Location = new System.Drawing.Point(399, 90); + this.btn_Edit_Save.Name = "btn_Edit_Save"; + this.btn_Edit_Save.Size = new System.Drawing.Size(75, 23); + this.btn_Edit_Save.TabIndex = 4; + this.btn_Edit_Save.Text = "저 장"; + this.btn_Edit_Save.UseVisualStyleBackColor = true; + this.btn_Edit_Save.Click += new System.EventHandler(this.btn_Edit_Save_Click); + // + // btn_Edit_Close + // + this.btn_Edit_Close.Location = new System.Drawing.Point(480, 90); + this.btn_Edit_Close.Name = "btn_Edit_Close"; + this.btn_Edit_Close.Size = new System.Drawing.Size(75, 23); + this.btn_Edit_Close.TabIndex = 4; + this.btn_Edit_Close.Text = "닫 기"; + this.btn_Edit_Close.UseVisualStyleBackColor = true; + this.btn_Edit_Close.Click += new System.EventHandler(this.btn_Edit_Close_Click); + // + // panel4 + // + this.panel4.BackColor = System.Drawing.SystemColors.Info; + this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel4.Controls.Add(this.tb_listName); + this.panel4.Controls.Add(this.label3); + this.panel4.Controls.Add(this.cb_authorType); + this.panel4.Controls.Add(this.cb_divType); + this.panel4.Controls.Add(this.cb_divNum); + this.panel4.Controls.Add(this.cb_FirstBook); + this.panel4.Controls.Add(this.cb_FirstAuthor); + this.panel4.Controls.Add(this.label5); + this.panel4.Location = new System.Drawing.Point(12, 12); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(543, 72); + this.panel4.TabIndex = 3; + // + // tb_listName + // + this.tb_listName.Location = new System.Drawing.Point(52, 8); + this.tb_listName.Name = "tb_listName"; + this.tb_listName.Size = new System.Drawing.Size(481, 21); + this.tb_listName.TabIndex = 1; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(5, 12); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(41, 12); + this.label3.TabIndex = 0; + this.label3.Text = "목록명"; + // + // cb_authorType + // + this.cb_authorType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_authorType.FormattingEnabled = true; + this.cb_authorType.Location = new System.Drawing.Point(132, 37); + this.cb_authorType.Name = "cb_authorType"; + this.cb_authorType.Size = new System.Drawing.Size(171, 20); + this.cb_authorType.TabIndex = 1; + // + // cb_divType + // + this.cb_divType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_divType.FormattingEnabled = true; + this.cb_divType.Location = new System.Drawing.Point(378, 37); + this.cb_divType.Name = "cb_divType"; + this.cb_divType.Size = new System.Drawing.Size(88, 20); + this.cb_divType.TabIndex = 1; + this.cb_divType.SelectedIndexChanged += new System.EventHandler(this.cb_divType_SelectedIndexChanged); + // + // cb_divNum + // + this.cb_divNum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_divNum.FormattingEnabled = true; + this.cb_divNum.Location = new System.Drawing.Point(472, 37); + this.cb_divNum.Name = "cb_divNum"; + this.cb_divNum.Size = new System.Drawing.Size(61, 20); + this.cb_divNum.TabIndex = 1; + // + // cb_FirstBook + // + this.cb_FirstBook.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_FirstBook.FormattingEnabled = true; + this.cb_FirstBook.Location = new System.Drawing.Point(309, 37); + this.cb_FirstBook.Name = "cb_FirstBook"; + this.cb_FirstBook.Size = new System.Drawing.Size(61, 20); + this.cb_FirstBook.TabIndex = 1; + // + // cb_FirstAuthor + // + this.cb_FirstAuthor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_FirstAuthor.FormattingEnabled = true; + this.cb_FirstAuthor.Location = new System.Drawing.Point(64, 37); + this.cb_FirstAuthor.Name = "cb_FirstAuthor"; + this.cb_FirstAuthor.Size = new System.Drawing.Size(61, 20); + this.cb_FirstAuthor.TabIndex = 1; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(5, 41); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(53, 12); + this.label5.TabIndex = 1; + this.label5.Text = "저자기호"; + // + // Marc_Plan_Sub_SelectList_Edit + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(567, 123); + this.Controls.Add(this.panel2); + this.Name = "Marc_Plan_Sub_SelectList_Edit"; + this.Text = "마크정리_목록수정"; + this.Load += new System.EventHandler(this.Marc_Plan_Sub_SelectList_Edit_Load); + this.panel2.ResumeLayout(false); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button btn_Edit_Save; + private System.Windows.Forms.Button btn_Edit_Close; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.TextBox tb_listName; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ComboBox cb_authorType; + private System.Windows.Forms.ComboBox cb_divType; + private System.Windows.Forms.ComboBox cb_divNum; + private System.Windows.Forms.ComboBox cb_FirstBook; + private System.Windows.Forms.ComboBox cb_FirstAuthor; + private System.Windows.Forms.Label label5; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.cs new file mode 100644 index 0000000..e691ff9 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.cs @@ -0,0 +1,121 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using WindowsFormsApp1; + +namespace UniMarc.마크 +{ + public partial class Marc_Plan_Sub_SelectList_Edit : Form + { + string IDX; + + Helper_DB db = new Helper_DB(); + Marc_Plan_Sub_SelectList sub; + public Marc_Plan_Sub_SelectList_Edit(Marc_Plan_Sub_SelectList _sub) + { + InitializeComponent(); + sub = _sub; + } + + public void BaseSetting(string idx) + { + db.DBcon(); + + string Area = "`first_Author`, `symbol_Author`, `book_Author`, `divType`, `divNum`"; + string cmd = db.DB_Select_Search(Area, "Specs_List", "idx", idx); + string res = db.DB_Send_CMD_Search(cmd); + string[] ary = res.Split('|'); + + IDX = idx; + + // `first_Author`, `symbol_Author`, `book_Author`, `divType`, `divNum` + cb_FirstAuthor.SelectedItem = ary[0]; + cb_authorType.SelectedItem = ary[1]; + cb_FirstBook.SelectedItem = ary[2]; + cb_divType.SelectedItem = ary[3]; + cb_divNum.SelectedItem = ary[4]; + } + + public void TextBoxSetting(string Text) + { + tb_listName.Text = Text; + } + + private void Marc_Plan_Sub_SelectList_Edit_Load(object sender, EventArgs e) + { + #region panel2 set 저자기호 // 분류기호 + + // 저자기호 + string[] First = { "첫음", "초성" }; + cb_FirstAuthor.Items.AddRange(First); + cb_FirstAuthor.SelectedIndex = 0; + + string[] authorType = { + /* 00 */ "이재철 1표", + /* 01 */ "이재철 2표", + /* 02 */ "이재철 3표(실용형 가표)", + /* 03 */ "이재철 4표(실용형 까표)", + /* 04 */ "이재철 5표(완전형 가표)", + /* 05 */ "이재철 6표(완전형 가표)", + /* 06 */ "이재철 7표(실용형 하표)", + /* 07 */ "이재철 7표(동서저자기호표)", + /* 08 */ "이재철 8표(완전형 하표)", + /* 09 */ "이재철 8표(동서저자기호표)", + /* 10 */ "장일세 저자기호표", + /* 11 */ "커터 샌본 저자기호표", + /* 12 */ "엘러드 저자기호법", + /* 13 */ "동서양 저자기호법 (국중)" + }; + cb_authorType.Items.AddRange(authorType); + cb_authorType.SelectedIndex = 0; + + string[] Book = { "첫음", "초성", "중성" }; + cb_FirstBook.Items.AddRange(Book); + cb_FirstBook.SelectedIndex = 0; + + // 분류기호 + string[] divType = { "KDC", "DDC" }; + cb_divType.Items.AddRange(divType); + cb_divType.SelectedIndex = 0; + #endregion + } + + private void btn_Edit_Save_Click(object sender, EventArgs e) + { + string[] update_col = { "work_list", "first_Author", "symbol_Author", "book_Author", "divType", "divNum" }; + string[] update_data = { tb_listName.Text, cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text }; + string[] search_col = { "idx" }; + string[] search_data = { IDX }; + string cmd = db.More_Update("Specs_List", update_col, update_data, search_col, search_data); + db.DB_Send_CMD_reVoid(cmd); + MessageBox.Show("저장완료되었습니다."); + this.Close(); + } + + private void cb_divType_SelectedIndexChanged(object sender, EventArgs e) + { + cb_divNum.Items.Clear(); + if (((ComboBox)sender).SelectedIndex == 0) + { + string[] divNum = { "4", "5", "6" }; + cb_divNum.Items.AddRange(divNum); + } + else + { + string[] divNum = { "21", "22", "23" }; + cb_divNum.Items.AddRange(divNum); + } + } + + private void btn_Edit_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.resx b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_mkList.Designer.cs b/unimarc/unimarc/마크/Marc_mkList.Designer.cs index 44524cd..15d3b0c 100644 --- a/unimarc/unimarc/마크/Marc_mkList.Designer.cs +++ b/unimarc/unimarc/마크/Marc_mkList.Designer.cs @@ -39,6 +39,8 @@ namespace UniMarc.마크 this.btn_Close = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); this.cb_authorType = new System.Windows.Forms.ComboBox(); + this.cb_divType = new System.Windows.Forms.ComboBox(); + this.cb_divNum = new System.Windows.Forms.ComboBox(); this.cb_FirstBook = new System.Windows.Forms.ComboBox(); this.cb_FirstAuthor = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); @@ -47,12 +49,13 @@ namespace UniMarc.마크 this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.cb_divNum = new System.Windows.Forms.ComboBox(); - this.cb_divType = new System.Windows.Forms.ComboBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.rtb_etc = new System.Windows.Forms.RichTextBox(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); this.panel4.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // panel1 @@ -160,6 +163,25 @@ namespace UniMarc.마크 this.cb_authorType.Size = new System.Drawing.Size(171, 20); this.cb_authorType.TabIndex = 1; // + // cb_divType + // + this.cb_divType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_divType.FormattingEnabled = true; + this.cb_divType.Location = new System.Drawing.Point(409, 4); + this.cb_divType.Name = "cb_divType"; + this.cb_divType.Size = new System.Drawing.Size(88, 20); + this.cb_divType.TabIndex = 1; + this.cb_divType.SelectedIndexChanged += new System.EventHandler(this.cb_divType_SelectedIndexChanged); + // + // cb_divNum + // + this.cb_divNum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_divNum.FormattingEnabled = true; + this.cb_divNum.Location = new System.Drawing.Point(503, 4); + this.cb_divNum.Name = "cb_divNum"; + this.cb_divNum.Size = new System.Drawing.Size(61, 20); + this.cb_divNum.TabIndex = 1; + // // cb_FirstBook // this.cb_FirstBook.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -217,7 +239,7 @@ namespace UniMarc.마크 // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label2.Location = new System.Drawing.Point(12, 147); + this.label2.Location = new System.Drawing.Point(12, 306); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(345, 13); this.label2.TabIndex = 1; @@ -225,35 +247,36 @@ namespace UniMarc.마크 // // progressBar1 // - this.progressBar1.Location = new System.Drawing.Point(12, 114); + this.progressBar1.Location = new System.Drawing.Point(12, 273); this.progressBar1.Name = "progressBar1"; this.progressBar1.Size = new System.Drawing.Size(569, 23); this.progressBar1.TabIndex = 3; // - // cb_divNum + // groupBox1 // - this.cb_divNum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_divNum.FormattingEnabled = true; - this.cb_divNum.Location = new System.Drawing.Point(503, 4); - this.cb_divNum.Name = "cb_divNum"; - this.cb_divNum.Size = new System.Drawing.Size(61, 20); - this.cb_divNum.TabIndex = 1; + this.groupBox1.Controls.Add(this.rtb_etc); + this.groupBox1.Location = new System.Drawing.Point(15, 114); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(566, 153); + this.groupBox1.TabIndex = 4; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "비 고 란"; // - // cb_divType + // rtb_etc // - this.cb_divType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_divType.FormattingEnabled = true; - this.cb_divType.Location = new System.Drawing.Point(409, 4); - this.cb_divType.Name = "cb_divType"; - this.cb_divType.Size = new System.Drawing.Size(88, 20); - this.cb_divType.TabIndex = 1; - this.cb_divType.SelectedIndexChanged += new System.EventHandler(this.cb_divType_SelectedIndexChanged); + this.rtb_etc.Dock = System.Windows.Forms.DockStyle.Fill; + this.rtb_etc.Location = new System.Drawing.Point(3, 17); + this.rtb_etc.Name = "rtb_etc"; + this.rtb_etc.Size = new System.Drawing.Size(560, 133); + this.rtb_etc.TabIndex = 0; + this.rtb_etc.Text = ""; // // Marc_mkList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(592, 171); + this.ClientSize = new System.Drawing.Size(592, 328); + this.Controls.Add(this.groupBox1); this.Controls.Add(this.progressBar1); this.Controls.Add(this.panel4); this.Controls.Add(this.label2); @@ -273,6 +296,7 @@ namespace UniMarc.마크 this.panel3.PerformLayout(); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); + this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -300,5 +324,7 @@ namespace UniMarc.마크 private System.Windows.Forms.ProgressBar progressBar1; private System.Windows.Forms.ComboBox cb_divType; private System.Windows.Forms.ComboBox cb_divNum; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.RichTextBox rtb_etc; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs index 61f011c..b30dc0e 100644 --- a/unimarc/unimarc/마크/Marc_mkList.cs +++ b/unimarc/unimarc/마크/Marc_mkList.cs @@ -6,15 +6,20 @@ using System.Data; using System.Drawing; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows.Forms; +using UniMarc.Properties; +using WindowsFormsApp1; + namespace UniMarc.마크 { public partial class Marc_mkList : Form { Marc marc; - string compidx = Properties.Settings.Default.compidx; + Helper_DB db = new Helper_DB(); + string compidx = Settings.Default.compidx; public Marc_mkList(Marc _marc) { @@ -25,6 +30,8 @@ namespace UniMarc.마크 private void Marc_mkList_Load(object sender, EventArgs e) { + db.DBcon(); + #region panel1 set rb_basicNum.Checked = true; rb_autoNum.Enabled = false; @@ -105,19 +112,33 @@ namespace UniMarc.마크 MessageBox.Show("목록명을 입력해주세요!"); return; } + // 시방서 목록 DB에 들어갈 것들. + string[] insert_list_col = { + "compidx", "work_list", "date", "state", "gu", + "first_Author", "symbol_Author", "book_Author", "divType", "divNum", + "etc" + }; + string[] insert_list_data = { + compidx, listName, Time, "진행", cb_listType.Text, + cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text, + rtb_etc.Text + }; + string cmdByList = db.DB_INSERT("Specs_List", insert_list_col, insert_list_data); + db.DB_Send_CMD_reVoid(cmdByList); - string[] update_col = { + // 시방서 마크 DB에 들어갈 것들. + string[] insert_marc_col = { "compidx", "work_list", "date", "ISBN", "book_name", "s_book_name1", "s_book_num1", "author", "book_comp", "pubdate", "price", "tag008", "class_symbol", "author_symbol", "marc", "imageURL" }; - string[] update_data = { - "", "", "", "", "", + string[] insert_marc_data = { + compidx, listName, Time, "", "", "", "", "", "", "", "", "", "", "", "", "" - }; + }; // 마크에서 추출 ( 3 ~ 12 ) int[] row = checkGridRow(); @@ -127,57 +148,67 @@ namespace UniMarc.마크 // 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" }; // string[] Search = { "245d", "245a" }; + 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(); - string[] Marc = Take_Tag(marc.List_Book.Rows[row[a]].Cells["db_marc"].Value.ToString(), Search); - // string Author = Take_Tag(marc.List_Book.Rows[a].Cells["db_marc"].Value.ToString(), "245d"); - // string Book = Take_Tag(marc.List_Book.Rows[a].Cells["book_name"].Value.ToString(), "245a"); + string[] Marc = Take_Tag(insert_marc_data[14], Search); + string[] Author = { Marc[4], Marc[1] }; + + + for (int b = 0; b < Marc.Length; b++) + { + insert_marc_data[b + 3] = Marc[b]; + } + + Author[0] = Regex.Replace(Author[0], @"[^a-zA-Z0-9가-힣_]", "", RegexOptions.Singleline); + Author[1] = Regex.Replace(Author[1], @"[^a-zA-Z0-9가-힣_]", "", RegexOptions.Singleline); char aut; - if (Marc[0].Length <= 1) - aut = Marc[0][0]; + if (Author[0].Length <= 1) + aut = Author[0][0]; else - aut = Marc[0][1]; + aut = Author[0][1]; AuthorSymbol.Symbol sb = new AuthorSymbol.Symbol(); - string res_Author = sb.Author_Fillter(Marc[0][0], isAuthor); + string res_Author = sb.Author_Fillter(Author[0][0], isAuthor); #region 콤보박스 선택 if (cb_authorType.SelectedIndex == 0) // 이재철 1표 - Marc[0] = sb.Symbol_1(aut); + Author[0] = sb.Symbol_1(aut); if (cb_authorType.SelectedIndex == 1) // 이재철 2표 - Marc[0] = sb.Symbol_2(aut); + Author[0] = sb.Symbol_2(aut); if (cb_authorType.SelectedIndex == 2) // 이재철 3표 - Marc[0] = sb.Symbol_3(aut); + Author[0] = sb.Symbol_3(aut); if (cb_authorType.SelectedIndex == 3) // 이재철 4표 - Marc[0] = sb.Symbol_4(aut); + Author[0] = sb.Symbol_4(aut); if (cb_authorType.SelectedIndex == 4) // 이재철 5표 - Marc[0] = sb.Symbol_5(aut); + Author[0] = sb.Symbol_5(aut); if (cb_authorType.SelectedIndex == 5) // 이재철 6표 - Marc[0] = sb.Symbol_6(aut); + Author[0] = sb.Symbol_6(aut); if (cb_authorType.SelectedIndex == 6) // 이재철 7표 - Marc[0] = sb.Symbol_7(aut); + Author[0] = sb.Symbol_7(aut); if (cb_authorType.SelectedIndex == 7) // 이재철 7표 (동양서저자기호표) - Marc[0] = sb.Symbol_7_동서(aut); + Author[0] = sb.Symbol_7_동서(aut); if (cb_authorType.SelectedIndex == 8) // 이재철 8표 - Marc[0] = sb.Symbol_8(aut); + Author[0] = sb.Symbol_8(aut); if (cb_authorType.SelectedIndex == 9) // 이재철 8표 (동양서저자기호표) - Marc[0] = sb.Symbol_8_동서(aut); + Author[0] = sb.Symbol_8_동서(aut); if (cb_authorType.SelectedIndex == 10) // 장일세 - Marc[0] = sb.Symbol_Jang(Marc[0]); + Author[0] = sb.Symbol_Jang(Marc[0]); if (cb_authorType.SelectedIndex == 11) // 커터샌본 - Marc[0] = sb.Cutter(Marc[0]); + Author[0] = sb.Cutter(Author[0]); if (cb_authorType.SelectedIndex == 12) // 엘러드 - Marc[0] = sb.Elord(Marc[0]); + Author[0] = sb.Elord(Author[0]); if (cb_authorType.SelectedIndex == 13) // 동서양 저자기호표(국중) - Marc[0] = sb.NLK(Marc[0]); + Author[0] = sb.NLK(Author[0]); #endregion - Marc[0] = Marc[0].Replace("|", ""); - res_Author += Marc[0] + sb.Book_Fillter(Marc[1], isBook); + Author[0] = Author[0].Replace("|", ""); + res_Author += Author[0] + sb.Book_Fillter(Author[1], isBook); - #region 분류기호 - string res_Div = cb_divType.Text + cb_divNum.Text; - #endregion - // DB_UPDATE 수량 체크 + insert_marc_data[13] = res_Author; + + string cmdByMarc = db.DB_INSERT("Specs_Marc", insert_marc_col, insert_marc_data); + db.DB_Send_CMD_reVoid(cmdByMarc); } } @@ -221,7 +252,8 @@ namespace UniMarc.마크 } else { - int end = tmp.IndexOf("", start + 2); + start += 2; + int end = tmp.IndexOf("", start); if (memo == result[b]) break; @@ -234,6 +266,14 @@ namespace UniMarc.마크 } } } + + for (int a = 0; a < result.Length; a++) + { + if (result[a] == null) + { + result[a] = ""; + } + } return result; } #region Take_Tag_Sub