diff --git a/unimarc/unimarc/Properties/AssemblyInfo.cs b/unimarc/unimarc/Properties/AssemblyInfo.cs
index 402b699..6084116 100644
--- a/unimarc/unimarc/Properties/AssemblyInfo.cs
+++ b/unimarc/unimarc/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
// 기본값으로 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2025.11.07.0000")]
-[assembly: AssemblyFileVersion("2025.11.07.0000")]
+[assembly: AssemblyVersion("2025.11.10.2200")]
+[assembly: AssemblyFileVersion("2025.11.10.2200")]
diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs
index 0902a97..fda6c1c 100644
--- a/unimarc/unimarc/마크/Marc.cs
+++ b/unimarc/unimarc/마크/Marc.cs
@@ -1598,6 +1598,7 @@ namespace ExcelTest
private void btn_mk_marcList_Click(object sender, EventArgs e)
{
Marc_mkList mkList = new Marc_mkList(this);
+ mkList.StartPosition = FormStartPosition.CenterScreen;
mkList.Show();
}
#region 마크생성목록_Sub
diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs
index 292d1a0..59d32f4 100644
--- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs
@@ -53,7 +53,7 @@
this.btn_Select_List = new System.Windows.Forms.Button();
this.chkBox_AllowDrop = new System.Windows.Forms.CheckBox();
this.panel3 = new System.Windows.Forms.Panel();
- this.cb_authorType = new System.Windows.Forms.ComboBox();
+ this.cb_authorTypeK = 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();
@@ -140,10 +140,11 @@
this.marc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.search_tag2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
- this.printDocument1 = new System.Drawing.Printing.PrintDocument();
- this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.printDocument1 = new System.Drawing.Printing.PrintDocument();
+ this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
+ this.cb_authorTypeE = new System.Windows.Forms.ComboBox();
this.panel1.SuspendLayout();
this.panel4.SuspendLayout();
this.panel3.SuspendLayout();
@@ -319,7 +320,8 @@
// panel3
//
this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel3.Controls.Add(this.cb_authorType);
+ this.panel3.Controls.Add(this.cb_authorTypeE);
+ this.panel3.Controls.Add(this.cb_authorTypeK);
this.panel3.Controls.Add(this.cb_divType);
this.panel3.Controls.Add(this.cb_divNum);
this.panel3.Controls.Add(this.cb_FirstBook);
@@ -328,18 +330,18 @@
this.panel3.Controls.Add(this.label4);
this.panel3.Location = new System.Drawing.Point(10, 3);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(566, 29);
+ this.panel3.Size = new System.Drawing.Size(566, 49);
this.panel3.TabIndex = 7;
//
- // cb_authorType
+ // cb_authorTypeK
//
- this.cb_authorType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cb_authorType.Enabled = false;
- this.cb_authorType.FormattingEnabled = true;
- this.cb_authorType.Location = new System.Drawing.Point(125, 3);
- this.cb_authorType.Name = "cb_authorType";
- this.cb_authorType.Size = new System.Drawing.Size(171, 20);
- this.cb_authorType.TabIndex = 1;
+ this.cb_authorTypeK.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_authorTypeK.Enabled = false;
+ this.cb_authorTypeK.FormattingEnabled = true;
+ this.cb_authorTypeK.Location = new System.Drawing.Point(125, 3);
+ this.cb_authorTypeK.Name = "cb_authorTypeK";
+ this.cb_authorTypeK.Size = new System.Drawing.Size(171, 20);
+ this.cb_authorTypeK.TabIndex = 1;
//
// cb_divType
//
@@ -505,7 +507,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
this.panel5.Location = new System.Drawing.Point(0, 35);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(1730, 35);
+ this.panel5.Size = new System.Drawing.Size(1730, 55);
this.panel5.TabIndex = 9;
//
// cbTag008_32
@@ -1001,9 +1003,9 @@
this.panel7.Controls.Add(this.toolStrip1);
this.panel7.Controls.Add(this.checkBox1);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel7.Location = new System.Drawing.Point(0, 70);
+ this.panel7.Location = new System.Drawing.Point(0, 90);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(1730, 783);
+ this.panel7.Size = new System.Drawing.Size(1730, 763);
this.panel7.TabIndex = 11;
//
// dataGridView1
@@ -1051,7 +1053,7 @@
this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(1730, 758);
+ this.dataGridView1.Size = new System.Drawing.Size(1730, 738);
this.dataGridView1.TabIndex = 1;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
@@ -1233,6 +1235,26 @@
this.colCheck.TrueValue = "T";
this.colCheck.Width = 27;
//
+ // toolStrip1
+ //
+ this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripButton1});
+ this.toolStrip1.Location = new System.Drawing.Point(0, 738);
+ this.toolStrip1.Name = "toolStrip1";
+ this.toolStrip1.Size = new System.Drawing.Size(1730, 25);
+ this.toolStrip1.TabIndex = 3;
+ this.toolStrip1.Text = "toolStrip1";
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(59, 22);
+ this.toolStripButton1.Text = "delete";
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ //
// printDocument1
//
this.printDocument1.BeginPrint += new System.Drawing.Printing.PrintEventHandler(this.printDocument1_BeginPrint);
@@ -1248,25 +1270,15 @@
this.printPreviewDialog1.Name = "printPreviewDialog1";
this.printPreviewDialog1.Visible = false;
//
- // toolStrip1
+ // cb_authorTypeE
//
- this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripButton1});
- this.toolStrip1.Location = new System.Drawing.Point(0, 758);
- this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(1730, 25);
- this.toolStrip1.TabIndex = 3;
- this.toolStrip1.Text = "toolStrip1";
- //
- // toolStripButton1
- //
- this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
- this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(59, 22);
- this.toolStripButton1.Text = "delete";
- this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_authorTypeE.Enabled = false;
+ this.cb_authorTypeE.FormattingEnabled = true;
+ this.cb_authorTypeE.Location = new System.Drawing.Point(125, 26);
+ this.cb_authorTypeE.Name = "cb_authorTypeE";
+ this.cb_authorTypeE.Size = new System.Drawing.Size(171, 20);
+ this.cb_authorTypeE.TabIndex = 2;
//
// Marc_Plan
//
@@ -1312,7 +1324,7 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btn_ChangeTag;
private System.Windows.Forms.Panel panel3;
- private System.Windows.Forms.ComboBox cb_authorType;
+ private System.Windows.Forms.ComboBox cb_authorTypeK;
private System.Windows.Forms.ComboBox cb_divType;
private System.Windows.Forms.ComboBox cb_divNum;
private System.Windows.Forms.ComboBox cb_FirstBook;
@@ -1411,5 +1423,6 @@
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ComboBox cb_authorTypeE;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs
index 623e6a7..554e8a1 100644
--- a/unimarc/unimarc/마크/Marc_Plan.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.cs
@@ -38,7 +38,8 @@ namespace WindowsFormsApp1.Mac
AuthorSymbol.Symbol sb = new AuthorSymbol.Symbol();
cb_FirstAuthor.Items.AddRange(sb.authorBook);
- cb_authorType.Items.AddRange(sb.authorType);
+ cb_authorTypeK.Items.AddRange(sb.authorType);
+ cb_authorTypeE.Items.AddRange(sb.authorType);
cb_FirstBook.Items.AddRange(sb.authorFirst);
string[] divType = { "KDC", "DDC" };
@@ -169,7 +170,7 @@ namespace WindowsFormsApp1.Mac
public void mk_Panel(string idx, string ListName, string date)
{
string Table = "Specs_List";
- string Area = "`first_Author`, `symbol_Author`, `book_Author`, `divType`, `divNum`";
+ string Area = "`first_Author`, `symbol_Author`,`symbol_AuthorE`, `book_Author`, `divType`, `divNum`";
string[] Search_col = { "idx", "work_list", "date" };
string[] Search_data = { idx, ListName, date };
@@ -179,10 +180,11 @@ namespace WindowsFormsApp1.Mac
string[] ary = res.Split('|');
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];
+ cb_authorTypeK.SelectedItem = ary[1];
+ cb_authorTypeE.SelectedItem = ary[2];
+ cb_FirstBook.SelectedItem = ary[3];
+ cb_divType.SelectedItem = ary[4];
+ cb_divNum.SelectedItem = ary[5];
}
#endregion
@@ -220,7 +222,7 @@ namespace WindowsFormsApp1.Mac
dataGridView1.Rows[row].Cells["ISBN"].Value.ToString()
};
string[] symbol_Type = {
- cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text,
+ cb_FirstAuthor.Text, cb_authorTypeK.Text, cb_authorTypeE.Text, cb_FirstBook.Text,
cb_divType.Text, cb_divNum.Text
};
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs
index 5ae9977..6c61dc5 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs
@@ -68,7 +68,7 @@ namespace UniMarc.마크
this.label6 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.panel3 = new System.Windows.Forms.Panel();
- this.cb_authorType = new System.Windows.Forms.ComboBox();
+ this.cb_authorTypeK = 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();
@@ -91,6 +91,7 @@ namespace UniMarc.마크
this.etcBox1 = new System.Windows.Forms.RichTextBox();
this.etcBox2 = new System.Windows.Forms.RichTextBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.cb_authorTypeE = new System.Windows.Forms.ComboBox();
this.panel1.SuspendLayout();
this.panel5.SuspendLayout();
this.panel6.SuspendLayout();
@@ -119,7 +120,7 @@ namespace UniMarc.마크
this.panel1.Controls.Add(this.btn_Back);
this.panel1.Location = new System.Drawing.Point(13, 12);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1087, 212);
+ this.panel1.Size = new System.Drawing.Size(1087, 248);
this.panel1.TabIndex = 0;
//
// label12
@@ -151,7 +152,7 @@ namespace UniMarc.마크
this.lbl_SaveData.AutoSize = true;
this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbl_SaveData.ForeColor = System.Drawing.SystemColors.ControlText;
- this.lbl_SaveData.Location = new System.Drawing.Point(188, 156);
+ this.lbl_SaveData.Location = new System.Drawing.Point(188, 189);
this.lbl_SaveData.Name = "lbl_SaveData";
this.lbl_SaveData.Size = new System.Drawing.Size(64, 19);
this.lbl_SaveData.TabIndex = 319;
@@ -163,7 +164,7 @@ namespace UniMarc.마크
this.lbl_ClassSymbol.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.lbl_ClassSymbol.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbl_ClassSymbol.ForeColor = System.Drawing.SystemColors.ControlText;
- this.lbl_ClassSymbol.Location = new System.Drawing.Point(354, 191);
+ this.lbl_ClassSymbol.Location = new System.Drawing.Point(354, 224);
this.lbl_ClassSymbol.Name = "lbl_ClassSymbol";
this.lbl_ClassSymbol.Size = new System.Drawing.Size(12, 13);
this.lbl_ClassSymbol.TabIndex = 5;
@@ -175,7 +176,7 @@ namespace UniMarc.마크
this.lbl_AuthorSymbol.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.lbl_AuthorSymbol.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbl_AuthorSymbol.ForeColor = System.Drawing.SystemColors.ControlText;
- this.lbl_AuthorSymbol.Location = new System.Drawing.Point(188, 191);
+ this.lbl_AuthorSymbol.Location = new System.Drawing.Point(188, 224);
this.lbl_AuthorSymbol.Name = "lbl_AuthorSymbol";
this.lbl_AuthorSymbol.Size = new System.Drawing.Size(12, 13);
this.lbl_AuthorSymbol.TabIndex = 5;
@@ -218,7 +219,7 @@ namespace UniMarc.마크
this.panel5.Controls.Add(this.label100);
this.panel5.Controls.Add(this.label101);
this.panel5.Controls.Add(this.comboBox1);
- this.panel5.Location = new System.Drawing.Point(179, 34);
+ this.panel5.Location = new System.Drawing.Point(179, 67);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(660, 84);
this.panel5.TabIndex = 3;
@@ -464,7 +465,7 @@ namespace UniMarc.마크
this.panel6.Controls.Add(this.tb_Mcode);
this.panel6.Controls.Add(this.label6);
this.panel6.Controls.Add(this.label8);
- this.panel6.Location = new System.Drawing.Point(179, 120);
+ this.panel6.Location = new System.Drawing.Point(179, 153);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(660, 30);
this.panel6.TabIndex = 3;
@@ -516,7 +517,8 @@ namespace UniMarc.마크
// panel3
//
this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel3.Controls.Add(this.cb_authorType);
+ this.panel3.Controls.Add(this.cb_authorTypeE);
+ this.panel3.Controls.Add(this.cb_authorTypeK);
this.panel3.Controls.Add(this.cb_divType);
this.panel3.Controls.Add(this.cb_divNum);
this.panel3.Controls.Add(this.cb_FirstBook);
@@ -525,17 +527,17 @@ namespace UniMarc.마크
this.panel3.Controls.Add(this.label1);
this.panel3.Location = new System.Drawing.Point(179, 2);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(660, 30);
+ this.panel3.Size = new System.Drawing.Size(660, 59);
this.panel3.TabIndex = 3;
//
- // cb_authorType
+ // cb_authorTypeK
//
- this.cb_authorType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cb_authorType.FormattingEnabled = true;
- this.cb_authorType.Location = new System.Drawing.Point(125, 4);
- this.cb_authorType.Name = "cb_authorType";
- this.cb_authorType.Size = new System.Drawing.Size(171, 20);
- this.cb_authorType.TabIndex = 1;
+ this.cb_authorTypeK.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_authorTypeK.FormattingEnabled = true;
+ this.cb_authorTypeK.Location = new System.Drawing.Point(125, 4);
+ this.cb_authorTypeK.Name = "cb_authorTypeK";
+ this.cb_authorTypeK.Size = new System.Drawing.Size(171, 20);
+ this.cb_authorTypeK.TabIndex = 1;
//
// cb_divType
//
@@ -597,7 +599,7 @@ namespace UniMarc.마크
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Location = new System.Drawing.Point(2, 2);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(175, 206);
+ this.pictureBox1.Size = new System.Drawing.Size(175, 235);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -641,7 +643,7 @@ namespace UniMarc.마크
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel2.Controls.Add(this.richTextBox1);
- this.panel2.Location = new System.Drawing.Point(13, 266);
+ this.panel2.Location = new System.Drawing.Point(13, 302);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(840, 458);
this.panel2.TabIndex = 2;
@@ -657,7 +659,7 @@ namespace UniMarc.마크
this.panel4.Controls.Add(this.label9);
this.panel4.Controls.Add(this.label11);
this.panel4.Controls.Add(this.label4);
- this.panel4.Location = new System.Drawing.Point(13, 230);
+ this.panel4.Location = new System.Drawing.Point(13, 266);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(1087, 30);
this.panel4.TabIndex = 246;
@@ -754,7 +756,7 @@ namespace UniMarc.마크
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.Controls.Add(this.etcBox2, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.etcBox1, 0, 0);
- this.tableLayoutPanel1.Location = new System.Drawing.Point(859, 266);
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(859, 303);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
@@ -762,11 +764,20 @@ namespace UniMarc.마크
this.tableLayoutPanel1.Size = new System.Drawing.Size(241, 458);
this.tableLayoutPanel1.TabIndex = 0;
//
+ // cb_authorTypeE
+ //
+ this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_authorTypeE.FormattingEnabled = true;
+ this.cb_authorTypeE.Location = new System.Drawing.Point(125, 30);
+ this.cb_authorTypeE.Name = "cb_authorTypeE";
+ this.cb_authorTypeE.Size = new System.Drawing.Size(171, 20);
+ this.cb_authorTypeE.TabIndex = 2;
+ //
// Marc_Plan_Sub_MarcEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1111, 736);
+ this.ClientSize = new System.Drawing.Size(1111, 768);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.panel4);
this.Controls.Add(this.panel2);
@@ -798,7 +809,7 @@ namespace UniMarc.마크
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Panel panel3;
- private System.Windows.Forms.ComboBox cb_authorType;
+ private System.Windows.Forms.ComboBox cb_authorTypeK;
private System.Windows.Forms.ComboBox cb_divType;
private System.Windows.Forms.ComboBox cb_divNum;
private System.Windows.Forms.ComboBox cb_FirstBook;
@@ -855,5 +866,6 @@ namespace UniMarc.마크
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.ComboBox cb_grade;
+ private System.Windows.Forms.ComboBox cb_authorTypeE;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs
index eeb929d..a41a648 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs
@@ -129,12 +129,14 @@ namespace UniMarc.마크
AuthorSymbol.Symbol sb = new AuthorSymbol.Symbol();
cb_FirstAuthor.Items.AddRange(sb.authorBook);
- cb_authorType.Items.AddRange(sb.authorType);
+ cb_authorTypeK.Items.AddRange(sb.authorType);
+ cb_authorTypeE.Items.AddRange(sb.authorType);
cb_FirstBook.Items.AddRange(sb.authorFirst);
cb_FirstAuthor.SelectedItem = Symbol_Type[0];
- cb_authorType.SelectedItem = Symbol_Type[1];
- cb_FirstBook.SelectedItem = Symbol_Type[2];
+ cb_authorTypeK.SelectedItem = Symbol_Type[1];
+ cb_authorTypeE.SelectedItem = Symbol_Type[2];
+ cb_FirstBook.SelectedItem = Symbol_Type[3];
#endregion
#region 분류기호
@@ -426,9 +428,9 @@ namespace UniMarc.마크
mp.dataGridView1.Rows[row].Cells["idx"].Value.ToString(),
mp.dataGridView1.Rows[row].Cells["ISBN"].Value.ToString()
};
- string[] Symbol_Type = {
- cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text
- };
+ //string[] Symbol_Type = {
+ // cb_FirstAuthor.Text, cb_authorTypeK.Text, cb_authorTypeE.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text
+ //};
Init(marc);
}
@@ -441,9 +443,9 @@ namespace UniMarc.마크
"",
si.dataGridView1.Rows[row].Cells["ISBN"].Value.ToString()
};
- string[] Symbol_Type = {
- cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text
- };
+ //string[] Symbol_Type = {
+ // cb_FirstAuthor.Text, cb_authorTypeK.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text
+ //};
Init(marc);
}
@@ -671,7 +673,7 @@ namespace UniMarc.마크
mp.dataGridView1.Rows[row].Cells["ISBN"].Value.ToString()
};
string[] Symbol_Type = {
- cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text
+ cb_FirstAuthor.Text, cb_authorTypeK.Text, cb_authorTypeE.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text
};
Init(marc);
@@ -745,7 +747,8 @@ namespace UniMarc.마크
if (cb_FirstBook.SelectedIndex == 0)
isType[1] = true;
- string authorType = cb_authorType.SelectedItem.ToString();
+ string authorTypeK = cb_authorTypeK.SelectedItem.ToString();
+ string authorTypeE = cb_authorTypeE.SelectedItem.ToString();
string ClassSymbol = string.Empty;
string Author = string.Empty;
@@ -811,7 +814,7 @@ namespace UniMarc.마크
AuthorSymbol.Symbol sb = new AuthorSymbol.Symbol();
- string AuthorSymbol = sb.SymbolAuthor(Author, BookName, authorType, isType);
+ string AuthorSymbol = sb.SymbolAuthor(Author, BookName, authorTypeK, authorTypeE, isType);
lbl_AuthorSymbol.Text = AuthorSymbol;
lbl_ClassSymbol.Text = ClassSymbol;
diff --git a/unimarc/unimarc/마크/Marc_mkList.Designer.cs b/unimarc/unimarc/마크/Marc_mkList.Designer.cs
index 9c9e574..273044e 100644
--- a/unimarc/unimarc/마크/Marc_mkList.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_mkList.Designer.cs
@@ -38,7 +38,8 @@ namespace UniMarc.마크
this.btn_mkList = new System.Windows.Forms.Button();
this.btn_Close = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
- this.cb_authorType = new System.Windows.Forms.ComboBox();
+ this.chk_CompSymbol = new System.Windows.Forms.CheckBox();
+ this.cb_authorTypeK = 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();
@@ -53,7 +54,11 @@ namespace UniMarc.마크
this.rtb_etc = new System.Windows.Forms.RichTextBox();
this.tb_outnum = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
- this.chk_CompSymbol = new System.Windows.Forms.CheckBox();
+ this.chkPijunja = new System.Windows.Forms.CheckBox();
+ this.cb_authorTypeE = new System.Windows.Forms.ComboBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.cmb_author_four = new System.Windows.Forms.ComboBox();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.panel3.SuspendLayout();
@@ -145,8 +150,13 @@ namespace UniMarc.마크
// panel3
//
this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel3.Controls.Add(this.cmb_author_four);
+ this.panel3.Controls.Add(this.label6);
+ this.panel3.Controls.Add(this.label5);
+ this.panel3.Controls.Add(this.cb_authorTypeE);
+ this.panel3.Controls.Add(this.chkPijunja);
this.panel3.Controls.Add(this.chk_CompSymbol);
- this.panel3.Controls.Add(this.cb_authorType);
+ this.panel3.Controls.Add(this.cb_authorTypeK);
this.panel3.Controls.Add(this.cb_divType);
this.panel3.Controls.Add(this.cb_divNum);
this.panel3.Controls.Add(this.cb_FirstBook);
@@ -154,23 +164,35 @@ namespace UniMarc.마크
this.panel3.Controls.Add(this.label1);
this.panel3.Location = new System.Drawing.Point(12, 42);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(569, 60);
+ this.panel3.Size = new System.Drawing.Size(569, 91);
this.panel3.TabIndex = 2;
//
- // cb_authorType
+ // chk_CompSymbol
//
- this.cb_authorType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cb_authorType.FormattingEnabled = true;
- this.cb_authorType.Location = new System.Drawing.Point(136, 4);
- this.cb_authorType.Name = "cb_authorType";
- this.cb_authorType.Size = new System.Drawing.Size(171, 20);
- this.cb_authorType.TabIndex = 1;
+ this.chk_CompSymbol.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.chk_CompSymbol.AutoSize = true;
+ this.chk_CompSymbol.Location = new System.Drawing.Point(11, 65);
+ this.chk_CompSymbol.Name = "chk_CompSymbol";
+ this.chk_CompSymbol.Size = new System.Drawing.Size(242, 16);
+ this.chk_CompSymbol.TabIndex = 2;
+ this.chk_CompSymbol.Text = "4인 이상 저자시 출판사로 저자기호 생성";
+ this.chk_CompSymbol.UseVisualStyleBackColor = true;
+ this.chk_CompSymbol.CheckedChanged += new System.EventHandler(this.chk_CompSymbol_CheckedChanged);
+ //
+ // cb_authorTypeK
+ //
+ this.cb_authorTypeK.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_authorTypeK.FormattingEnabled = true;
+ this.cb_authorTypeK.Location = new System.Drawing.Point(136, 4);
+ this.cb_authorTypeK.Name = "cb_authorTypeK";
+ this.cb_authorTypeK.Size = new System.Drawing.Size(171, 20);
+ this.cb_authorTypeK.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.Location = new System.Drawing.Point(464, 4);
this.cb_divType.Name = "cb_divType";
this.cb_divType.Size = new System.Drawing.Size(88, 20);
this.cb_divType.TabIndex = 1;
@@ -180,16 +202,16 @@ namespace UniMarc.마크
//
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.Location = new System.Drawing.Point(464, 30);
this.cb_divNum.Name = "cb_divNum";
- this.cb_divNum.Size = new System.Drawing.Size(61, 20);
+ this.cb_divNum.Size = new System.Drawing.Size(88, 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(313, 4);
+ this.cb_FirstBook.Location = new System.Drawing.Point(336, 4);
this.cb_FirstBook.Name = "cb_FirstBook";
this.cb_FirstBook.Size = new System.Drawing.Size(61, 20);
this.cb_FirstBook.TabIndex = 1;
@@ -217,7 +239,7 @@ namespace UniMarc.마크
this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel4.Controls.Add(this.tb_listName);
this.panel4.Controls.Add(this.label3);
- this.panel4.Location = new System.Drawing.Point(12, 108);
+ this.panel4.Location = new System.Drawing.Point(12, 139);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(569, 30);
this.panel4.TabIndex = 2;
@@ -242,7 +264,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(124, 148);
+ this.label2.Location = new System.Drawing.Point(134, 189);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(345, 13);
this.label2.TabIndex = 1;
@@ -250,9 +272,10 @@ namespace UniMarc.마크
//
// progressBar1
//
- this.progressBar1.Location = new System.Drawing.Point(12, 323);
+ this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.progressBar1.Location = new System.Drawing.Point(10, 411);
this.progressBar1.Name = "progressBar1";
- this.progressBar1.Size = new System.Drawing.Size(569, 23);
+ this.progressBar1.Size = new System.Drawing.Size(570, 23);
this.progressBar1.Step = 1;
this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.progressBar1.TabIndex = 3;
@@ -260,9 +283,10 @@ namespace UniMarc.마크
// groupBox1
//
this.groupBox1.Controls.Add(this.rtb_etc);
- this.groupBox1.Location = new System.Drawing.Point(15, 164);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.groupBox1.Location = new System.Drawing.Point(10, 224);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(566, 153);
+ this.groupBox1.Size = new System.Drawing.Size(570, 187);
this.groupBox1.TabIndex = 4;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "비 고 란";
@@ -273,7 +297,7 @@ namespace UniMarc.마크
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.Size = new System.Drawing.Size(564, 167);
this.rtb_etc.TabIndex = 0;
this.rtb_etc.Text = "";
//
@@ -295,21 +319,59 @@ namespace UniMarc.마크
this.label4.TabIndex = 3;
this.label4.Text = "차";
//
- // chk_CompSymbol
+ // chkPijunja
//
- this.chk_CompSymbol.AutoSize = true;
- this.chk_CompSymbol.Location = new System.Drawing.Point(11, 34);
- this.chk_CompSymbol.Name = "chk_CompSymbol";
- this.chk_CompSymbol.Size = new System.Drawing.Size(242, 16);
- this.chk_CompSymbol.TabIndex = 2;
- this.chk_CompSymbol.Text = "4인 이상 저자시 출판사로 저자기호 생성";
- this.chk_CompSymbol.UseVisualStyleBackColor = true;
+ this.chkPijunja.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.chkPijunja.AutoSize = true;
+ this.chkPijunja.Enabled = false;
+ this.chkPijunja.Location = new System.Drawing.Point(468, 65);
+ this.chkPijunja.Name = "chkPijunja";
+ this.chkPijunja.Size = new System.Drawing.Size(84, 16);
+ this.chkPijunja.TabIndex = 3;
+ this.chkPijunja.Text = "피전자적용";
+ this.chkPijunja.UseVisualStyleBackColor = true;
+ //
+ // cb_authorTypeE
+ //
+ this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_authorTypeE.FormattingEnabled = true;
+ this.cb_authorTypeE.Location = new System.Drawing.Point(136, 30);
+ this.cb_authorTypeE.Name = "cb_authorTypeE";
+ this.cb_authorTypeE.Size = new System.Drawing.Size(171, 20);
+ this.cb_authorTypeE.TabIndex = 4;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(313, 8);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(17, 12);
+ this.label5.TabIndex = 6;
+ this.label5.Text = "한";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(313, 33);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(17, 12);
+ this.label6.TabIndex = 7;
+ this.label6.Text = "영";
+ //
+ // cmb_author_four
+ //
+ this.cmb_author_four.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmb_author_four.FormattingEnabled = true;
+ this.cmb_author_four.Location = new System.Drawing.Point(259, 63);
+ this.cmb_author_four.Name = "cmb_author_four";
+ this.cmb_author_four.Size = new System.Drawing.Size(138, 20);
+ this.cmb_author_four.TabIndex = 8;
//
// Marc_mkList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(592, 357);
+ this.ClientSize = new System.Drawing.Size(590, 444);
this.Controls.Add(this.label4);
this.Controls.Add(this.tb_outnum);
this.Controls.Add(this.groupBox1);
@@ -322,6 +384,7 @@ namespace UniMarc.마크
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
this.Name = "Marc_mkList";
+ this.Padding = new System.Windows.Forms.Padding(10);
this.Text = "마크목록생성";
this.Load += new System.EventHandler(this.Marc_mkList_Load);
this.panel1.ResumeLayout(false);
@@ -349,7 +412,7 @@ namespace UniMarc.마크
private System.Windows.Forms.Button btn_mkList;
private System.Windows.Forms.Button btn_Close;
private System.Windows.Forms.Panel panel3;
- private System.Windows.Forms.ComboBox cb_authorType;
+ private System.Windows.Forms.ComboBox cb_authorTypeK;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox cb_FirstBook;
private System.Windows.Forms.ComboBox cb_FirstAuthor;
@@ -365,5 +428,10 @@ namespace UniMarc.마크
private System.Windows.Forms.TextBox tb_outnum;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.CheckBox chk_CompSymbol;
+ private System.Windows.Forms.CheckBox chkPijunja;
+ private System.Windows.Forms.ComboBox cb_authorTypeE;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.ComboBox cmb_author_four;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs
index e522bb2..85e215b 100644
--- a/unimarc/unimarc/마크/Marc_mkList.cs
+++ b/unimarc/unimarc/마크/Marc_mkList.cs
@@ -41,7 +41,7 @@ namespace UniMarc.마크
#region panel1 set
rb_basicNum.Checked = true;
rb_autoNum.Enabled = false;
-
+
string[] type = { "정리" };
cb_listType.Items.AddRange(type);
@@ -58,8 +58,11 @@ namespace UniMarc.마크
cb_FirstAuthor.SelectedIndex = 0;
string[] authorType = symbol.authorType;
- cb_authorType.Items.AddRange(authorType);
- cb_authorType.SelectedIndex = 0;
+ cb_authorTypeK.Items.AddRange(authorType);
+ cb_authorTypeK.SelectedIndex = 0;
+
+ cb_authorTypeE.Items.AddRange(authorType);
+ cb_authorTypeE.SelectedIndex = 0;
string[] Book = symbol.authorBook;
cb_FirstBook.Items.AddRange(Book);
@@ -69,17 +72,112 @@ namespace UniMarc.마크
string[] divType = { "KDC", "DDC" };
cb_divType.Items.AddRange(divType);
cb_divType.SelectedIndex = 0;
+
+ //4인이상저장
+ string[] author_four = { "출판사+서명", "서명+출판사" };
+ cmb_author_four.Items.AddRange(author_four);
+ cb_divType.SelectedIndex = 0;
+
#endregion
+
+ if (marc != null)
+ {
+ //customer idx 값이 있다면 그것을 사용한다.
+ if (int.TryParse(marc.lbCustIDX.Text, out int custidx) == true && custidx > 0)
+ {
+ string mCompidx = UniMarc.Properties.Settings.Default.compidx;
+ var dt = DB2.GetDT("Client", "c_sangho,c_author_first,c_author_typeK,c_author_typeE,c_author_firstbook,c_author_divtype,c_author_divnum,c_author_four,c_pijunja,c_author_four_use", $"campanyidx = {mCompidx} AND idx = {custidx}");
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ var row = dt.Rows[0];
+
+ // 저자기호 첫글자 설정 (c_author_first)
+ if (!string.IsNullOrEmpty(row["c_author_first"].ToString()))
+ {
+ int idx = cb_FirstAuthor.FindStringExact(row["c_author_first"].ToString());
+ if (idx >= 0) cb_FirstAuthor.SelectedIndex = idx;
+ }
+
+ // 저자기호 타입 설정 (c_author_typeK 또는 c_author_typeE)
+ if (!string.IsNullOrEmpty(row["c_author_typeK"].ToString()))
+ {
+ int idx = cb_authorTypeK.FindStringExact(row["c_author_typeK"].ToString());
+ if (idx >= 0) cb_authorTypeK.SelectedIndex = idx;
+ }
+
+ // 저자기호 타입 설정 (c_author_typeE 또는 c_author_typeE)
+ if (!string.IsNullOrEmpty(row["c_author_typeE"].ToString()))
+ {
+ int idx = cb_authorTypeE.FindStringExact(row["c_author_typeE"].ToString());
+ if (idx >= 0) cb_authorTypeE.SelectedIndex = idx;
+ }
+
+ // 도서기호 첫글자 설정 (c_author_firstbook)
+ if (!string.IsNullOrEmpty(row["c_author_firstbook"].ToString()))
+ {
+ int idx = cb_FirstBook.FindStringExact(row["c_author_firstbook"].ToString());
+ if (idx >= 0) cb_FirstBook.SelectedIndex = idx;
+ }
+
+ // 분류기호 타입 설정 (c_author_divtype)
+ if (!string.IsNullOrEmpty(row["c_author_divtype"].ToString()))
+ {
+ int idx = cb_divType.FindStringExact(row["c_author_divtype"].ToString());
+ if (idx >= 0) cb_divType.SelectedIndex = idx;
+ }
+
+ // 분류기호 자릿수 설정 (c_author_divnum)
+ if (!string.IsNullOrEmpty(row["c_author_divnum"].ToString()))
+ {
+ int idx = cb_divNum.FindStringExact(row["c_author_divnum"].ToString());
+ if (idx >= 0) cb_divNum.SelectedIndex = idx;
+ }
+
+ // 4인이상 저장(c_author_four)
+ if (!string.IsNullOrEmpty(row["c_author_four"].ToString()))
+ {
+ int idx = cmb_author_four.FindStringExact(row["c_author_four"].ToString());
+ if (idx >= 0) cmb_author_four.SelectedIndex = idx;
+ }
+
+ // 피전자적용
+ if (!string.IsNullOrEmpty(row["c_pijunja"].ToString()))
+ {
+ string chkvalue = row["c_pijunja"].ToString().Trim();
+ chkPijunja.Checked = (chkvalue == "1" || chkvalue.ToUpper() == "Y" || chkvalue.ToUpper() == "TRUE");
+ }
+ else
+ {
+ chkPijunja.Checked = false;
+ }
+
+ // 4인이상저자(사용여부)
+ if (!string.IsNullOrEmpty(row["c_author_four_use"].ToString()))
+ {
+ string chkvalue = row["c_author_four_use"].ToString().Trim();
+ chk_CompSymbol.Checked = (chkvalue == "1" || chkvalue.ToUpper() == "Y" || chkvalue.ToUpper() == "TRUE");
+ }
+ else
+ {
+ chk_CompSymbol.Checked = false;
+ }
+
+
+ }
+ }
+ }
}
private void cb_divType_SelectedIndexChanged(object sender, EventArgs e)
{
cb_divNum.Items.Clear();
- if (((ComboBox)sender).SelectedIndex == 0) {
+ if (((ComboBox)sender).SelectedIndex == 0)
+ {
string[] divNum = { "4", "5", "6" };
cb_divNum.Items.AddRange(divNum);
}
- else {
+ else
+ {
string[] divNum = { "21", "22", "23" };
cb_divNum.Items.AddRange(divNum);
}
@@ -89,11 +187,13 @@ namespace UniMarc.마크
private void btn_mkList_Click(object sender, EventArgs e)
{
String_Text st = new String_Text();
- if (tb_listName.Text == "") {
+ if (tb_listName.Text == "")
+ {
MessageBox.Show("목록명을 입력해주세요!");
return;
}
- if (tb_outnum.Text == "") {
+ if (tb_outnum.Text == "")
+ {
MessageBox.Show("차수가 비어있습니다.");
return;
}
@@ -110,16 +210,16 @@ namespace UniMarc.마크
if (cb_FirstBook.SelectedIndex == 0)
isBook = true;
bool[] isType = { isAuthor, isBook };
-
+
// 시방서 목록 DB에 들어갈 것들.
- string[] insert_list_col = {
+ string[] insert_list_col = {
"compidx", "work_list", "date", "state", "gu",
- "first_Author", "symbol_Author", "book_Author", "divType", "divNum",
+ "first_Author", "symbol_Author","symbol_AuthorE", "book_Author", "divType", "divNum",
"etc", "user"
};
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,
+ cb_FirstAuthor.Text, cb_authorTypeK.Text, cb_authorTypeE.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text,
rtb_etc.Text, user
};
string cmdByList = db.DB_INSERT("Specs_List", insert_list_col, insert_list_data);
@@ -172,7 +272,7 @@ namespace UniMarc.마크
insert_marc_data[18] = outnum;
insert_marc_data[19] = marc.List_Book.Rows[row[a]].Cells["marc_idx"].Value.ToString();
insert_marc_data[20] = marc.List_Book.Rows[row[a]].Cells["SaveDate"].Value.ToString();
- insert_marc_data[21] = marc.List_Book.Rows[row[a]].Cells["user"].Value.ToString();
+ insert_marc_data[21] = marc.List_Book.Rows[row[a]].Cells["user"].Value.ToString();
string[] Marc = st.Take_Tag(insert_marc_data[14], Search);
string[] Author = { "", Marc[1] }; // 저자, 도서명
@@ -185,11 +285,11 @@ namespace UniMarc.마크
if (Author_res[1].Length > 1) Author[0] = Author_res[1];
if (Author_res[2].Length > 1) Author[0] = Author_res[2];
- if(chk_CompSymbol.Checked)
+ if (chk_CompSymbol.Checked)
if (Author_res[3].IndexOf("[외]") > -1)
Author[0] = Marc[5];
- string tmp_ViewMarc = st.ConvertMarcType(insert_marc_data[14],out string errmessage);
+ string tmp_ViewMarc = st.ConvertMarcType(insert_marc_data[14], out string errmessage);
// 마크에서 추출한 데이터 DB에 적용하기 위한 반복문
for (int b = 0; b < Marc.Length; b++)
@@ -197,7 +297,8 @@ namespace UniMarc.마크
insert_marc_data[b + 3] = Marc[b];
// 분류기호 설정값적용대로 가져오기.
- if (b == 9) {
+ if (b == 9)
+ {
string class_symbol = st.TakeTag_ConditionContent(tmp_ViewMarc, "056a", "056" + cb_divNum.Text);
if (class_symbol != "")
insert_marc_data[b + 3] = class_symbol;
@@ -212,7 +313,8 @@ namespace UniMarc.마크
tmp_ViewMarc = st.AddTagInMarc(string.Format("056\t \t▼a{0}▼2{1}▲", insert_marc_data[12], cb_divNum.Text), tmp_ViewMarc);
insert_marc_data[14] = st.made_Ori_marc(tmp_ViewMarc);
- if (Author[0].Length < 1) {
+ if (Author[0].Length < 1)
+ {
MessageBox.Show(row[a] + "번째의 저자를 확인해주세요. \n (100a, 110a, 111a 중 1개 필수)");
return;
}
@@ -222,19 +324,27 @@ namespace UniMarc.마크
Author[1] = Regex.Replace(Author[1], @"[^a-zA-Z0-9가-힣_]", "", RegexOptions.Singleline);
AuthorSymbol.Symbol sb = new AuthorSymbol.Symbol();
- string authorType = cb_authorType.SelectedItem.ToString();
- string res_Author = sb.SymbolAuthor(Author[0], Author[1], authorType, isType);
+ string authorTypeK = cb_authorTypeK.SelectedItem.ToString();
+ string authorTypeE = cb_authorTypeE.SelectedItem.ToString();
+
+ string res_Author = "";
+ if (chk_CompSymbol.Checked == false || cmb_author_four.Text == "출판사+서명")
+ res_Author = sb.SymbolAuthor(Author[0], Author[1], authorTypeK, authorTypeE, isType);
+ else //서명+출판사는 뒤집어서 입력한다 251110
+ res_Author = sb.SymbolAuthor(Author[1], Author[0], authorTypeK, authorTypeE, isType);
insert_marc_data[13] = res_Author;
cmdByMarc += db.DB_INSERT_SUB("value", insert_marc_data) + ",";
- if (CountSplit && listCount > addCount) {
+ if (CountSplit && listCount > addCount)
+ {
a--;
addCount++;
continue;
}
- else {
+ else
+ {
addCount = 1;
progressBar1.PerformStep();
}
@@ -247,7 +357,8 @@ namespace UniMarc.마크
db.DB_Send_CMD_reVoid(cmdByMarc);
progressBar1.PerformStep();
- if (progressBar1.Value == progressBar1.Maximum) {
+ if (progressBar1.Value == progressBar1.Maximum)
+ {
label2.Text = "완료되었습니다!";
}
}
@@ -275,5 +386,9 @@ namespace UniMarc.마크
this.Close();
}
+ private void chk_CompSymbol_CheckedChanged(object sender, EventArgs e)
+ {
+ cmb_author_four.Enabled = chk_CompSymbol.Checked;
+ }
}
}
diff --git a/unimarc/unimarc/마크/Symbol_Add.Designer.cs b/unimarc/unimarc/마크/Symbol_Add.Designer.cs
index bea2c50..a780ead 100644
--- a/unimarc/unimarc/마크/Symbol_Add.Designer.cs
+++ b/unimarc/unimarc/마크/Symbol_Add.Designer.cs
@@ -30,7 +30,7 @@
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.label1 = new System.Windows.Forms.Label();
- this.cb_symbol = new System.Windows.Forms.ComboBox();
+ this.cb_symbolK = new System.Windows.Forms.ComboBox();
this.panel1 = new System.Windows.Forms.Panel();
this.panel8 = new System.Windows.Forms.Panel();
this.tb_result = new System.Windows.Forms.TextBox();
@@ -61,6 +61,9 @@
this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.AuthorSymbol = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.btn_GridTrans = new System.Windows.Forms.Button();
+ this.cb_symbolE = new System.Windows.Forms.ComboBox();
+ this.label8 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.panel8.SuspendLayout();
this.panel7.SuspendLayout();
@@ -81,15 +84,15 @@
this.label1.TabIndex = 5;
this.label1.Text = "저자기호표";
//
- // cb_symbol
+ // cb_symbolK
//
- this.cb_symbol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cb_symbol.FormattingEnabled = true;
- this.cb_symbol.Location = new System.Drawing.Point(191, 8);
- this.cb_symbol.Name = "cb_symbol";
- this.cb_symbol.Size = new System.Drawing.Size(366, 20);
- this.cb_symbol.TabIndex = 0;
- this.cb_symbol.SelectedIndexChanged += new System.EventHandler(this.cb_symbol_SelectedIndexChanged);
+ this.cb_symbolK.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_symbolK.FormattingEnabled = true;
+ this.cb_symbolK.Location = new System.Drawing.Point(191, 8);
+ this.cb_symbolK.Name = "cb_symbolK";
+ this.cb_symbolK.Size = new System.Drawing.Size(366, 20);
+ this.cb_symbolK.TabIndex = 0;
+ this.cb_symbolK.SelectedIndexChanged += new System.EventHandler(this.cb_symbol_SelectedIndexChanged);
//
// panel1
//
@@ -112,7 +115,7 @@
this.panel8.Controls.Add(this.tb_result);
this.panel8.Controls.Add(this.label7);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel8.Location = new System.Drawing.Point(0, 222);
+ this.panel8.Location = new System.Drawing.Point(0, 250);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(576, 37);
this.panel8.TabIndex = 6;
@@ -140,7 +143,7 @@
this.panel7.Controls.Add(this.label6);
this.panel7.Controls.Add(this.rb_moum2);
this.panel7.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel7.Location = new System.Drawing.Point(0, 185);
+ this.panel7.Location = new System.Drawing.Point(0, 213);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(576, 37);
this.panel7.TabIndex = 5;
@@ -185,7 +188,7 @@
this.panel6.Controls.Add(this.label5);
this.panel6.Controls.Add(this.rb_book2);
this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel6.Location = new System.Drawing.Point(0, 148);
+ this.panel6.Location = new System.Drawing.Point(0, 176);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(576, 37);
this.panel6.TabIndex = 4;
@@ -230,7 +233,7 @@
this.panel5.Controls.Add(this.label4);
this.panel5.Controls.Add(this.rb_author2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel5.Location = new System.Drawing.Point(0, 111);
+ this.panel5.Location = new System.Drawing.Point(0, 139);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(576, 37);
this.panel5.TabIndex = 3;
@@ -274,7 +277,7 @@
this.panel3.Controls.Add(this.tb_book);
this.panel3.Controls.Add(this.label3);
this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel3.Location = new System.Drawing.Point(0, 74);
+ this.panel3.Location = new System.Drawing.Point(0, 102);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(576, 37);
this.panel3.TabIndex = 2;
@@ -301,7 +304,7 @@
this.panel4.Controls.Add(this.tb_author);
this.panel4.Controls.Add(this.label2);
this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel4.Location = new System.Drawing.Point(0, 37);
+ this.panel4.Location = new System.Drawing.Point(0, 65);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(576, 37);
this.panel4.TabIndex = 1;
@@ -325,12 +328,15 @@
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel2.Controls.Add(this.cb_symbol);
+ this.panel2.Controls.Add(this.label9);
+ this.panel2.Controls.Add(this.label8);
+ this.panel2.Controls.Add(this.cb_symbolE);
+ this.panel2.Controls.Add(this.cb_symbolK);
this.panel2.Controls.Add(this.label1);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(576, 37);
+ this.panel2.Size = new System.Drawing.Size(576, 65);
this.panel2.TabIndex = 0;
//
// btn_close
@@ -405,6 +411,33 @@
this.btn_GridTrans.UseVisualStyleBackColor = true;
this.btn_GridTrans.Click += new System.EventHandler(this.btn_GridTrans_Click);
//
+ // cb_symbolE
+ //
+ this.cb_symbolE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_symbolE.FormattingEnabled = true;
+ this.cb_symbolE.Location = new System.Drawing.Point(191, 34);
+ this.cb_symbolE.Name = "cb_symbolE";
+ this.cb_symbolE.Size = new System.Drawing.Size(366, 20);
+ this.cb_symbolE.TabIndex = 6;
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(168, 12);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(17, 12);
+ this.label8.TabIndex = 7;
+ this.label8.Text = "한";
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(168, 37);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(17, 12);
+ this.label9.TabIndex = 8;
+ this.label9.Text = "영";
+ //
// Symbol_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -441,7 +474,7 @@
#endregion
private System.Windows.Forms.Label label1;
- private System.Windows.Forms.ComboBox cb_symbol;
+ private System.Windows.Forms.ComboBox cb_symbolK;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
@@ -472,5 +505,8 @@
private System.Windows.Forms.DataGridViewTextBoxColumn book_name;
private System.Windows.Forms.DataGridViewTextBoxColumn AuthorSymbol;
private System.Windows.Forms.Button btn_GridTrans;
+ private System.Windows.Forms.ComboBox cb_symbolE;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label9;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Symbol_Add.cs b/unimarc/unimarc/마크/Symbol_Add.cs
index 14ddc8c..36c5f8c 100644
--- a/unimarc/unimarc/마크/Symbol_Add.cs
+++ b/unimarc/unimarc/마크/Symbol_Add.cs
@@ -31,7 +31,8 @@ namespace WindowsFormsApp1.Mac
{
rb[a].Checked = true;
}
- cb_symbol.Items.AddRange(com_list);
+ cb_symbolK.Items.AddRange(com_list);
+ cb_symbolE.Items.AddRange(com_list);
}
private void button2_Click(object sender, EventArgs e)
@@ -44,7 +45,7 @@ namespace WindowsFormsApp1.Mac
MessageBox.Show("대표 저자를 입력해주세요!");
return;
}
- if (cb_symbol.Text == "커터 샌본 저자기호표")
+ if (cb_symbolK.Text == "커터 샌본 저자기호표")
{
if (!CheckEng(res))
{
@@ -52,7 +53,7 @@ namespace WindowsFormsApp1.Mac
return;
}
}
- else if (cb_symbol.Text == "동서양 저자기호법 (국중)") { }
+ else if (cb_symbolK.Text == "동서양 저자기호법 (국중)") { }
else
{
if (!CheckKor(res))
@@ -67,8 +68,11 @@ namespace WindowsFormsApp1.Mac
bool[] isType = { AuthorLookUp, BookLookUp };
string result = "";
- if (cb_symbol.SelectedIndex >= 0)
- result = sb.SymbolAuthor(res, book, cb_symbol.SelectedItem.ToString(), isType);
+ if (cb_symbolK.SelectedIndex >= 0)
+ {
+ result = sb.SymbolAuthor(res, book, cb_symbolK.SelectedItem.ToString(), cb_symbolE.SelectedItem.ToString(), isType);
+ }
+
tb_result.Text = result;
}
@@ -143,12 +147,12 @@ namespace WindowsFormsApp1.Mac
private void cb_symbol_SelectedIndexChanged(object sender, EventArgs e)
{
- if (cb_symbol.Text == "장일세 저자기호표" || cb_symbol.Text == "동서양 저자기호법 (국중)")
+ if (cb_symbolK.Text == "장일세 저자기호표" || cb_symbolK.Text == "동서양 저자기호법 (국중)")
{
rb_moum1.Enabled = false;
rb_moum2.Checked = true;
}
- else if (cb_symbol.Text == "커터 샌본 저자기호표")
+ else if (cb_symbolK.Text == "커터 샌본 저자기호표")
{
rb_author1.Checked = true;
rb_author2.Enabled = false;
@@ -157,7 +161,7 @@ namespace WindowsFormsApp1.Mac
rb_moum1.Enabled = false;
rb_moum2.Checked = true;
}
- else if (cb_symbol.Text == "엘러드 저자기호법")
+ else if (cb_symbolK.Text == "엘러드 저자기호법")
{
rb_author1.Enabled = false;
rb_author2.Enabled = false;
diff --git a/unimarc/unimarc/마크/Symbol_Sub.cs b/unimarc/unimarc/마크/Symbol_Sub.cs
index 069373d..ffe1e8f 100644
--- a/unimarc/unimarc/마크/Symbol_Sub.cs
+++ b/unimarc/unimarc/마크/Symbol_Sub.cs
@@ -19,7 +19,7 @@ namespace AuthorSymbol
///
public string[] authorFirst = { "첫음", "초성" };
- public string[] authorFour = { "서명+출판사","출판사+서명" };
+ public string[] authorFour = { "출판사+서명","서명+출판사" };
///
/// 저자기호표
///
@@ -1447,10 +1447,11 @@ namespace AuthorSymbol
///
/// 저자
/// 도서명
- /// 저자기호 타입
+ /// 저자기호 타입(한)
+ /// 저자기호 타입(영)
/// 저자첫음 / 서명첫음
///
- public string SymbolAuthor(string author, string book, string type, bool[] isType)
+ public string SymbolAuthor(string author, string book, string typeK,string typeE, bool[] isType)
{
string resAuthor = Author_Fillter(author[0], isType[0]);
string resBook = Book_Fillter(book, isType[1]);
@@ -1461,6 +1462,10 @@ namespace AuthorSymbol
else
aut = author[1];
+ //aut가 영문이면 typeE 를 쓰고 아닐경우 typeK를 쓴다.
+ bool isEnglish = (aut >= 'A' && aut <= 'Z') || (aut >= 'a' && aut <= 'z');
+ string type = isEnglish ? typeE : typeK;
+
#region 콤보박스 선택
string authorType = string.Empty;
if (type == this.authorType[0])
diff --git a/unimarc/unimarc/홈/Transaction_manage.Designer.cs b/unimarc/unimarc/홈/Transaction_manage.Designer.cs
index 7218925..684fb6c 100644
--- a/unimarc/unimarc/홈/Transaction_manage.Designer.cs
+++ b/unimarc/unimarc/홈/Transaction_manage.Designer.cs
@@ -111,6 +111,10 @@
this.panel3 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
this.panel9 = new System.Windows.Forms.Panel();
+ this.chk_pijunja = new System.Windows.Forms.CheckBox();
+ this.cb_author_four = new System.Windows.Forms.ComboBox();
+ this.chk_authorFour = new System.Windows.Forms.CheckBox();
+ this.cb_authorTypeE = new System.Windows.Forms.ComboBox();
this.cb_authorTypeK = new System.Windows.Forms.ComboBox();
this.cb_divType = new System.Windows.Forms.ComboBox();
this.cb_divNum = new System.Windows.Forms.ComboBox();
@@ -143,10 +147,6 @@
this.panel7 = new System.Windows.Forms.Panel();
this.panel6 = new System.Windows.Forms.Panel();
this.panel5 = new System.Windows.Forms.Panel();
- this.cb_authorTypeE = new System.Windows.Forms.ComboBox();
- this.label22 = new System.Windows.Forms.Label();
- this.cb_author_four = new System.Windows.Forms.ComboBox();
- this.chk_pijunja = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
this.contextMenuStrip1.SuspendLayout();
this.panel1.SuspendLayout();
@@ -895,7 +895,7 @@
this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel9.Controls.Add(this.chk_pijunja);
this.panel9.Controls.Add(this.cb_author_four);
- this.panel9.Controls.Add(this.label22);
+ this.panel9.Controls.Add(this.chk_authorFour);
this.panel9.Controls.Add(this.cb_authorTypeE);
this.panel9.Controls.Add(this.cb_authorTypeK);
this.panel9.Controls.Add(this.cb_divType);
@@ -909,6 +909,43 @@
this.panel9.Size = new System.Drawing.Size(118, 269);
this.panel9.TabIndex = 45;
//
+ // chk_pijunja
+ //
+ this.chk_pijunja.AutoSize = true;
+ this.chk_pijunja.Location = new System.Drawing.Point(7, 245);
+ this.chk_pijunja.Name = "chk_pijunja";
+ this.chk_pijunja.Size = new System.Drawing.Size(88, 16);
+ this.chk_pijunja.TabIndex = 5;
+ this.chk_pijunja.Text = "피전자 적용";
+ this.chk_pijunja.UseVisualStyleBackColor = true;
+ //
+ // cb_author_four
+ //
+ this.cb_author_four.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_author_four.FormattingEnabled = true;
+ this.cb_author_four.Location = new System.Drawing.Point(4, 217);
+ this.cb_author_four.Name = "cb_author_four";
+ this.cb_author_four.Size = new System.Drawing.Size(104, 20);
+ this.cb_author_four.TabIndex = 4;
+ //
+ // chkauthorFour
+ //
+ this.chk_authorFour.AutoSize = true;
+ this.chk_authorFour.Location = new System.Drawing.Point(5, 198);
+ this.chk_authorFour.Name = "chkauthorFour";
+ this.chk_authorFour.Size = new System.Drawing.Size(98, 16);
+ this.chk_authorFour.TabIndex = 3;
+ this.chk_authorFour.Text = "4인 이상 저자";
+ //
+ // cb_authorTypeE
+ //
+ this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_authorTypeE.FormattingEnabled = true;
+ this.cb_authorTypeE.Location = new System.Drawing.Point(4, 74);
+ this.cb_authorTypeE.Name = "cb_authorTypeE";
+ this.cb_authorTypeE.Size = new System.Drawing.Size(104, 20);
+ this.cb_authorTypeE.TabIndex = 2;
+ //
// cb_authorTypeK
//
this.cb_authorTypeK.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -1275,43 +1312,6 @@
this.panel5.Size = new System.Drawing.Size(830, 35);
this.panel5.TabIndex = 51;
//
- // cb_authorTypeE
- //
- this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cb_authorTypeE.FormattingEnabled = true;
- this.cb_authorTypeE.Location = new System.Drawing.Point(4, 74);
- this.cb_authorTypeE.Name = "cb_authorTypeE";
- this.cb_authorTypeE.Size = new System.Drawing.Size(104, 20);
- this.cb_authorTypeE.TabIndex = 2;
- //
- // label22
- //
- this.label22.AutoSize = true;
- this.label22.Location = new System.Drawing.Point(5, 198);
- this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(79, 12);
- this.label22.TabIndex = 3;
- this.label22.Text = "4인 이상 저자";
- //
- // cb_author_four
- //
- this.cb_author_four.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cb_author_four.FormattingEnabled = true;
- this.cb_author_four.Location = new System.Drawing.Point(4, 213);
- this.cb_author_four.Name = "cb_author_four";
- this.cb_author_four.Size = new System.Drawing.Size(104, 20);
- this.cb_author_four.TabIndex = 4;
- //
- // chk_pijunja
- //
- this.chk_pijunja.AutoSize = true;
- this.chk_pijunja.Location = new System.Drawing.Point(7, 241);
- this.chk_pijunja.Name = "chk_pijunja";
- this.chk_pijunja.Size = new System.Drawing.Size(88, 16);
- this.chk_pijunja.TabIndex = 5;
- this.chk_pijunja.Text = "피전자 적용";
- this.chk_pijunja.UseVisualStyleBackColor = true;
- //
// Transaction_manage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1454,7 +1454,7 @@
private System.Windows.Forms.Label label20;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.ComboBox cb_authorTypeE;
- private System.Windows.Forms.Label label22;
+ private System.Windows.Forms.CheckBox chk_authorFour;
private System.Windows.Forms.ComboBox cb_author_four;
private System.Windows.Forms.CheckBox chk_pijunja;
}
diff --git a/unimarc/unimarc/홈/Transaction_manage.cs b/unimarc/unimarc/홈/Transaction_manage.cs
index 0c8fd77..8b9e92d 100644
--- a/unimarc/unimarc/홈/Transaction_manage.cs
+++ b/unimarc/unimarc/홈/Transaction_manage.cs
@@ -64,6 +64,7 @@ namespace WindowsFormsApp1.Home
dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_divnum", HeaderText = "dvc_author_divnum", Visible = false });
dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_four", HeaderText = "dvc_author_four", Visible = false });
dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_pijunja", HeaderText = "dvc_pijunja", Visible = false });
+ dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_four_use", HeaderText = "dvc_author_four_use", Visible = false });
}
@@ -140,6 +141,7 @@ namespace WindowsFormsApp1.Home
cb_divType.SelectedIndex = -1;
cb_author_four.SelectedIndex = -1;
chk_pijunja.Checked = false;
+ chk_authorFour.Checked = false;
}
private bool Check_Data(string pText)
{
@@ -198,14 +200,15 @@ namespace WindowsFormsApp1.Home
"c_dlsPW", "c_division", "c_label", "c_program", "c_etc",
"campanyidx", "c_dlsArea" ,
"c_author_first", "c_author_typeK","c_author_typeE", "c_author_firstbook",
- "c_author_divtype", "c_author_divnum","c_author_four","c_pijunja"};
+ "c_author_divtype", "c_author_divnum","c_author_four","c_pijunja","c_author_four_use"};
string[] tmpdb1 = { tb_sangho.Text, cb_gubun2.Text, tb_boss.Text, tb_bubin.Text, tb_uptae.Text,
tb_jongmok.Text, tb_tel.Text, tb_fax.Text, tb_mail.Text, tb_man.Text,
tb_man1.Text, tb_user.Text, tb_zip.Text, tb_addr.Text, tb_id.Text,
tb_pw.Text, tb_division.Text, tb_label.Text, tb_program.Text, rtb_etc.Text,
compidx, cb_dlsArea.Text, cb_FirstAuthor.Text, cb_authorTypeK.Text,
- cb_authorTypeE.Text,cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text ,cb_author_four.Text,(chk_pijunja.Checked ? "1":"0") };
+ cb_authorTypeE.Text,cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text ,cb_author_four.Text,
+ (chk_pijunja.Checked ? "1":"0"),(chk_authorFour.Checked ? "1":"0") };
string[] tOldData = {
};
string Incmd = db.DB_INSERT("Client", tmpdb, tmpdb1);
@@ -260,7 +263,7 @@ namespace WindowsFormsApp1.Home
"c_dlsPW", "c_division", "c_label", "c_program", "c_etc",
"c_dlsArea" ,
"c_author_first", "c_author_typeK", "c_author_typeE","c_author_firstbook",
- "c_author_divtype", "c_author_divnum","c_author_four","c_pijunja"};
+ "c_author_divtype", "c_author_divnum","c_author_four","c_pijunja","c_author_four_use"};
string[] editname = { tb_sangho.Text, cb_gubun2.Text, tb_boss.Text, tb_bubin.Text, tb_uptae.Text,
tb_jongmok.Text, tb_tel.Text, tb_fax.Text, tb_mail.Text, tb_man.Text,
@@ -268,7 +271,7 @@ namespace WindowsFormsApp1.Home
tb_pw.Text, tb_division.Text, tb_label.Text, tb_program.Text, rtb_etc.Text,
cb_dlsArea.Text,
cb_FirstAuthor.Text, cb_authorTypeK.Text,cb_authorTypeE.Text, cb_FirstBook.Text,
- cb_divType.Text, cb_divNum.Text ,cb_author_four.Text,(chk_pijunja.Checked ? "1":"0") };
+ cb_divType.Text, cb_divNum.Text ,cb_author_four.Text,(chk_pijunja.Checked ? "1":"0") ,(chk_authorFour.Checked ? "1":"0") };
string[] searchcol = { "idx", "campanyidx" };
string[] searchname = { lbl_idx.Text, compidx };
@@ -368,6 +371,8 @@ namespace WindowsFormsApp1.Home
var author_divnum = dv1.Rows[RowIndex].Cells["dvc_author_divnum"].Value?.ToString() ?? string.Empty;
var author_four = dv1.Rows[RowIndex].Cells["dvc_author_four"].Value?.ToString() ?? string.Empty;
var pijunja = dv1.Rows[RowIndex].Cells["dvc_pijunja"].Value?.ToString() ?? "0";
+ var author_four_use = dv1.Rows[RowIndex].Cells["dvc_author_four_use"].Value?.ToString() ?? "0";
+
if (author_typeK.isEmpty() == false) cb_authorTypeK.Text = author_typeK;
else cb_authorTypeK.SelectedIndex = -1;
@@ -385,6 +390,7 @@ namespace WindowsFormsApp1.Home
else cb_author_four.SelectedIndex = -1;
chk_pijunja.Checked = pijunja == "1";
+ chk_authorFour.Checked = author_four_use == "1";
Select_Gubun(RowIndex);
}
private void Select_Gubun(int pRowIndex)
@@ -457,7 +463,7 @@ namespace WindowsFormsApp1.Home
"`c_dlsArea`, `c_dlsID`, `c_dlsPW`, `c_division`, `c_label`," +
"`c_program`, `c_etc`," +
"`c_author_first`, `c_author_typeK`, `c_author_typeE`,`c_author_firstbook`, " +
- "`c_author_divtype`, `c_author_divnum`, `c_author_four`, `c_pijunja`";
+ "`c_author_divtype`, `c_author_divnum`, `c_author_four`, `c_pijunja`, `c_author_four_use`";
string cmd = db.DB_Contains("Client", compidx, "c_sangho", tbSearch.Text, search);
db.DB_Send_CMD_Search_ApplyGrid(cmd, dv1);