diff --git a/unimarc/.vs/unimarc/FileContentIndex/239f7e4f-6851-4686-9757-0d6d4ec6690e.vsidx b/unimarc/.vs/unimarc/FileContentIndex/239f7e4f-6851-4686-9757-0d6d4ec6690e.vsidx new file mode 100644 index 0000000..e5c487b Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/239f7e4f-6851-4686-9757-0d6d4ec6690e.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/31d8301f-dacd-4c74-b60d-25dd79fc1ee0.vsidx b/unimarc/.vs/unimarc/FileContentIndex/31d8301f-dacd-4c74-b60d-25dd79fc1ee0.vsidx deleted file mode 100644 index 8ff9199..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/31d8301f-dacd-4c74-b60d-25dd79fc1ee0.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/387a1cf3-665f-4996-9af8-a42fbfa1c2ce.vsidx b/unimarc/.vs/unimarc/FileContentIndex/387a1cf3-665f-4996-9af8-a42fbfa1c2ce.vsidx deleted file mode 100644 index 596085e..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/387a1cf3-665f-4996-9af8-a42fbfa1c2ce.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/a691f3a6-77f0-48d6-b9e5-a43a0613a3a4.vsidx b/unimarc/.vs/unimarc/FileContentIndex/a691f3a6-77f0-48d6-b9e5-a43a0613a3a4.vsidx new file mode 100644 index 0000000..b6214ee Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/a691f3a6-77f0-48d6-b9e5-a43a0613a3a4.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/b0ec4298-76b5-43fb-b64b-d0bd35e9e8dd.vsidx b/unimarc/.vs/unimarc/FileContentIndex/b0ec4298-76b5-43fb-b64b-d0bd35e9e8dd.vsidx new file mode 100644 index 0000000..61cb61f Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/b0ec4298-76b5-43fb-b64b-d0bd35e9e8dd.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/f9ac97b0-8443-403b-917b-26a944e43fe8.vsidx b/unimarc/.vs/unimarc/FileContentIndex/f9ac97b0-8443-403b-917b-26a944e43fe8.vsidx deleted file mode 100644 index ef5377d..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/f9ac97b0-8443-403b-917b-26a944e43fe8.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo index 77d9c13..93e4a76 100644 Binary files a/unimarc/.vs/unimarc/v17/.suo and b/unimarc/.vs/unimarc/v17/.suo differ diff --git a/unimarc/.vs/unimarc/v17/fileList.bin b/unimarc/.vs/unimarc/v17/fileList.bin index 015c390..83cb721 100644 Binary files a/unimarc/.vs/unimarc/v17/fileList.bin and b/unimarc/.vs/unimarc/v17/fileList.bin differ diff --git a/unimarc/unimarc/Login.Designer.cs b/unimarc/unimarc/Login.Designer.cs index 40d5763..7f3b796 100644 --- a/unimarc/unimarc/Login.Designer.cs +++ b/unimarc/unimarc/Login.Designer.cs @@ -35,18 +35,21 @@ this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.chk_Save = new System.Windows.Forms.CheckBox(); - this.lbl_IP = new System.Windows.Forms.Label(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.panel2 = new System.Windows.Forms.Panel(); - this.panel3 = new System.Windows.Forms.Panel(); this.Version = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Content = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.panel1 = new System.Windows.Forms.Panel(); + this.lbl_IP = new System.Windows.Forms.ToolStripLabel(); + this.lbl_Version = new System.Windows.Forms.ToolStripLabel(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // ID_text @@ -114,15 +117,6 @@ this.chk_Save.Text = "ID / PW 저장"; this.chk_Save.UseVisualStyleBackColor = true; // - // lbl_IP - // - this.lbl_IP.AutoSize = true; - this.lbl_IP.Location = new System.Drawing.Point(9, 7); - this.lbl_IP.Name = "lbl_IP"; - this.lbl_IP.Size = new System.Drawing.Size(40, 12); - this.lbl_IP.TabIndex = 2; - this.lbl_IP.Text = "IPv4 : "; - // // dataGridView1 // this.dataGridView1.AllowUserToAddRows = false; @@ -145,6 +139,20 @@ this.dataGridView1.TabIndex = 0; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); // + // Version + // + this.Version.HeaderText = "버전"; + this.Version.Name = "Version"; + this.Version.ReadOnly = true; + this.Version.Width = 80; + // + // Content + // + this.Content.HeaderText = "내용"; + this.Content.Name = "Content"; + this.Content.ReadOnly = true; + this.Content.Visible = false; + // // richTextBox1 // this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -156,16 +164,6 @@ this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; // - // panel1 - // - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.lbl_IP); - this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 463); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(480, 27); - this.panel1.TabIndex = 7; - // // panel2 // this.panel2.Controls.Add(this.dataGridView1); @@ -185,19 +183,39 @@ this.panel3.Size = new System.Drawing.Size(380, 350); this.panel3.TabIndex = 9; // - // Version + // toolStrip1 // - this.Version.HeaderText = "버전"; - this.Version.Name = "Version"; - this.Version.ReadOnly = true; - this.Version.Width = 80; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.lbl_IP, + this.lbl_Version}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(478, 25); + this.toolStrip1.TabIndex = 0; + this.toolStrip1.Text = "toolStrip1"; // - // Content + // panel1 // - this.Content.HeaderText = "내용"; - this.Content.Name = "Content"; - this.Content.ReadOnly = true; - this.Content.Visible = false; + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.toolStrip1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel1.Location = new System.Drawing.Point(0, 463); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(480, 27); + this.panel1.TabIndex = 7; + // + // lbl_IP + // + this.lbl_IP.Name = "lbl_IP"; + this.lbl_IP.Size = new System.Drawing.Size(41, 22); + this.lbl_IP.Text = "IPv4 : "; + // + // lbl_Version + // + this.lbl_Version.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.lbl_Version.Name = "lbl_Version"; + this.lbl_Version.Size = new System.Drawing.Size(28, 22); + this.lbl_Version.Text = "Ver."; // // login // @@ -220,10 +238,12 @@ this.Text = "로그인"; this.Load += new System.EventHandler(this.login_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.panel2.ResumeLayout(false); this.panel3.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -238,13 +258,15 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.CheckBox chk_Save; - private System.Windows.Forms.Label lbl_IP; private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.DataGridView dataGridView1; - private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.DataGridViewTextBoxColumn Version; private System.Windows.Forms.DataGridViewTextBoxColumn Content; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripLabel lbl_IP; + private System.Windows.Forms.ToolStripLabel lbl_Version; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/unimarc/unimarc/Login.cs b/unimarc/unimarc/Login.cs index 1499382..33dced8 100644 --- a/unimarc/unimarc/Login.cs +++ b/unimarc/unimarc/Login.cs @@ -26,6 +26,7 @@ namespace WindowsFormsApp1 private void login_Load(object sender, EventArgs e) { lbl_IP.Text = String.Format("{0}", ip.GetIP); + lbl_Version.Text = string.Format("Ver.{0}", ip.VersionInfo()); this.ActiveControl = ID_text; diff --git a/unimarc/unimarc/Login.resx b/unimarc/unimarc/Login.resx index 2949462..7a465ed 100644 --- a/unimarc/unimarc/Login.resx +++ b/unimarc/unimarc/Login.resx @@ -129,4 +129,10 @@ True + + 4, 5 + + + 30 + \ No newline at end of file diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs index 3557963..c6dba3f 100644 --- a/unimarc/unimarc/Main.Designer.cs +++ b/unimarc/unimarc/Main.Designer.cs @@ -408,7 +408,7 @@ this.불용어, this.작업지시서}); this.마크설정.Name = "마크설정"; - this.마크설정.Size = new System.Drawing.Size(156, 22); + this.마크설정.Size = new System.Drawing.Size(180, 22); this.마크설정.Text = "설정"; // // 단축키설정 @@ -452,48 +452,48 @@ this.복본조사1, this.iSBN조회}); this.마크작업.Name = "마크작업"; - this.마크작업.Size = new System.Drawing.Size(156, 22); + this.마크작업.Size = new System.Drawing.Size(180, 22); this.마크작업.Text = "마크 작업"; // // 마크작성 // this.마크작성.Name = "마크작성"; - this.마크작성.Size = new System.Drawing.Size(146, 22); + this.마크작성.Size = new System.Drawing.Size(180, 22); this.마크작성.Text = "마크 작성"; this.마크작성.Click += new System.EventHandler(this.마크작성ToolStripMenuItem_Click); // // 마크목록 // this.마크목록.Name = "마크목록"; - this.마크목록.Size = new System.Drawing.Size(146, 22); + this.마크목록.Size = new System.Drawing.Size(180, 22); this.마크목록.Text = "마크 목록"; this.마크목록.Click += new System.EventHandler(this.마크목록ToolStripMenuItem_Click); // // 소장자료검색 // this.소장자료검색.Name = "소장자료검색"; - this.소장자료검색.Size = new System.Drawing.Size(146, 22); + this.소장자료검색.Size = new System.Drawing.Size(180, 22); this.소장자료검색.Text = "소장자료검색"; this.소장자료검색.Click += new System.EventHandler(this.소장자료검색ToolStripMenuItem_Click); // // 마크정리 // this.마크정리.Name = "마크정리"; - this.마크정리.Size = new System.Drawing.Size(146, 22); + this.마크정리.Size = new System.Drawing.Size(180, 22); this.마크정리.Text = "마크 정리"; this.마크정리.Click += new System.EventHandler(this.마크정리ToolStripMenuItem_Click); // // 복본조사1 // this.복본조사1.Name = "복본조사1"; - this.복본조사1.Size = new System.Drawing.Size(146, 22); + this.복본조사1.Size = new System.Drawing.Size(180, 22); this.복본조사1.Text = "복본조사"; this.복본조사1.Click += new System.EventHandler(this.복본조사ToolStripMenuItem1_Click); // // iSBN조회 // this.iSBN조회.Name = "iSBN조회"; - this.iSBN조회.Size = new System.Drawing.Size(146, 22); + this.iSBN조회.Size = new System.Drawing.Size(180, 22); this.iSBN조회.Text = "ISBN 조회"; this.iSBN조회.Click += new System.EventHandler(this.iSBN조회ToolStripMenuItem_Click); // @@ -503,20 +503,21 @@ this.목록, this.편목}); this.dVDCDLPToolStripMenuItem.Name = "dVDCDLPToolStripMenuItem"; - this.dVDCDLPToolStripMenuItem.Size = new System.Drawing.Size(156, 22); + this.dVDCDLPToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.dVDCDLPToolStripMenuItem.Text = "DVD / CD / LP"; // // 목록 // + this.목록.Enabled = false; this.목록.Name = "목록"; - this.목록.Size = new System.Drawing.Size(98, 22); + this.목록.Size = new System.Drawing.Size(180, 22); this.목록.Text = "목록"; this.목록.Click += new System.EventHandler(this.목록_Click); // // 편목 // this.편목.Name = "편목"; - this.편목.Size = new System.Drawing.Size(98, 22); + this.편목.Size = new System.Drawing.Size(180, 22); this.편목.Text = "편목"; this.편목.Click += new System.EventHandler(this.편목ToolStripMenuItem_Click); // @@ -526,7 +527,7 @@ this.마크반입, this.마크반출}); this.반입및반출.Name = "반입및반출"; - this.반입및반출.Size = new System.Drawing.Size(156, 22); + this.반입및반출.Size = new System.Drawing.Size(180, 22); this.반입및반출.Text = "반입 및 반출"; // // 마크반입 @@ -551,7 +552,7 @@ this.검수, this.저자기호}); this.부가기능.Name = "부가기능"; - this.부가기능.Size = new System.Drawing.Size(156, 22); + this.부가기능.Size = new System.Drawing.Size(180, 22); this.부가기능.Text = "부가기능"; // // 마크수집 @@ -592,7 +593,7 @@ this.DLS조회, this.dLS복본조사}); this.DLS.Name = "DLS"; - this.DLS.Size = new System.Drawing.Size(156, 22); + this.DLS.Size = new System.Drawing.Size(180, 22); this.DLS.Text = "DLS"; // // DLS조회 @@ -616,7 +617,7 @@ this.마크통계, this.장비관리}); this.마크기타.Name = "마크기타"; - this.마크기타.Size = new System.Drawing.Size(156, 22); + this.마크기타.Size = new System.Drawing.Size(180, 22); this.마크기타.Text = "기타"; // // 서류작성 diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs index 20cfea6..fa051d9 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -31,6 +31,7 @@ namespace WindowsFormsApp1 public partial class Main : Form { Helper_DB _DB = new Helper_DB(); + IP ip = new IP(); public string DB_User_Data; public string User; public string com_idx; @@ -48,7 +49,7 @@ namespace WindowsFormsApp1 login login = new login(); - VersionInfo(); + VersionText.Text = string.Format("UniMarc Ver.{0}", ip.VersionInfo()); if (DialogResult.OK == login.ShowDialog(this)) { this.Visible = true; @@ -93,19 +94,6 @@ namespace WindowsFormsApp1 catch (Exception ex) { MessageBox.Show(ex.ToString()); } } - private void VersionInfo() - { - StreamReader sr = new StreamReader(Application.StartupPath + "\\update.inf"); - while (!sr.EndOfStream) - { - string line = sr.ReadLine(); - if (line.IndexOf("count=", 0) != -1) - { - string version = line.Replace("count=", ""); - VersionText.Text = string.Format("UniMarc Ver {0}", version); - } - } - } #region 즐겨찾기 버튼 세팅 public void SetBtnName() diff --git a/unimarc/unimarc/Skill.cs b/unimarc/unimarc/Skill.cs index eb8064f..f0dacb6 100644 --- a/unimarc/unimarc/Skill.cs +++ b/unimarc/unimarc/Skill.cs @@ -1495,6 +1495,17 @@ namespace WindowsFormsApp1 return madeOrimarc(rich); } + /// + /// DVD CD LP 구분짓는 함수 + /// + /// + /// false일 경우 DVD CD LP + /// + public string made_Ori_marc(string rich, bool MarcType) + { + return madeOrimarc(rich, "ANSI", MarcType); + } + /// /// /// @@ -1511,7 +1522,7 @@ namespace WindowsFormsApp1 /// /// 데이터가 담긴 텍스트박스 /// 한줄짜리 마크데이터 - private string madeOrimarc(string rich, string EncodingType = "ANSI") + private string madeOrimarc(string rich, string EncodingType = "ANSI", bool MarcType = true) { string result = string.Empty; @@ -1600,6 +1611,7 @@ namespace WindowsFormsApp1 " ", "2", "2", "00000", " ", "k", " ", "4", "5", "0", "0" }; + if (!MarcType) 리더부[2] = "g"; 디렉토리 += ""; // 디렉토리 = 디렉토리.Replace("\n", ""); @@ -2791,5 +2803,20 @@ namespace WindowsFormsApp1 return externalIp; } } + public string VersionInfo() + { + string version = ""; + StreamReader sr = new StreamReader(Application.StartupPath + "\\update.inf"); + while (!sr.EndOfStream) + { + string line = sr.ReadLine(); + if (line.IndexOf("count=", 0) != -1) + { + version = line.Replace("count=", ""); + break; + } + } + return version; + } } } diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index f3cf40c..9f5fecb 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -129,6 +129,12 @@ CD_LP.cs + + Form + + + CD_LP_AddList.cs + Form @@ -826,6 +832,9 @@ CD_LP.cs + + CD_LP_AddList.cs + CD_LP_List.cs diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 32a9999..e8fda2c 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 15261a5..136bc08 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 e04cae4..ebe080f 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/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f4b67ca..034b1d5 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache index 3d0d07c..050e2fc 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -cefd76527107e25f6397322733756fe6454cd5e0 +c6748d9872ca9cb179a9864ec8df9b90804c3462 diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt index c146969..5bc8e5e 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt @@ -146,3 +146,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크. C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.AddMarc_FillBlank.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_Plan_ClassSymbol.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_Plan_GearExcel.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.CD_LP_AddList.resources diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index a3af23b..bf403c5 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 32a9999..e8fda2c 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 15261a5..136bc08 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.마크.CD_LP_AddList.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.CD_LP_AddList.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.CD_LP_AddList.resources differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index e04cae4..ebe080f 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/마크/CD_LP.Designer.cs b/unimarc/unimarc/마크/CD_LP.Designer.cs index a7d2290..a8c5ee6 100644 --- a/unimarc/unimarc/마크/CD_LP.Designer.cs +++ b/unimarc/unimarc/마크/CD_LP.Designer.cs @@ -29,13 +29,13 @@ namespace UniMarc.마크 /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel3 = new System.Windows.Forms.Panel(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.panel2 = new System.Windows.Forms.Panel(); this.Btn_New = new System.Windows.Forms.Button(); this.cb_Type = new System.Windows.Forms.ComboBox(); - this.button2 = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); this.Btn_SaveMarc = new System.Windows.Forms.Button(); this.Btn_Connect = new System.Windows.Forms.Button(); this.cb_SiteCon = new System.Windows.Forms.ComboBox(); @@ -58,12 +58,23 @@ namespace UniMarc.마크 this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.m_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel6 = new System.Windows.Forms.Panel(); + this.btn_AddRow = new System.Windows.Forms.Button(); + this.btn_mk_marcList = new System.Windows.Forms.Button(); + this.btn_SaveList = new System.Windows.Forms.Button(); + this.Btn_Undo = new System.Windows.Forms.Button(); + this.Btn_SelectRemove = new System.Windows.Forms.Button(); this.lbl_ListTitle = new System.Windows.Forms.Label(); this.lbl_date = new System.Windows.Forms.Label(); this.Btn_SelectList = new System.Windows.Forms.Button(); this.panel5 = new System.Windows.Forms.Panel(); + this.btn_CopySelect = new System.Windows.Forms.Button(); + this.panel8 = new System.Windows.Forms.Panel(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.etc1 = new System.Windows.Forms.RichTextBox(); + this.etc2 = new System.Windows.Forms.RichTextBox(); this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); this.panel1.SuspendLayout(); @@ -72,6 +83,8 @@ namespace UniMarc.마크 ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel6.SuspendLayout(); this.panel5.SuspendLayout(); + this.panel8.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panel3 @@ -81,7 +94,7 @@ namespace UniMarc.마크 this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Location = new System.Drawing.Point(0, 68); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(959, 666); + this.panel3.Size = new System.Drawing.Size(734, 666); this.panel3.TabIndex = 6; // // richTextBox1 @@ -89,9 +102,10 @@ namespace UniMarc.마크 this.richTextBox1.AcceptsTab = true; this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Font = new System.Drawing.Font("굴림체", 11.25F); this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(957, 664); + this.richTextBox1.Size = new System.Drawing.Size(732, 664); this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; this.richTextBox1.TextChanged += new System.EventHandler(this.richTextBox1_TextChanged); @@ -102,7 +116,7 @@ namespace UniMarc.마크 this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel2.Controls.Add(this.Btn_New); this.panel2.Controls.Add(this.cb_Type); - this.panel2.Controls.Add(this.button2); + this.panel2.Controls.Add(this.btn_Close); this.panel2.Controls.Add(this.Btn_SaveMarc); this.panel2.Controls.Add(this.Btn_Connect); this.panel2.Controls.Add(this.cb_SiteCon); @@ -114,11 +128,11 @@ namespace UniMarc.마크 // // Btn_New // - this.Btn_New.Location = new System.Drawing.Point(639, 4); + this.Btn_New.Location = new System.Drawing.Point(617, 4); this.Btn_New.Name = "Btn_New"; - this.Btn_New.Size = new System.Drawing.Size(75, 23); + this.Btn_New.Size = new System.Drawing.Size(97, 23); this.Btn_New.TabIndex = 4; - this.Btn_New.Text = "신규 등록"; + this.Btn_New.Text = "신규 등록(F8)"; this.Btn_New.UseVisualStyleBackColor = true; this.Btn_New.Click += new System.EventHandler(this.Btn_New_Click); // @@ -126,28 +140,28 @@ namespace UniMarc.마크 // this.cb_Type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_Type.FormattingEnabled = true; - this.cb_Type.Location = new System.Drawing.Point(564, 5); + this.cb_Type.Location = new System.Drawing.Point(545, 5); this.cb_Type.Name = "cb_Type"; this.cb_Type.Size = new System.Drawing.Size(69, 20); this.cb_Type.TabIndex = 3; // - // button2 + // btn_Close // - this.button2.Location = new System.Drawing.Point(801, 4); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 23); - this.button2.TabIndex = 2; - this.button2.Text = "닫 기"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); + this.btn_Close.Location = new System.Drawing.Point(817, 4); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(75, 23); + this.btn_Close.TabIndex = 2; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); // // Btn_SaveMarc // - this.Btn_SaveMarc.Location = new System.Drawing.Point(720, 4); + this.Btn_SaveMarc.Location = new System.Drawing.Point(717, 4); this.Btn_SaveMarc.Name = "Btn_SaveMarc"; - this.Btn_SaveMarc.Size = new System.Drawing.Size(75, 23); + this.Btn_SaveMarc.Size = new System.Drawing.Size(97, 23); this.Btn_SaveMarc.TabIndex = 2; - this.Btn_SaveMarc.Text = "마크 저장"; + this.Btn_SaveMarc.Text = "마크 저장(F9)"; this.Btn_SaveMarc.UseVisualStyleBackColor = true; this.Btn_SaveMarc.Click += new System.EventHandler(this.Btn_SaveMarc_Click); // @@ -268,23 +282,24 @@ namespace UniMarc.마크 // this.panel7.Controls.Add(this.dataGridView1); this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel7.Location = new System.Drawing.Point(0, 33); + this.panel7.Location = new System.Drawing.Point(0, 89); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(332, 701); + this.panel7.Size = new System.Drawing.Size(332, 645); this.panel7.TabIndex = 0; // // dataGridView1 // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - 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; + this.dataGridView1.AllowUserToResizeRows = false; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, @@ -294,14 +309,15 @@ namespace UniMarc.마크 this.author, this.comp, this.price, + this.m_idx, this.marc}); this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.ReadOnly = true; this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(332, 701); + this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView1.Size = new System.Drawing.Size(332, 645); this.dataGridView1.TabIndex = 0; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); // @@ -309,65 +325,119 @@ namespace UniMarc.마크 // this.idx.HeaderText = "idx"; this.idx.Name = "idx"; - this.idx.ReadOnly = true; this.idx.Visible = false; // // num // this.num.HeaderText = "연번"; this.num.Name = "num"; - this.num.ReadOnly = true; this.num.Width = 60; // // code // this.code.HeaderText = "상품코드"; this.code.Name = "code"; - this.code.ReadOnly = true; // // title // this.title.HeaderText = "상품명"; this.title.Name = "title"; - this.title.ReadOnly = true; // // author // this.author.HeaderText = "제작자"; this.author.Name = "author"; - this.author.ReadOnly = true; // // comp // this.comp.HeaderText = "제작사"; this.comp.Name = "comp"; - this.comp.ReadOnly = true; // // price // this.price.HeaderText = "정가"; this.price.Name = "price"; - this.price.ReadOnly = true; + // + // m_idx + // + this.m_idx.HeaderText = "마크인덱스"; + this.m_idx.Name = "m_idx"; + this.m_idx.Visible = false; // // marc // this.marc.HeaderText = "마크"; this.marc.Name = "marc"; - this.marc.ReadOnly = true; this.marc.Visible = false; // // panel6 // this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel6.Controls.Add(this.btn_CopySelect); + this.panel6.Controls.Add(this.btn_AddRow); + this.panel6.Controls.Add(this.btn_mk_marcList); + this.panel6.Controls.Add(this.btn_SaveList); + this.panel6.Controls.Add(this.Btn_Undo); + this.panel6.Controls.Add(this.Btn_SelectRemove); this.panel6.Controls.Add(this.lbl_ListTitle); this.panel6.Controls.Add(this.lbl_date); this.panel6.Controls.Add(this.Btn_SelectList); this.panel6.Dock = System.Windows.Forms.DockStyle.Top; this.panel6.Location = new System.Drawing.Point(0, 0); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(332, 33); + this.panel6.Size = new System.Drawing.Size(332, 89); this.panel6.TabIndex = 0; // + // btn_AddRow + // + this.btn_AddRow.Location = new System.Drawing.Point(167, 33); + this.btn_AddRow.Name = "btn_AddRow"; + this.btn_AddRow.Size = new System.Drawing.Size(75, 23); + this.btn_AddRow.TabIndex = 8; + this.btn_AddRow.Text = "행 추가"; + this.btn_AddRow.UseVisualStyleBackColor = true; + this.btn_AddRow.Click += new System.EventHandler(this.btn_AddRow_Click); + // + // btn_mk_marcList + // + this.btn_mk_marcList.Location = new System.Drawing.Point(243, 61); + this.btn_mk_marcList.Name = "btn_mk_marcList"; + this.btn_mk_marcList.Size = new System.Drawing.Size(85, 23); + this.btn_mk_marcList.TabIndex = 8; + this.btn_mk_marcList.Text = "장비목록생성"; + this.btn_mk_marcList.UseVisualStyleBackColor = true; + this.btn_mk_marcList.Click += new System.EventHandler(this.btn_mk_marcList_Click); + // + // btn_SaveList + // + this.btn_SaveList.Location = new System.Drawing.Point(248, 33); + this.btn_SaveList.Name = "btn_SaveList"; + this.btn_SaveList.Size = new System.Drawing.Size(75, 23); + this.btn_SaveList.TabIndex = 8; + this.btn_SaveList.Text = "목록 저장"; + this.btn_SaveList.UseVisualStyleBackColor = true; + this.btn_SaveList.Click += new System.EventHandler(this.btn_SaveList_Click); + // + // Btn_Undo + // + this.Btn_Undo.Location = new System.Drawing.Point(86, 33); + this.Btn_Undo.Name = "Btn_Undo"; + this.Btn_Undo.Size = new System.Drawing.Size(75, 23); + this.Btn_Undo.TabIndex = 4; + this.Btn_Undo.Text = "되돌리기"; + this.Btn_Undo.UseVisualStyleBackColor = true; + this.Btn_Undo.Click += new System.EventHandler(this.Btn_Undo_Click); + // + // Btn_SelectRemove + // + this.Btn_SelectRemove.Location = new System.Drawing.Point(5, 33); + this.Btn_SelectRemove.Name = "Btn_SelectRemove"; + this.Btn_SelectRemove.Size = new System.Drawing.Size(75, 23); + this.Btn_SelectRemove.TabIndex = 3; + this.Btn_SelectRemove.Text = "선택 삭제"; + this.Btn_SelectRemove.UseVisualStyleBackColor = true; + this.Btn_SelectRemove.Click += new System.EventHandler(this.Btn_SelectRemove_Click); + // // lbl_ListTitle // this.lbl_ListTitle.AutoSize = true; @@ -400,6 +470,7 @@ namespace UniMarc.마크 // panel5 // this.panel5.Controls.Add(this.panel3); + this.panel5.Controls.Add(this.panel8); this.panel5.Controls.Add(this.panel1); this.panel5.Controls.Add(this.panel2); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; @@ -408,6 +479,65 @@ namespace UniMarc.마크 this.panel5.Size = new System.Drawing.Size(959, 734); this.panel5.TabIndex = 8; // + // btn_CopySelect + // + this.btn_CopySelect.BackColor = System.Drawing.Color.Khaki; + this.btn_CopySelect.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.btn_CopySelect.Location = new System.Drawing.Point(207, 61); + this.btn_CopySelect.Name = "btn_CopySelect"; + this.btn_CopySelect.Size = new System.Drawing.Size(30, 23); + this.btn_CopySelect.TabIndex = 320; + this.btn_CopySelect.Text = "0"; + this.btn_CopySelect.UseVisualStyleBackColor = false; + this.btn_CopySelect.Click += new System.EventHandler(this.btn_CopySelect_Click); + // + // panel8 + // + this.panel8.Controls.Add(this.tableLayoutPanel1); + this.panel8.Dock = System.Windows.Forms.DockStyle.Right; + this.panel8.Location = new System.Drawing.Point(734, 68); + this.panel8.Name = "panel8"; + this.panel8.Size = new System.Drawing.Size(225, 666); + this.panel8.TabIndex = 9; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Controls.Add(this.etc2, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.etc1, 0, 0); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(225, 666); + this.tableLayoutPanel1.TabIndex = 0; + // + // etc1 + // + this.etc1.BackColor = System.Drawing.SystemColors.Window; + this.etc1.Dock = System.Windows.Forms.DockStyle.Fill; + this.etc1.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.etc1.Location = new System.Drawing.Point(3, 3); + this.etc1.Name = "etc1"; + this.etc1.Size = new System.Drawing.Size(219, 327); + this.etc1.TabIndex = 33; + this.etc1.Text = "Remark1"; + // + // etc2 + // + this.etc2.BackColor = System.Drawing.SystemColors.Window; + this.etc2.Dock = System.Windows.Forms.DockStyle.Fill; + this.etc2.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.etc2.Location = new System.Drawing.Point(3, 336); + this.etc2.Name = "etc2"; + this.etc2.Size = new System.Drawing.Size(219, 327); + this.etc2.TabIndex = 34; + this.etc2.Text = "Remark2"; + // // CD_LP // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -428,6 +558,8 @@ namespace UniMarc.마크 this.panel6.ResumeLayout(false); this.panel6.PerformLayout(); this.panel5.ResumeLayout(false); + this.panel8.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -448,17 +580,8 @@ namespace UniMarc.마크 private System.Windows.Forms.Panel panel5; private System.Windows.Forms.Panel panel7; private System.Windows.Forms.Panel panel6; - private System.Windows.Forms.DataGridView dataGridView1; private System.Windows.Forms.Button Btn_SelectList; - private System.Windows.Forms.DataGridViewTextBoxColumn idx; - private System.Windows.Forms.DataGridViewTextBoxColumn num; - private System.Windows.Forms.DataGridViewTextBoxColumn code; - private System.Windows.Forms.DataGridViewTextBoxColumn title; - private System.Windows.Forms.DataGridViewTextBoxColumn author; - private System.Windows.Forms.DataGridViewTextBoxColumn comp; - private System.Windows.Forms.DataGridViewTextBoxColumn price; - private System.Windows.Forms.DataGridViewTextBoxColumn marc; - private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.Button Btn_SaveMarc; public System.Windows.Forms.Label lbl_ListTitle; private System.Windows.Forms.ComboBox cb_Type; @@ -468,5 +591,25 @@ namespace UniMarc.마크 private System.Windows.Forms.Button Btn_New; public System.Windows.Forms.TextBox tb_T007; public System.Windows.Forms.TextBox tb_T008; + private System.Windows.Forms.Button Btn_SelectRemove; + private System.Windows.Forms.Button Btn_Undo; + private System.Windows.Forms.Button btn_AddRow; + private System.Windows.Forms.Button btn_SaveList; + private System.Windows.Forms.Button btn_mk_marcList; + private System.Windows.Forms.DataGridViewTextBoxColumn idx; + private System.Windows.Forms.DataGridViewTextBoxColumn num; + private System.Windows.Forms.DataGridViewTextBoxColumn code; + private System.Windows.Forms.DataGridViewTextBoxColumn title; + private System.Windows.Forms.DataGridViewTextBoxColumn author; + private System.Windows.Forms.DataGridViewTextBoxColumn comp; + private System.Windows.Forms.DataGridViewTextBoxColumn price; + private System.Windows.Forms.DataGridViewTextBoxColumn m_idx; + private System.Windows.Forms.DataGridViewTextBoxColumn marc; + private System.Windows.Forms.Button btn_CopySelect; + public System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Panel panel8; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + public System.Windows.Forms.RichTextBox etc1; + public System.Windows.Forms.RichTextBox etc2; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/CD_LP.cs b/unimarc/unimarc/마크/CD_LP.cs index 237d3b2..ad655eb 100644 --- a/unimarc/unimarc/마크/CD_LP.cs +++ b/unimarc/unimarc/마크/CD_LP.cs @@ -72,7 +72,7 @@ namespace UniMarc.마크 lbl_date.Text = date; string Table = "DVD_List_Product"; - string Area = "`idx`, `num`, `code`, `title`, `artist`, `comp`, `price`, `marc`"; + string Area = "`idx`, `num`, `code`, `title`, `artist`, `comp`, `price`, `m_idx`"; string[] Search_Table = { "compidx", "listname", "date" }; string[] Search_Column = { compidx, ListName, date }; @@ -80,120 +80,97 @@ namespace UniMarc.마크 string res = db.DB_Send_CMD_Search(cmd); string[] ary_res = res.Split('|'); - // idx num code title artist comp price marc - string[] grid = { "", "", "", "", "", "", "", "" }; + // idx num code title artist comp price m_idx Marc + string[] grid = { "", "", "", "", "", "", "", "", "" }; for (int a = 0; a < ary_res.Length; a++) { - if (a % grid.Length == 0) grid[0] = ary_res[a]; - if (a % grid.Length == 1) grid[1] = ary_res[a]; - if (a % grid.Length == 2) grid[2] = ary_res[a]; - if (a % grid.Length == 3) grid[3] = ary_res[a]; - if (a % grid.Length == 4) grid[4] = ary_res[a]; - if (a % grid.Length == 5) grid[5] = ary_res[a]; - if (a % grid.Length == 6) grid[6] = ary_res[a]; - if (a % grid.Length == 7) { + if (a % 8 == 0) grid[0] = ary_res[a]; + if (a % 8 == 1) grid[1] = ary_res[a]; + if (a % 8 == 2) grid[2] = ary_res[a]; + if (a % 8 == 3) grid[3] = ary_res[a]; + if (a % 8 == 4) grid[4] = ary_res[a]; + if (a % 8 == 5) grid[5] = ary_res[a]; + if (a % 8 == 6) grid[6] = ary_res[a]; + if (a % 8 == 7) { grid[7] = ary_res[a]; dataGridView1.Rows.Add(grid); } } + + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + string m_idx = dataGridView1.Rows[a].Cells["m_idx"].Value.ToString(); + string code = dataGridView1.Rows[a].Cells["code"].Value.ToString(); + if (m_idx != "") + cmd = string.Format("SELECT `Marc` FROM `DVD_Marc` WHERE `idx` = {0};", m_idx); + else + cmd = string.Format("SELECT `Marc` FROM `DVD_Marc` WHERE `Code` = {0} LIMIT 1;", code); + dataGridView1.Rows[a].Cells["marc"].Value = db.DB_Send_CMD_Search(cmd).Replace("|", ""); + } + } + + private void btn_CopySelect_Click(object sender, EventArgs e) + { + if (dataGridView1.CurrentCell == null) return; + + int row = dataGridView1.CurrentCell.RowIndex; + string code = dataGridView1.Rows[row].Cells["code"].Value.ToString(); + + MarcCopySelect copySelect = new MarcCopySelect(this); + copySelect.MarcFormRowIndex = row; + copySelect.Init("Code", code, "CDLP"); + copySelect.Show(); + } + public void SelectMarc_Sub(int row, string[] GridData) + { + dataGridView1.Rows[row].Cells["m_idx"].Value = GridData[0]; + dataGridView1.Rows[row].Cells["marc"].Value = GridData[6]; + } + + private void btn_mk_marcList_Click(object sender, EventArgs e) + { + Marc_mkList mkList = new Marc_mkList(this); + mkList.Show(); } private void Btn_SaveMarc_Click(object sender, EventArgs e) { + if (dataGridView1.CurrentRow == null) return; + if (dataGridView1.CurrentRow.Index < 0) return; + String_Text st = new String_Text(); - bool isAdd = true; - string Type = cb_Type.SelectedText; - string num = tb_Num.Text; - string listtitle = lbl_ListTitle.Text; - string date = lbl_date.Text; + int row = dataGridView1.CurrentRow.Index; + string midx = dataGridView1.Rows[row].Cells["m_idx"].Value.ToString(); + string code = dataGridView1.Rows[row].Cells["code"].Value.ToString(); + string user = Properties.Settings.Default.User; + string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - for (int a = 0; a < dataGridView1.RowCount; a++) - { - if (num.Length == 0) { - isAdd = true; - break; - } - if (num != dataGridView1.Rows[a].Cells["num"].Value.ToString()) - isAdd = true; - else { - isAdd = false; - break; - } - } + string etcData1 = etc1.Text; + string etcData2 = etc2.Text; + + if (etcData1 == "Remarc1") etcData1 = ""; + if (etcData2 == "Remarc2") etcData2 = ""; string t005 = tb_T005.Text; string t007 = tb_T007.Text; string t008 = tb_T008.Text; string marc = string.Format("005\t \t{0}▲\n007\t \t{1}▲\n008\t \t{2}▲\n", t005, t007, t008) + richTextBox1.Text; - string orimarc = st.made_Ori_marc(marc); + string orimarc = st.made_Ori_marc(marc, false); - // [0]code [1]price [2]title [3]comp - string[] SearchTag = { "020a", "020c", "245a", "260b" }; - string[] ContentTag = st.Take_Tag(orimarc, SearchTag); - - string[] artistTag = { "100a", "110a", "111a" }; - string[] ContentArtist = st.Take_Tag(orimarc, artistTag); - string artist = Takeartist(ContentArtist); - - if (isAdd) - { - // idx num code title artist comp price marc - string[] Grid = { "", num, ContentTag[0], ContentTag[2], artist, ContentTag[3], ContentTag[1], orimarc }; - dataGridView1.Rows.Add(Grid); - - // DB INSERT 준비 - string Table = "DVD_List_Product"; - string[] InsertTbl = { - "compidx", "listname", "date", "user", "num", - "code", "title", "artist", "comp", "price", - "marc", "type" - }; - string[] InsertCol = { - compidx, listtitle, date, name, num, - ContentTag[0], ContentTag[2], artist, ContentTag[3], ContentTag[1], - orimarc, Type - }; - string cmd = db.DB_INSERT(Table, InsertTbl, InsertCol); - db.DB_Send_CMD_reVoid(cmd); + if (!isSaveOK(orimarc, code)) { + MessageBox.Show("상품코드를 확인해주세요."); + return; } - else - { - string Table = "DVD_List_Product"; - string marcidx = ""; - for (int a = 0; a < dataGridView1.Rows.Count; a++) - { - if (dataGridView1.Rows[a].Cells["num"].Value.ToString() == num) - { - marcidx = dataGridView1.Rows[a].Cells["idx"].Value.ToString(); - dataGridView1.Rows[a].Cells["code"].Value = ContentTag[0]; - dataGridView1.Rows[a].Cells["title"].Value = ContentTag[2]; - dataGridView1.Rows[a].Cells["author"].Value = artist; - dataGridView1.Rows[a].Cells["comp"].Value = ContentTag[3]; - dataGridView1.Rows[a].Cells["price"].Value = ContentTag[1]; - dataGridView1.Rows[a].Cells["marc"].Value = orimarc; - break; - } - } - string[] SearchTbl, SearchCol; - if (marcidx.Length == 0) - { - SearchTbl = new string[] { "listname", "date", "compidx" }; - SearchCol = new string[] { listtitle, date, compidx }; - } - else - { - SearchTbl = new string[] { "idx" }; - SearchCol = new string[] { marcidx }; - } - string[] UpdateTbl = { "num", "code", "title", "artist", "comp", "price", "marc", "type" }; - string[] UpdateCol = { num, ContentTag[0], ContentTag[2], artist, ContentTag[3], ContentTag[1], orimarc, Type }; + string[] EditCol = { "Code", "user", "date", "Marc", "etc1", "etc2" }; + string[] EditData = { code, user, date, orimarc, etcData1, etcData2 }; + string[] SearchCol = { "idx" }; + string[] SearchData = { midx }; - string cmd = db.More_Update(Table, UpdateTbl, UpdateCol, SearchTbl, SearchCol); - db.DB_Send_CMD_reVoid(cmd); - } + db.DB_Send_CMD_reVoid(db.More_Update("DVD_Marc", EditCol, EditData, SearchCol, SearchData)); + dataGridView1.Rows[row].Cells["marc"].Value = orimarc; } #region 마크 저장 서브 함수 @@ -216,12 +193,66 @@ namespace UniMarc.마크 private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0) + return; + richTextBox1.Text = ""; + etc1.Text = "Remark1"; + etc2.Text = "Remark2"; int row = e.RowIndex; string SelectNum = dataGridView1.Rows[row].Cells["num"].Value.ToString(); string SelectMarc = dataGridView1.Rows[row].Cells["marc"].Value.ToString(); + string SelectMIdx = dataGridView1.Rows[row].Cells["m_idx"].Value.ToString(); + string SelectCode = dataGridView1.Rows[row].Cells["code"].Value.ToString(); + + if (SelectMIdx == "0") + Btn_SaveMarc.Enabled = false; + else + { + Btn_SaveMarc.Enabled = true; + string[] etcData = db.DB_Send_CMD_Search(string.Format("SELECT `etc1`, `etc2` FROM `DVD_Marc` WHERE `idx` = {0};", SelectMIdx)).Split('|'); + etc1.Text = etcData[0]; + etc2.Text = etcData[1]; + } + + btn_CopySelect.Text = db.DB_Send_CMD_Search( + string.Format("SELECT Count(`Code`) FROM DVD_Marc WHERE `Code` = \"{0}\" Group by `Code`;", SelectCode)).Replace("|", ""); tb_Num.Text = SelectNum; + if (SelectMarc == "") + { + richTextBox1.Text = + "020\t \t▼a:▼c▲\n" + + "041\t0 \t▼a▼b▼▲\n" + + "056\t \t▼a▼25▲\n" + + "090\t \t▼a▼b▲\n" + + "100\t1 \t▼a▲\n" + + "245\t10\t▼a▼h[녹음자료]/▼d▲\n" + + "260\t \t▼a:▼b [제작],▼c▲\n" + + "300\t \t▼a음반 1매:▼b디지털, 스테레오;▼c12 cm▲\n" + + "505\t00\t▼n01.▼t▲\n" + + "508\t \t▼a제작진:▲\n" + + "511\t8 \t▼a▲\n" + + "520\t \t▼a▲\n" + + "521\t \t▼a전체이용가▲\n" + + "653\t \t▼a▲\n" + + "700\t1 \t▼a▲\n" + + "740\t 2\t▼a▲\n" + + "950\t0 \t▼b\\▲"; + + if (cb_Type.SelectedIndex == 0) + { + tb_T007.Text = "sd fsngunmmned"; + tb_T008.Text = DateTime.Now.ToString("yyMMdd") + "s ulk n z a kor "; + } + else + { + tb_T007.Text = "vd cgairq"; + tb_T008.Text = DateTime.Now.ToString("yyMMdd") + "s ulk d avlkor "; + } + return; + } + String_Text st = new String_Text(); string ViewMarc = st.ConvertMarcType(SelectMarc); @@ -229,19 +260,15 @@ namespace UniMarc.마크 for (int a = 0; a < Tmp.Count; a++) { if (Tmp[a] == "") continue; - if (Tmp[a].Substring(0, 3) == "005") + else if (Tmp[a].Substring(0, 3) == "005") tb_T005.Text = Tmp[a].Replace("005\t \t", "").Replace("▲", ""); else if (Tmp[a].Substring(0, 3) == "007") tb_T007.Text = Tmp[a].Replace("007\t \t", "").Replace("▲", ""); else if (Tmp[a].Substring(0, 3) == "008") tb_T008.Text = Tmp[a].Replace("008\t \t", "").Replace("▲", ""); + else + richTextBox1.Text += Tmp[a] + "\n"; } - - Tmp.Remove("005"); - Tmp.Remove("007"); - Tmp.Remove("008"); - - richTextBox1.Text = String.Join("\n", Tmp.ToArray()); } private void Btn_Help007_Click(object sender, EventArgs e) @@ -267,51 +294,144 @@ namespace UniMarc.마크 private void Btn_New_Click(object sender, EventArgs e) { - int count = dataGridView1.RowCount + 1; - tb_Num.Text = count.ToString().PadLeft(3, '0'); + if (dataGridView1.CurrentRow == null) return; + if (dataGridView1.CurrentRow.Index < 0) return; - richTextBox1.Text = - "020\t \t▼a:▼c▲\n" + - "041\t0 \t▼a▼b▼▲\n" + - "056\t \t▼a▼25▲\n" + - "090\t \t▼a▼b▲\n" + - "100\t1 \t▼a▲\n" + - "245\t10\t▼a▼h[녹음자료]/▼d▲\n" + - "260\t \t▼a:▼b [제작],▼c▲\n" + - "300\t \t▼a음반 1매:▼b디지털, 스테레오;▼c12 cm▲\n" + - "505\t00\t▼n01.▼t▲\n" + - "508\t \t▼a제작진:▲\n" + - "511\t8 \t▼a▲\n" + - "520\t \t▼a▲\n" + - "521\t \t▼a전체이용가▲\n" + - "653\t \t▼a▲\n" + - "700\t1 \t▼a▲\n" + - "740\t 2\t▼a▲\n" + - "950\t0 \t▼b\\▲"; + String_Text st = new String_Text(); - if (cb_Type.SelectedIndex == 0) - { - tb_T007.Text = "sd fsngunmmned"; - tb_T008.Text = DateTime.Now.ToString("yyMMdd") + "s ulk n z a kor "; - } - else - { - tb_T007.Text = "vd cgairq"; - tb_T008.Text = DateTime.Now.ToString("yyMMdd") + "s ulk d avlkor "; + int row = dataGridView1.CurrentRow.Index; + string code = dataGridView1.Rows[row].Cells["code"].Value.ToString(); + string user = Properties.Settings.Default.User; + string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + string etcData1 = etc1.Text; + string etcData2 = etc2.Text; + + if (etcData1 == "Remarc1") etcData1 = ""; + if (etcData2 == "Remarc2") etcData2 = ""; + + string t005 = tb_T005.Text; + string t007 = tb_T007.Text; + string t008 = tb_T008.Text; + + string marc = string.Format("005\t \t{0}▲\n007\t \t{1}▲\n008\t \t{2}▲\n", t005, t007, t008) + richTextBox1.Text; + string orimarc = st.made_Ori_marc(marc, false); + + if (!isSaveOK(orimarc, code)) { + MessageBox.Show("상품코드를 확인해주세요."); + return; } + + string[] InsertCol = { "Code", "user", "date", "Marc", "etc1", "etc2" }; + string[] InsertData = { code, user, date, orimarc, etcData1, etcData2 }; + db.DB_Send_CMD_reVoid(db.DB_INSERT("DVD_Marc", InsertCol, InsertData)); + + dataGridView1.Rows[row].Cells["m_idx"].Value = + db.DB_Send_CMD_Search( + string.Format("SELECT `idx` FROM `DVD_Marc` WHERE `user` = \"{0}\" AND `date` = \"{1}\";", user, date)).Replace("|", ""); + dataGridView1.Rows[row].Cells["marc"].Value = orimarc; + } + + bool isSaveOK(string oriMarc, string code) + { + if (code == "") return false; + + String_Text st = new String_Text(); + string[] SearchTagList = { "020a" }; + string[] TagList = st.Take_Tag(oriMarc, SearchTagList); + + return TagList[0].Contains(code); } private void richTextBox1_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.F3) richTextBox1.SelectedText = "▼"; + else if (e.KeyCode == Keys.F4) richTextBox1.SelectedText = "▲"; + else if (e.KeyCode == Keys.F8) + Btn_New_Click(null, null); + else if (e.KeyCode == Keys.F9) + Btn_SaveMarc_Click(null, null); } - private void button2_Click(object sender, EventArgs e) + + DataGridViewRow tempSave = null; + int TempRow = -1; + List DeleteIndex = new List(); + + + private void Btn_SelectRemove_Click(object sender, EventArgs e) + { + if (dataGridView1.CurrentRow == null) return; + + if (dataGridView1.CurrentRow.Index < 0) return; + + TempRow = dataGridView1.CurrentRow.Index; + tempSave = dataGridView1.Rows[TempRow]; + DeleteIndex.Add(dataGridView1.Rows[TempRow].Cells["idx"].Value.ToString()); + + dataGridView1.Rows.RemoveAt(TempRow); + } + + private void Btn_Undo_Click(object sender, EventArgs e) + { + if (tempSave == null || TempRow < 0) return; + + try { + dataGridView1.Rows.Insert(TempRow, tempSave); + DeleteIndex.Remove(tempSave.Cells["idx"].Value.ToString()); + } + catch (InvalidOperationException ex) { + return; + } + } + + private void btn_SaveList_Click(object sender, EventArgs e) + { + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["idx"].Value == null) dataGridView1.Rows[a].Cells["idx"].Value = ""; + if (dataGridView1.Rows[a].Cells["idx"].Value.ToString() == "") + { + string[] Insert_col = { "compidx", "listname", "date", "user", "num", "code", "title", "artist", "comp", "price" }; + string[] Insert_data = + { + compidx, + lbl_ListTitle.Text, + lbl_date.Text, + Properties.Settings.Default.User, + dataGridView1.Rows[a].Cells["num"].Value.ToString(), + dataGridView1.Rows[a].Cells["code"].Value.ToString(), + dataGridView1.Rows[a].Cells["title"].Value.ToString(), + dataGridView1.Rows[a].Cells["author"].Value.ToString(), + dataGridView1.Rows[a].Cells["comp"].Value.ToString(), + dataGridView1.Rows[a].Cells["price"].Value.ToString() + }; + db.DB_Send_CMD_reVoid(db.DB_INSERT("DVD_List_Product", Insert_col, Insert_data)); + } + } + + if (DeleteIndex.Count < 0) return; + + for (int a = 0; a < DeleteIndex.Count; a++) + { + db.DB_Send_CMD_reVoid(db.DB_Delete("DVD_List_Product", "compidx", compidx, "idx", DeleteIndex[a])); + } + } + + private void btn_AddRow_Click(object sender, EventArgs e) + { + if (dataGridView1.CurrentRow == null) return; + int row = dataGridView1.CurrentRow.Index; + string[] Grid = { "", dataGridView1.Rows[row].Cells["num"].Value.ToString(), "", "", "", "", "", "", "" }; + dataGridView1.Rows.Insert(row + 1, Grid); + } + + private void btn_Close_Click(object sender, EventArgs e) { this.Close(); } diff --git a/unimarc/unimarc/마크/CD_LP.resx b/unimarc/unimarc/마크/CD_LP.resx index 1575cf0..29d759c 100644 --- a/unimarc/unimarc/마크/CD_LP.resx +++ b/unimarc/unimarc/마크/CD_LP.resx @@ -138,6 +138,9 @@ True + + True + True diff --git a/unimarc/unimarc/마크/CD_LP_AddList.Designer.cs b/unimarc/unimarc/마크/CD_LP_AddList.Designer.cs new file mode 100644 index 0000000..ddb9503 --- /dev/null +++ b/unimarc/unimarc/마크/CD_LP_AddList.Designer.cs @@ -0,0 +1,228 @@ +namespace UniMarc.마크 +{ + partial class CD_LP_AddList + { + /// + /// 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() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.label4 = new System.Windows.Forms.Label(); + this.tb_ExpectList = new System.Windows.Forms.TextBox(); + this.btn_DelRow = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.btn_Empty = new System.Windows.Forms.Button(); + this.btn_AddList = new System.Windows.Forms.Button(); + this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.title = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.artist = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.Controls.Add(this.btn_DelRow); + this.panel1.Controls.Add(this.btn_Close); + this.panel1.Controls.Add(this.btn_Empty); + this.panel1.Controls.Add(this.btn_AddList); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.tb_ExpectList); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(729, 33); + this.panel1.TabIndex = 0; + // + // panel2 + // + this.panel2.Controls.Add(this.dataGridView1); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(0, 33); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(729, 546); + this.panel2.TabIndex = 0; + // + // dataGridView1 + // + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Code, + this.title, + this.artist, + this.Comp, + this.Price}); + this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView1.Location = new System.Drawing.Point(0, 0); + this.dataGridView1.Name = "dataGridView1"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(729, 546); + this.dataGridView1.TabIndex = 0; + this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); + this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(9, 10); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(81, 12); + this.label4.TabIndex = 13; + this.label4.Text = "생성될 목록명"; + // + // tb_ExpectList + // + this.tb_ExpectList.Enabled = false; + this.tb_ExpectList.Location = new System.Drawing.Point(96, 6); + this.tb_ExpectList.Name = "tb_ExpectList"; + this.tb_ExpectList.Size = new System.Drawing.Size(250, 21); + this.tb_ExpectList.TabIndex = 14; + // + // btn_DelRow + // + this.btn_DelRow.Location = new System.Drawing.Point(393, 5); + this.btn_DelRow.Name = "btn_DelRow"; + this.btn_DelRow.Size = new System.Drawing.Size(81, 23); + this.btn_DelRow.TabIndex = 17; + this.btn_DelRow.Text = "선택 셀 삭제"; + this.btn_DelRow.UseVisualStyleBackColor = true; + this.btn_DelRow.Click += new System.EventHandler(this.btn_DelRow_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(642, 5); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(75, 23); + this.btn_Close.TabIndex = 18; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // btn_Empty + // + this.btn_Empty.Location = new System.Drawing.Point(480, 5); + this.btn_Empty.Name = "btn_Empty"; + this.btn_Empty.Size = new System.Drawing.Size(75, 23); + this.btn_Empty.TabIndex = 16; + this.btn_Empty.Text = "비 우 기"; + this.btn_Empty.UseVisualStyleBackColor = true; + this.btn_Empty.Click += new System.EventHandler(this.btn_Empty_Click); + // + // btn_AddList + // + this.btn_AddList.Location = new System.Drawing.Point(561, 5); + this.btn_AddList.Name = "btn_AddList"; + this.btn_AddList.Size = new System.Drawing.Size(75, 23); + this.btn_AddList.TabIndex = 15; + this.btn_AddList.Text = "저 장"; + this.btn_AddList.UseVisualStyleBackColor = true; + this.btn_AddList.Click += new System.EventHandler(this.btn_AddList_Click); + // + // Code + // + this.Code.HeaderText = "상품코드"; + this.Code.Name = "Code"; + // + // title + // + this.title.HeaderText = "상품명"; + this.title.Name = "title"; + this.title.Width = 250; + // + // artist + // + this.artist.HeaderText = "제작자"; + this.artist.Name = "artist"; + // + // Comp + // + this.Comp.HeaderText = "제작회사"; + this.Comp.Name = "Comp"; + this.Comp.Width = 120; + // + // Price + // + this.Price.HeaderText = "가격"; + this.Price.Name = "Price"; + // + // CD_LP_AddList + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(729, 579); + this.Controls.Add(this.panel2); + this.Controls.Add(this.panel1); + this.Name = "CD_LP_AddList"; + this.Text = "CD_LP_AddList"; + this.Load += new System.EventHandler(this.CD_LP_AddList_Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox tb_ExpectList; + private System.Windows.Forms.Button btn_DelRow; + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.Button btn_Empty; + private System.Windows.Forms.Button btn_AddList; + private System.Windows.Forms.DataGridViewTextBoxColumn Code; + private System.Windows.Forms.DataGridViewTextBoxColumn title; + private System.Windows.Forms.DataGridViewTextBoxColumn artist; + private System.Windows.Forms.DataGridViewTextBoxColumn Comp; + private System.Windows.Forms.DataGridViewTextBoxColumn Price; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/CD_LP_AddList.cs b/unimarc/unimarc/마크/CD_LP_AddList.cs new file mode 100644 index 0000000..6bba463 --- /dev/null +++ b/unimarc/unimarc/마크/CD_LP_AddList.cs @@ -0,0 +1,104 @@ +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 CD_LP_AddList : Form + { + Skill_Grid sg = new Skill_Grid(); + Helper_DB db = new Helper_DB(); + + public CD_LP_AddList() + { + InitializeComponent(); + } + + private void CD_LP_AddList_Load(object sender, EventArgs e) + { + db.DBcon(); + } + + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + sg.Print_Grid_Num(sender, e); + } + + private void btn_DelRow_Click(object sender, EventArgs e) + { + if (dataGridView1.CurrentCell.RowIndex > 0) return; + int row = dataGridView1.CurrentCell.RowIndex; + + dataGridView1.Rows.RemoveAt(row); + } + + private void btn_Empty_Click(object sender, EventArgs e) + { + tb_ExpectList.Text = ""; + dataGridView1.Rows.Clear(); + } + + private void btn_AddList_Click(object sender, EventArgs e) + { + string listName = tb_ExpectList.Text; + string date = DateTime.Now.ToString("yyyy-MM-dd"); + string compidx = Properties.Settings.Default.compidx; + string user = Properties.Settings.Default.User; + + if (listName == "") { + MessageBox.Show("목록명이 비어있습니다!"); + return; + } + + string[] list_col = { "compidx", "listname", "date", "user" }; + string[] list_data = { compidx, listName, date, user }; + + string listCMD = db.DB_INSERT("DVD_List", list_col, list_data); + + string[] Product_col = { "listname", "date", "compidx", "user", "code", "title", "artist", "comp", "price", "num" }; + string[] Product_data = { listName, date, compidx, user, "", "", "", "", "", "" }; + string ProductCMD = string.Format("INSERT INTO {0} {1} value", "DVD_List_Product", Product_col); + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["Code"].Value == null) dataGridView1.Rows[a].Cells["Code"].Value = ""; + if (dataGridView1.Rows[a].Cells["title"].Value == null) dataGridView1.Rows[a].Cells["title"].Value = ""; + if (dataGridView1.Rows[a].Cells["artist"].Value == null) dataGridView1.Rows[a].Cells["artist"].Value = ""; + if (dataGridView1.Rows[a].Cells["Comp"].Value == null) dataGridView1.Rows[a].Cells["Comp"].Value = ""; + if (dataGridView1.Rows[a].Cells["Price"].Value == null) dataGridView1.Rows[a].Cells["Price"].Value = ""; + + Product_data[4] = dataGridView1.Rows[a].Cells["Code"].Value.ToString(); + Product_data[5] = dataGridView1.Rows[a].Cells["title"].Value.ToString(); + Product_data[6] = dataGridView1.Rows[a].Cells["artist"].Value.ToString(); + Product_data[7] = dataGridView1.Rows[a].Cells["Comp"].Value.ToString(); + Product_data[8] = dataGridView1.Rows[a].Cells["Price"].Value.ToString(); + Product_data[9] = a.ToString(); + + ProductCMD += db.DB_INSERT_SUB("value", Product_data) + ","; + } + ProductCMD = ProductCMD.TrimEnd(','); + ProductCMD += ";"; + + db.DB_Send_CMD_reVoid(listCMD); + db.DB_Send_CMD_reVoid(ProductCMD); + + MessageBox.Show("저장되었습니다."); + } + + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void dataGridView1_KeyDown(object sender, KeyEventArgs e) + { + sg.Excel_to_DataGridView(sender, e); + } + } +} diff --git a/unimarc/unimarc/마크/CD_LP_AddList.resx b/unimarc/unimarc/마크/CD_LP_AddList.resx new file mode 100644 index 0000000..3b6a391 --- /dev/null +++ b/unimarc/unimarc/마크/CD_LP_AddList.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/CD_LP_List.Designer.cs b/unimarc/unimarc/마크/CD_LP_List.Designer.cs index f38ec08..b85b606 100644 --- a/unimarc/unimarc/마크/CD_LP_List.Designer.cs +++ b/unimarc/unimarc/마크/CD_LP_List.Designer.cs @@ -28,50 +28,76 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - this.Btn_SelectList = new System.Windows.Forms.Button(); - this.panel1 = new System.Windows.Forms.Panel(); - this.cb_EncodingType = new System.Windows.Forms.ComboBox(); - this.lbl_ListTitle = new System.Windows.Forms.Label(); - this.lbl_date = new System.Windows.Forms.Label(); - this.Btn_OutPut = new System.Windows.Forms.Button(); - this.Btn_Excel = new System.Windows.Forms.Button(); - this.Btn_CheckTrue = new System.Windows.Forms.Button(); - this.Btn_Close = new System.Windows.Forms.Button(); - this.Btn_ViewMarc = new System.Windows.Forms.Button(); - this.Btn_CheckFalse = new System.Windows.Forms.Button(); + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel2 = new System.Windows.Forms.Panel(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Num = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.RegNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ClassNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.AuthorSymbol = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Vol = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Copy = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Fix = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Title = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Artist = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Type = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.panel3 = new System.Windows.Forms.Panel(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.Btn_SelectList = new System.Windows.Forms.Button(); + this.Btn_CheckFalse = new System.Windows.Forms.Button(); + this.Btn_ViewMarc = new System.Windows.Forms.Button(); + this.Btn_Close = new System.Windows.Forms.Button(); + this.Btn_CheckTrue = new System.Windows.Forms.Button(); + this.Btn_Excel = new System.Windows.Forms.Button(); + this.Btn_OutPut = new System.Windows.Forms.Button(); + this.lbl_date = new System.Windows.Forms.Label(); + this.lbl_ListTitle = new System.Windows.Forms.Label(); + this.cb_EncodingType = new System.Windows.Forms.ComboBox(); this.Btn_SelectRemove = new System.Windows.Forms.Button(); - this.panel1.SuspendLayout(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.Marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Type = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Artist = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Title = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Fix = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Copy = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Vol = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.AuthorSymbol = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ClassNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.RegNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // + // panel2 + // + this.panel2.Controls.Add(this.richTextBox1); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 713); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1290, 1); + this.panel2.TabIndex = 1; + // + // richTextBox1 + // + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(0, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(1290, 1); + this.richTextBox1.TabIndex = 0; + this.richTextBox1.Text = ""; + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); + // // Btn_SelectList // this.Btn_SelectList.Location = new System.Drawing.Point(7, 5); @@ -82,6 +108,108 @@ this.Btn_SelectList.UseVisualStyleBackColor = true; this.Btn_SelectList.Click += new System.EventHandler(this.Btn_SelectList_Click); // + // Btn_CheckFalse + // + this.Btn_CheckFalse.Location = new System.Drawing.Point(419, 5); + this.Btn_CheckFalse.Name = "Btn_CheckFalse"; + this.Btn_CheckFalse.Size = new System.Drawing.Size(75, 23); + this.Btn_CheckFalse.TabIndex = 0; + this.Btn_CheckFalse.Text = "선택 해제"; + this.Btn_CheckFalse.UseVisualStyleBackColor = true; + this.Btn_CheckFalse.Click += new System.EventHandler(this.Btn_SelectGrid); + // + // Btn_ViewMarc + // + this.Btn_ViewMarc.Location = new System.Drawing.Point(707, 5); + this.Btn_ViewMarc.Name = "Btn_ViewMarc"; + this.Btn_ViewMarc.Size = new System.Drawing.Size(75, 23); + this.Btn_ViewMarc.TabIndex = 0; + this.Btn_ViewMarc.Text = "마크보이기"; + this.Btn_ViewMarc.UseVisualStyleBackColor = true; + this.Btn_ViewMarc.Click += new System.EventHandler(this.Btn_ViewMarc_Click); + // + // Btn_Close + // + this.Btn_Close.Location = new System.Drawing.Point(948, 5); + this.Btn_Close.Name = "Btn_Close"; + this.Btn_Close.Size = new System.Drawing.Size(75, 23); + this.Btn_Close.TabIndex = 0; + this.Btn_Close.Text = "닫 기"; + this.Btn_Close.UseVisualStyleBackColor = true; + this.Btn_Close.Click += new System.EventHandler(this.Btn_Close_Click); + // + // Btn_CheckTrue + // + this.Btn_CheckTrue.Location = new System.Drawing.Point(341, 5); + this.Btn_CheckTrue.Name = "Btn_CheckTrue"; + this.Btn_CheckTrue.Size = new System.Drawing.Size(75, 23); + this.Btn_CheckTrue.TabIndex = 0; + this.Btn_CheckTrue.Text = "전체 선택"; + this.Btn_CheckTrue.UseVisualStyleBackColor = true; + this.Btn_CheckTrue.Click += new System.EventHandler(this.Btn_SelectGrid); + // + // Btn_Excel + // + this.Btn_Excel.Location = new System.Drawing.Point(626, 5); + this.Btn_Excel.Name = "Btn_Excel"; + this.Btn_Excel.Size = new System.Drawing.Size(75, 23); + this.Btn_Excel.TabIndex = 0; + this.Btn_Excel.Text = "엑 셀"; + this.Btn_Excel.UseVisualStyleBackColor = true; + this.Btn_Excel.Click += new System.EventHandler(this.Btn_Excel_Click); + // + // Btn_OutPut + // + this.Btn_OutPut.Location = new System.Drawing.Point(864, 5); + this.Btn_OutPut.Name = "Btn_OutPut"; + this.Btn_OutPut.Size = new System.Drawing.Size(75, 23); + this.Btn_OutPut.TabIndex = 0; + this.Btn_OutPut.Text = "반 출"; + this.Btn_OutPut.UseVisualStyleBackColor = true; + this.Btn_OutPut.Click += new System.EventHandler(this.Btn_OutPut_Click); + // + // lbl_date + // + this.lbl_date.AutoSize = true; + this.lbl_date.Location = new System.Drawing.Point(88, 16); + this.lbl_date.Name = "lbl_date"; + this.lbl_date.Size = new System.Drawing.Size(111, 12); + this.lbl_date.TabIndex = 3; + this.lbl_date.Text = "목록일자(가려놓음)"; + this.lbl_date.Visible = false; + // + // lbl_ListTitle + // + this.lbl_ListTitle.AutoSize = true; + this.lbl_ListTitle.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbl_ListTitle.Location = new System.Drawing.Point(88, 10); + this.lbl_ListTitle.Name = "lbl_ListTitle"; + this.lbl_ListTitle.Size = new System.Drawing.Size(0, 13); + this.lbl_ListTitle.TabIndex = 2; + // + // cb_EncodingType + // + this.cb_EncodingType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_EncodingType.FormattingEnabled = true; + this.cb_EncodingType.Items.AddRange(new object[] { + "ANSI", + "UTF-8", + "UniCode"}); + this.cb_EncodingType.Location = new System.Drawing.Point(788, 6); + this.cb_EncodingType.Name = "cb_EncodingType"; + this.cb_EncodingType.Size = new System.Drawing.Size(75, 20); + this.cb_EncodingType.TabIndex = 4; + // + // Btn_SelectRemove + // + this.Btn_SelectRemove.Location = new System.Drawing.Point(497, 5); + this.Btn_SelectRemove.Name = "Btn_SelectRemove"; + this.Btn_SelectRemove.Size = new System.Drawing.Size(75, 23); + this.Btn_SelectRemove.TabIndex = 5; + this.Btn_SelectRemove.Text = "선택 삭제"; + this.Btn_SelectRemove.UseVisualStyleBackColor = true; + this.Btn_SelectRemove.Click += new System.EventHandler(this.Btn_SelectRemove_Click); + // // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -102,129 +230,129 @@ this.panel1.Size = new System.Drawing.Size(1290, 35); this.panel1.TabIndex = 1; // - // cb_EncodingType + // panel3 // - this.cb_EncodingType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_EncodingType.FormattingEnabled = true; - this.cb_EncodingType.Items.AddRange(new object[] { - "ANSI", - "UTF-8", - "UniCode"}); - this.cb_EncodingType.Location = new System.Drawing.Point(788, 6); - this.cb_EncodingType.Name = "cb_EncodingType"; - this.cb_EncodingType.Size = new System.Drawing.Size(75, 20); - this.cb_EncodingType.TabIndex = 4; + this.panel3.Controls.Add(this.dataGridView1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 35); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1290, 678); + this.panel3.TabIndex = 2; // - // lbl_ListTitle + // Marc // - this.lbl_ListTitle.AutoSize = true; - this.lbl_ListTitle.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_ListTitle.Location = new System.Drawing.Point(88, 10); - this.lbl_ListTitle.Name = "lbl_ListTitle"; - this.lbl_ListTitle.Size = new System.Drawing.Size(0, 13); - this.lbl_ListTitle.TabIndex = 2; + this.Marc.HeaderText = "마크"; + this.Marc.Name = "Marc"; + this.Marc.Visible = false; // - // lbl_date + // Type // - this.lbl_date.AutoSize = true; - this.lbl_date.Location = new System.Drawing.Point(88, 16); - this.lbl_date.Name = "lbl_date"; - this.lbl_date.Size = new System.Drawing.Size(111, 12); - this.lbl_date.TabIndex = 3; - this.lbl_date.Text = "목록일자(가려놓음)"; - this.lbl_date.Visible = false; + this.Type.HeaderText = "유형"; + this.Type.Name = "Type"; // - // Btn_OutPut + // Price // - this.Btn_OutPut.Location = new System.Drawing.Point(864, 5); - this.Btn_OutPut.Name = "Btn_OutPut"; - this.Btn_OutPut.Size = new System.Drawing.Size(75, 23); - this.Btn_OutPut.TabIndex = 0; - this.Btn_OutPut.Text = "반 출"; - this.Btn_OutPut.UseVisualStyleBackColor = true; - this.Btn_OutPut.Click += new System.EventHandler(this.Btn_OutPut_Click); + this.Price.HeaderText = "정가"; + this.Price.Name = "Price"; // - // Btn_Excel + // Comp // - this.Btn_Excel.Location = new System.Drawing.Point(626, 5); - this.Btn_Excel.Name = "Btn_Excel"; - this.Btn_Excel.Size = new System.Drawing.Size(75, 23); - this.Btn_Excel.TabIndex = 0; - this.Btn_Excel.Text = "엑 셀"; - this.Btn_Excel.UseVisualStyleBackColor = true; - this.Btn_Excel.Click += new System.EventHandler(this.Btn_Excel_Click); + this.Comp.HeaderText = "제작"; + this.Comp.Name = "Comp"; // - // Btn_CheckTrue + // Artist // - this.Btn_CheckTrue.Location = new System.Drawing.Point(341, 5); - this.Btn_CheckTrue.Name = "Btn_CheckTrue"; - this.Btn_CheckTrue.Size = new System.Drawing.Size(75, 23); - this.Btn_CheckTrue.TabIndex = 0; - this.Btn_CheckTrue.Text = "전체 선택"; - this.Btn_CheckTrue.UseVisualStyleBackColor = true; - this.Btn_CheckTrue.Click += new System.EventHandler(this.Btn_SelectGrid); + this.Artist.HeaderText = "감독/뮤지션"; + this.Artist.Name = "Artist"; // - // Btn_Close + // Title // - this.Btn_Close.Location = new System.Drawing.Point(948, 5); - this.Btn_Close.Name = "Btn_Close"; - this.Btn_Close.Size = new System.Drawing.Size(75, 23); - this.Btn_Close.TabIndex = 0; - this.Btn_Close.Text = "닫 기"; - this.Btn_Close.UseVisualStyleBackColor = true; - this.Btn_Close.Click += new System.EventHandler(this.Btn_Close_Click); + this.Title.HeaderText = "작품명"; + this.Title.Name = "Title"; + this.Title.Width = 500; // - // Btn_ViewMarc + // Fix // - this.Btn_ViewMarc.Location = new System.Drawing.Point(707, 5); - this.Btn_ViewMarc.Name = "Btn_ViewMarc"; - this.Btn_ViewMarc.Size = new System.Drawing.Size(75, 23); - this.Btn_ViewMarc.TabIndex = 0; - this.Btn_ViewMarc.Text = "마크보이기"; - this.Btn_ViewMarc.UseVisualStyleBackColor = true; - this.Btn_ViewMarc.Click += new System.EventHandler(this.Btn_ViewMarc_Click); + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.Fix.DefaultCellStyle = dataGridViewCellStyle7; + this.Fix.HeaderText = "별치"; + this.Fix.Name = "Fix"; + this.Fix.Width = 60; // - // Btn_CheckFalse + // Copy // - this.Btn_CheckFalse.Location = new System.Drawing.Point(419, 5); - this.Btn_CheckFalse.Name = "Btn_CheckFalse"; - this.Btn_CheckFalse.Size = new System.Drawing.Size(75, 23); - this.Btn_CheckFalse.TabIndex = 0; - this.Btn_CheckFalse.Text = "선택 해제"; - this.Btn_CheckFalse.UseVisualStyleBackColor = true; - this.Btn_CheckFalse.Click += new System.EventHandler(this.Btn_SelectGrid); + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.Copy.DefaultCellStyle = dataGridViewCellStyle6; + this.Copy.HeaderText = "복본"; + this.Copy.Name = "Copy"; + this.Copy.Width = 50; // - // panel2 + // Vol // - this.panel2.Controls.Add(this.richTextBox1); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 713); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1290, 1); - this.panel2.TabIndex = 1; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.Vol.DefaultCellStyle = dataGridViewCellStyle5; + this.Vol.HeaderText = "볼륨"; + this.Vol.Name = "Vol"; + this.Vol.Width = 60; // - // richTextBox1 + // AuthorSymbol // - this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox1.Location = new System.Drawing.Point(0, 0); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1290, 1); - this.richTextBox1.TabIndex = 0; - this.richTextBox1.Text = ""; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.AuthorSymbol.DefaultCellStyle = dataGridViewCellStyle4; + this.AuthorSymbol.HeaderText = "저자기호"; + this.AuthorSymbol.Name = "AuthorSymbol"; + this.AuthorSymbol.Width = 80; + // + // ClassNum + // + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.ClassNum.DefaultCellStyle = dataGridViewCellStyle3; + this.ClassNum.HeaderText = "분류기호"; + this.ClassNum.Name = "ClassNum"; + this.ClassNum.Width = 80; + // + // RegNum + // + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.RegNum.DefaultCellStyle = dataGridViewCellStyle2; + this.RegNum.HeaderText = "등록번호"; + this.RegNum.Name = "RegNum"; + this.RegNum.Width = 120; + // + // Num + // + this.Num.HeaderText = "연번"; + this.Num.Name = "Num"; + this.Num.Width = 50; + // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; + // + // Check + // + this.Check.FalseValue = "F"; + this.Check.HeaderText = "선택"; + this.Check.Name = "Check"; + this.Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.Check.TrueValue = "T"; + this.Check.Width = 50; // // dataGridView1 // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle15.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; + 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.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Check, this.idx, @@ -251,127 +379,6 @@ this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // - // Check - // - this.Check.FalseValue = "F"; - this.Check.HeaderText = "선택"; - this.Check.Name = "Check"; - this.Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.Check.TrueValue = "T"; - this.Check.Width = 50; - // - // idx - // - this.idx.HeaderText = "idx"; - this.idx.Name = "idx"; - this.idx.Visible = false; - // - // Num - // - this.Num.HeaderText = "연번"; - this.Num.Name = "Num"; - this.Num.Width = 50; - // - // RegNum - // - dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.RegNum.DefaultCellStyle = dataGridViewCellStyle16; - this.RegNum.HeaderText = "등록번호"; - this.RegNum.Name = "RegNum"; - this.RegNum.Width = 120; - // - // ClassNum - // - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.ClassNum.DefaultCellStyle = dataGridViewCellStyle17; - this.ClassNum.HeaderText = "분류기호"; - this.ClassNum.Name = "ClassNum"; - this.ClassNum.Width = 80; - // - // AuthorSymbol - // - dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.AuthorSymbol.DefaultCellStyle = dataGridViewCellStyle18; - this.AuthorSymbol.HeaderText = "저자기호"; - this.AuthorSymbol.Name = "AuthorSymbol"; - this.AuthorSymbol.Width = 80; - // - // Vol - // - dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.Vol.DefaultCellStyle = dataGridViewCellStyle19; - this.Vol.HeaderText = "볼륨"; - this.Vol.Name = "Vol"; - this.Vol.Width = 60; - // - // Copy - // - dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.Copy.DefaultCellStyle = dataGridViewCellStyle20; - this.Copy.HeaderText = "복본"; - this.Copy.Name = "Copy"; - this.Copy.Width = 50; - // - // Fix - // - dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.Fix.DefaultCellStyle = dataGridViewCellStyle21; - this.Fix.HeaderText = "별치"; - this.Fix.Name = "Fix"; - this.Fix.Width = 60; - // - // Title - // - this.Title.HeaderText = "작품명"; - this.Title.Name = "Title"; - this.Title.Width = 500; - // - // Artist - // - this.Artist.HeaderText = "감독/뮤지션"; - this.Artist.Name = "Artist"; - // - // Comp - // - this.Comp.HeaderText = "제작"; - this.Comp.Name = "Comp"; - // - // Price - // - this.Price.HeaderText = "정가"; - this.Price.Name = "Price"; - // - // Type - // - this.Type.HeaderText = "유형"; - this.Type.Name = "Type"; - // - // Marc - // - this.Marc.HeaderText = "마크"; - this.Marc.Name = "Marc"; - this.Marc.Visible = false; - // - // panel3 - // - this.panel3.Controls.Add(this.dataGridView1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 35); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1290, 678); - this.panel3.TabIndex = 2; - // - // Btn_SelectRemove - // - this.Btn_SelectRemove.Location = new System.Drawing.Point(497, 5); - this.Btn_SelectRemove.Name = "Btn_SelectRemove"; - this.Btn_SelectRemove.Size = new System.Drawing.Size(75, 23); - this.Btn_SelectRemove.TabIndex = 5; - this.Btn_SelectRemove.Text = "선택 삭제"; - this.Btn_SelectRemove.UseVisualStyleBackColor = true; - this.Btn_SelectRemove.Click += new System.EventHandler(this.Btn_SelectRemove_Click); - // // CD_LP_List // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -383,31 +390,33 @@ this.Name = "CD_LP_List"; this.Text = "CD_LP_List"; this.Load += new System.EventHandler(this.CD_LP_List_Load); + this.panel2.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - this.panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } #endregion - - private System.Windows.Forms.Button Btn_SelectList; - private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel2; - public System.Windows.Forms.Label lbl_ListTitle; - private System.Windows.Forms.Button Btn_OutPut; - private System.Windows.Forms.Button Btn_Excel; - private System.Windows.Forms.Button Btn_CheckTrue; - private System.Windows.Forms.Button Btn_Close; - private System.Windows.Forms.Button Btn_ViewMarc; - private System.Windows.Forms.Button Btn_CheckFalse; - private System.Windows.Forms.DataGridView dataGridView1; - public System.Windows.Forms.Label lbl_date; - private System.Windows.Forms.Panel panel3; private System.Windows.Forms.RichTextBox richTextBox1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.Button Btn_SelectList; + private System.Windows.Forms.Button Btn_CheckFalse; + private System.Windows.Forms.Button Btn_ViewMarc; + private System.Windows.Forms.Button Btn_Close; + private System.Windows.Forms.Button Btn_CheckTrue; + private System.Windows.Forms.Button Btn_Excel; + private System.Windows.Forms.Button Btn_OutPut; + public System.Windows.Forms.Label lbl_date; + public System.Windows.Forms.Label lbl_ListTitle; + private System.Windows.Forms.ComboBox cb_EncodingType; + private System.Windows.Forms.Button Btn_SelectRemove; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.DataGridView dataGridView1; private System.Windows.Forms.DataGridViewCheckBoxColumn Check; private System.Windows.Forms.DataGridViewTextBoxColumn idx; private System.Windows.Forms.DataGridViewTextBoxColumn Num; @@ -423,7 +432,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Price; private System.Windows.Forms.DataGridViewTextBoxColumn Type; private System.Windows.Forms.DataGridViewTextBoxColumn Marc; - private System.Windows.Forms.ComboBox cb_EncodingType; - private System.Windows.Forms.Button Btn_SelectRemove; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/CD_LP_List.resx b/unimarc/unimarc/마크/CD_LP_List.resx index 61b327c..fa7f139 100644 --- a/unimarc/unimarc/마크/CD_LP_List.resx +++ b/unimarc/unimarc/마크/CD_LP_List.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2, 1 + True @@ -162,4 +165,7 @@ True + + 25 + \ No newline at end of file diff --git a/unimarc/unimarc/마크/CD_LP_SelectList.cs b/unimarc/unimarc/마크/CD_LP_SelectList.cs index 2fae670..2643699 100644 --- a/unimarc/unimarc/마크/CD_LP_SelectList.cs +++ b/unimarc/unimarc/마크/CD_LP_SelectList.cs @@ -93,21 +93,8 @@ namespace UniMarc.마크 private void Btn_Insert_Click(object sender, EventArgs e) { - Skill_Search_Text search_Text = new Skill_Search_Text(); - - string value = ""; - if (search_Text.InputBox("생성할 목록명을 입력해주세요.", "목록 생성", ref value) == DialogResult.OK) - { - string user = Properties.Settings.Default.User; - string compidx = Properties.Settings.Default.compidx; - string date = DateTime.Now.ToString("yyyy-MM-dd"); - - string[] Insert_Tbl = { "compidx", "listname", "date", "user" }; - string[] Insert_Col = { compidx, value, date, user }; - string cmd = db.DB_INSERT("DVD_List", Insert_Tbl, Insert_Col); - db.DB_Send_CMD_reVoid(cmd); - LoadList(compidx); - } + CD_LP_AddList cD_LP_AddList = new CD_LP_AddList(); + cD_LP_AddList.Show(); } private void Btn_Delete_Click(object sender, EventArgs e) diff --git a/unimarc/unimarc/마크/CD_LP_Sub.cs b/unimarc/unimarc/마크/CD_LP_Sub.cs index af7cc88..989b153 100644 --- a/unimarc/unimarc/마크/CD_LP_Sub.cs +++ b/unimarc/unimarc/마크/CD_LP_Sub.cs @@ -576,7 +576,11 @@ namespace UniMarc.마크 /// string MakeMarcAladin_Music(string[] Data) { - string Marc = "056\t \t▼a▼25▲\n"; + string Marc = + "020\t \t▼a:▼c▲\n" + + "041\t0 \t▼a▼b▼▲\n" + + "056\t \t▼a▼25▲\n" + + "090\\t \\t▼a▼b▲\\n"; Marc += "100\t1 \t▼a" + Data[1] + "▲\n"; Marc += "245\t10\t▼a" + Data[0] + "▼h[녹음자료]/▼d" + Data[1] + MakeSubArtist(Data[2]) + "▲\n"; Marc += "260\t \t▼a서울:▼b" + Data[3] + "▼c" + Data[5] + "▲\n"; @@ -585,7 +589,9 @@ namespace UniMarc.마크 else Marc += "▼c30 cm▲\n"; Marc += "508\t \t▼a제작진 : " + Data[1] + "▲\n"; Marc += "521\t \t▼a전체이용가▲\n"; - Marc += "653\t \t▼a" + Data[0].Replace(" ", "▼a") + "▲\n"; + Marc += "653\t \t▼a" + Data[0].Replace(" ", "▼a") + "▲\n" + + "700\t1 \t▼a▲\n" + + "740\t 2\t▼a▲\n"; Marc += "950\t0 \t▼b\\" + Data[4] + "▲\n"; return Marc; @@ -684,7 +690,11 @@ namespace UniMarc.마크 /// string MakeMarcAladin_DVD(string[] Data) { - string Marc = "056\t \t▼a▼25▲\n"; + string Marc = + "020\t \t▼a:▼c▲\n" + + "041\t0 \t▼a▼b▼▲\n" + + "056\t \t▼a▼25▲\n" + + "090\\t \\t▼a▼b▲\\n"; Marc += "100\t1 \t▼a" + Data[1] + "▲\n"; Marc += "245\t10\t▼a" + Data[0] + "▼h[비디오 녹음자료]/▼d" + Data[1] + MakeSubArtist(Data[2], ',') + "▲\n"; Marc += "260\t \t▼a서울:▼b" + Data[3] + "제작▼c" + Data[5] + "▲\n"; diff --git a/unimarc/unimarc/마크/Check_copy.Designer.cs b/unimarc/unimarc/마크/Check_copy.Designer.cs index 565f9c2..858eace 100644 --- a/unimarc/unimarc/마크/Check_copy.Designer.cs +++ b/unimarc/unimarc/마크/Check_copy.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.rb_isNumber = new System.Windows.Forms.RadioButton(); this.rb_isHave = new System.Windows.Forms.RadioButton(); @@ -41,6 +41,7 @@ this.tb_SearchTarget = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); + this.btn_SiteDenote = new System.Windows.Forms.Button(); this.lbl_PW = new System.Windows.Forms.Label(); this.lbl_ID = new System.Windows.Forms.Label(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); @@ -58,7 +59,6 @@ this.chk_spChar = new System.Windows.Forms.CheckBox(); this.panel5 = new System.Windows.Forms.Panel(); this.webBrowser1 = new System.Windows.Forms.WebBrowser(); - this.btn_SiteDenote = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.SearchCount)).BeginInit(); this.panel2.SuspendLayout(); @@ -80,7 +80,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 34); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(635, 34); + this.panel1.Size = new System.Drawing.Size(629, 34); this.panel1.TabIndex = 0; // // rb_isNumber @@ -118,7 +118,7 @@ // // btn_Start // - this.btn_Start.Location = new System.Drawing.Point(476, 4); + this.btn_Start.Location = new System.Drawing.Point(470, 4); this.btn_Start.Name = "btn_Start"; this.btn_Start.Size = new System.Drawing.Size(75, 24); this.btn_Start.TabIndex = 2; @@ -128,7 +128,7 @@ // // btn_Stop // - this.btn_Stop.Location = new System.Drawing.Point(554, 4); + this.btn_Stop.Location = new System.Drawing.Point(548, 4); this.btn_Stop.Name = "btn_Stop"; this.btn_Stop.Size = new System.Drawing.Size(75, 24); this.btn_Stop.TabIndex = 2; @@ -138,7 +138,7 @@ // // SearchCount // - this.SearchCount.Location = new System.Drawing.Point(497, 6); + this.SearchCount.Location = new System.Drawing.Point(491, 6); this.SearchCount.Maximum = new decimal(new int[] { 10000, 0, @@ -151,7 +151,7 @@ // // btn_Close // - this.btn_Close.Location = new System.Drawing.Point(554, 4); + this.btn_Close.Location = new System.Drawing.Point(548, 4); this.btn_Close.Name = "btn_Close"; this.btn_Close.Size = new System.Drawing.Size(75, 24); this.btn_Close.TabIndex = 2; @@ -162,7 +162,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(450, 10); + this.label2.Location = new System.Drawing.Point(444, 10); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(45, 12); this.label2.TabIndex = 0; @@ -199,9 +199,19 @@ 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(635, 34); + this.panel2.Size = new System.Drawing.Size(629, 34); this.panel2.TabIndex = 0; // + // btn_SiteDenote + // + this.btn_SiteDenote.Location = new System.Drawing.Point(317, 5); + this.btn_SiteDenote.Name = "btn_SiteDenote"; + this.btn_SiteDenote.Size = new System.Drawing.Size(77, 23); + this.btn_SiteDenote.TabIndex = 4; + this.btn_SiteDenote.Text = "사이트 표출"; + this.btn_SiteDenote.UseVisualStyleBackColor = true; + this.btn_SiteDenote.Click += new System.EventHandler(this.btn_SiteDenote_Click); + // // lbl_PW // this.lbl_PW.AutoSize = true; @@ -226,14 +236,14 @@ this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control; this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - 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; + 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; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.book_name, @@ -243,7 +253,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(635, 636); + this.dataGridView1.Size = new System.Drawing.Size(629, 636); this.dataGridView1.TabIndex = 1; this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); @@ -271,7 +281,7 @@ // // btn_ApplyFilter // - this.btn_ApplyFilter.Location = new System.Drawing.Point(322, 4); + this.btn_ApplyFilter.Location = new System.Drawing.Point(317, 4); this.btn_ApplyFilter.Name = "btn_ApplyFilter"; this.btn_ApplyFilter.Size = new System.Drawing.Size(75, 24); this.btn_ApplyFilter.TabIndex = 2; @@ -288,7 +298,7 @@ this.panel3.Dock = System.Windows.Forms.DockStyle.Left; this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(635, 738); + this.panel3.Size = new System.Drawing.Size(629, 738); this.panel3.TabIndex = 3; // // panel6 @@ -297,7 +307,7 @@ this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(0, 102); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(635, 636); + this.panel6.Size = new System.Drawing.Size(629, 636); this.panel6.TabIndex = 3; // // panel4 @@ -312,7 +322,7 @@ this.panel4.Dock = System.Windows.Forms.DockStyle.Top; this.panel4.Location = new System.Drawing.Point(0, 68); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(635, 34); + this.panel4.Size = new System.Drawing.Size(629, 34); this.panel4.TabIndex = 2; // // chk_RemoveBrit @@ -327,7 +337,7 @@ // // btn_ResultEmpty // - this.btn_ResultEmpty.Location = new System.Drawing.Point(476, 4); + this.btn_ResultEmpty.Location = new System.Drawing.Point(471, 4); this.btn_ResultEmpty.Name = "btn_ResultEmpty"; this.btn_ResultEmpty.Size = new System.Drawing.Size(75, 24); this.btn_ResultEmpty.TabIndex = 2; @@ -337,7 +347,7 @@ // // btn_GridReset // - this.btn_GridReset.Location = new System.Drawing.Point(553, 4); + this.btn_GridReset.Location = new System.Drawing.Point(548, 4); this.btn_GridReset.Name = "btn_GridReset"; this.btn_GridReset.Size = new System.Drawing.Size(75, 24); this.btn_GridReset.TabIndex = 2; @@ -347,7 +357,7 @@ // // btn_OpenMemo // - this.btn_OpenMemo.Location = new System.Drawing.Point(399, 4); + this.btn_OpenMemo.Location = new System.Drawing.Point(394, 4); this.btn_OpenMemo.Name = "btn_OpenMemo"; this.btn_OpenMemo.Size = new System.Drawing.Size(75, 24); this.btn_OpenMemo.TabIndex = 2; @@ -369,9 +379,9 @@ // this.panel5.Controls.Add(this.webBrowser1); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(635, 0); + this.panel5.Location = new System.Drawing.Point(629, 0); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(656, 738); + this.panel5.Size = new System.Drawing.Size(662, 738); this.panel5.TabIndex = 4; // // webBrowser1 @@ -381,19 +391,9 @@ this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20); this.webBrowser1.Name = "webBrowser1"; this.webBrowser1.ScriptErrorsSuppressed = true; - this.webBrowser1.Size = new System.Drawing.Size(656, 738); + this.webBrowser1.Size = new System.Drawing.Size(662, 738); this.webBrowser1.TabIndex = 2; // - // btn_SiteDenote - // - this.btn_SiteDenote.Location = new System.Drawing.Point(322, 5); - this.btn_SiteDenote.Name = "btn_SiteDenote"; - this.btn_SiteDenote.Size = new System.Drawing.Size(77, 23); - this.btn_SiteDenote.TabIndex = 4; - this.btn_SiteDenote.Text = "사이트 표출"; - this.btn_SiteDenote.UseVisualStyleBackColor = true; - this.btn_SiteDenote.Click += new System.EventHandler(this.btn_SiteDenote_Click); - // // Check_copy // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -429,7 +429,6 @@ private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.Button btn_Stop; private System.Windows.Forms.Button btn_Start; - private System.Windows.Forms.WebBrowser webBrowser1; public System.Windows.Forms.TextBox tb_SearchTarget; public System.Windows.Forms.DataGridView dataGridView1; public System.Windows.Forms.Button btn_SearchList; @@ -452,5 +451,6 @@ public System.Windows.Forms.Label lbl_PW; public System.Windows.Forms.Label lbl_ID; private System.Windows.Forms.Button btn_SiteDenote; + private System.Windows.Forms.WebBrowser webBrowser1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs index ec213f4..528470a 100644 --- a/unimarc/unimarc/마크/Check_copy.cs +++ b/unimarc/unimarc/마크/Check_copy.cs @@ -12,7 +12,6 @@ namespace WindowsFormsApp1.Mac public partial class Check_copy : Form { Helper_DB db = new Helper_DB(); - string compidx; public string URL; public string lib_Category; public string Code; @@ -22,7 +21,6 @@ namespace WindowsFormsApp1.Mac { InitializeComponent(); main = _main; - compidx = main.com_idx; db.DBcon(); } @@ -232,7 +230,7 @@ namespace WindowsFormsApp1.Mac /* else if (URL.IndexOf("lib.jeonnam.go.kr") > -1) { - Delay(500); + //Delay(500); if (URL.IndexOf("value") > -1) BookCount = 전남도립결과(); @@ -318,6 +316,14 @@ namespace WindowsFormsApp1.Mac BookCount = 안산중앙도서관입력(text); } + // 송원대학교 중앙도서관 + else if (URL.IndexOf("lib.songwon.ac.kr") > -1) + { + if (URL.IndexOf("searchTruncate") > -1) + BookCount = 송원대중앙도서관결과(); + + 송원대중앙도서관입력(text); + } int tmp = RowCount - 1; if (tmp < 0) tmp = 0; @@ -490,18 +496,10 @@ namespace WindowsFormsApp1.Mac void 광주광산구입력(string text) { - // foreach (HtmlElement he in webBrowser1.Document.GetElementsByTagName("select")) - // { - // if (he.Name.IndexOf("globalSearchLib") > -1) - // { - // he.SetAttribute("value", Code); - // } - // } webBrowser1.Document.GetElementById("query").SetAttribute("value", text); foreach (HtmlElement Btn in webBrowser1.Document.GetElementsByTagName("button")) { - // if (Btn.GetAttribute("className").IndexOf("btn-search") > -1) if (Btn.GetAttribute("className") == "btn btn-lg") Btn.InvokeMember("click"); } @@ -592,6 +590,28 @@ namespace WindowsFormsApp1.Mac } #endregion + #region 송원대학교 중앙도서관 + + void 송원대중앙도서관입력(string text) + { + webBrowser1.Document.GetElementById("q").SetAttribute("value", text); + webBrowser1.Document.GetElementById("opacsearch").InvokeMember("click"); + } + + string 송원대중앙도서관결과() + { + string result = ""; + + foreach (HtmlElement strong in webBrowser1.Document.GetElementsByTagName("strong")) + { + result = strong.InnerText; + break; + } + return result; + } + + #endregion + #endregion #region 전남 소재 도서관 diff --git a/unimarc/unimarc/마크/MarcCopySelect.Designer.cs b/unimarc/unimarc/마크/MarcCopySelect.Designer.cs index 58f09c3..b3dde42 100644 --- a/unimarc/unimarc/마크/MarcCopySelect.Designer.cs +++ b/unimarc/unimarc/마크/MarcCopySelect.Designer.cs @@ -29,30 +29,19 @@ namespace UniMarc.마크 /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.compidx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Title = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Author = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.user = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.date = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.tag008 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1 = new System.Windows.Forms.Panel(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.btn_Search = new System.Windows.Forms.Button(); + this.tb_SearchBox = new System.Windows.Forms.TextBox(); + this.cb_SearchFilter = new System.Windows.Forms.ComboBox(); this.btn_ShowDeleteMarc = new System.Windows.Forms.Button(); this.btn_Close = new System.Windows.Forms.Button(); this.btn_Delete = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.panel3 = new System.Windows.Forms.Panel(); - this.cb_SearchFilter = new System.Windows.Forms.ComboBox(); - this.tb_SearchBox = new System.Windows.Forms.TextBox(); - this.btn_Search = new System.Windows.Forms.Button(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -64,27 +53,15 @@ namespace UniMarc.마크 this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + 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; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.idx, - this.compidx, - this.isbn, - this.Title, - this.Author, - this.Comp, - this.user, - this.date, - this.grade, - this.tag008, - this.marc}); this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Name = "dataGridView1"; @@ -96,81 +73,6 @@ namespace UniMarc.마크 this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // - // idx - // - this.idx.HeaderText = "idx"; - this.idx.Name = "idx"; - this.idx.ReadOnly = true; - this.idx.Visible = false; - this.idx.Width = 40; - // - // compidx - // - this.compidx.HeaderText = "compidx"; - this.compidx.Name = "compidx"; - this.compidx.ReadOnly = true; - this.compidx.Visible = false; - this.compidx.Width = 40; - // - // isbn - // - this.isbn.HeaderText = "ISBN"; - this.isbn.Name = "isbn"; - this.isbn.ReadOnly = true; - // - // Title - // - this.Title.HeaderText = "서명"; - this.Title.Name = "Title"; - this.Title.ReadOnly = true; - // - // Author - // - this.Author.HeaderText = "저자"; - this.Author.Name = "Author"; - this.Author.ReadOnly = true; - // - // Comp - // - this.Comp.HeaderText = "출판사"; - this.Comp.Name = "Comp"; - this.Comp.ReadOnly = true; - // - // user - // - this.user.HeaderText = "수정자"; - this.user.Name = "user"; - this.user.ReadOnly = true; - this.user.Width = 120; - // - // date - // - this.date.HeaderText = "수정시각"; - this.date.Name = "date"; - this.date.ReadOnly = true; - this.date.Width = 120; - // - // grade - // - this.grade.HeaderText = "등급"; - this.grade.Name = "grade"; - this.grade.ReadOnly = true; - this.grade.Width = 60; - // - // tag008 - // - this.tag008.HeaderText = "008Tag"; - this.tag008.Name = "tag008"; - this.tag008.ReadOnly = true; - this.tag008.Width = 150; - // - // marc - // - this.marc.HeaderText = "Marc"; - this.marc.Name = "marc"; - this.marc.ReadOnly = true; - this.marc.Width = 200; - // // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -187,6 +89,44 @@ namespace UniMarc.마크 this.panel1.Size = new System.Drawing.Size(1109, 33); this.panel1.TabIndex = 1; // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(434, 4); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(160, 23); + this.progressBar1.TabIndex = 5; + // + // btn_Search + // + this.btn_Search.Location = new System.Drawing.Point(353, 4); + this.btn_Search.Name = "btn_Search"; + this.btn_Search.Size = new System.Drawing.Size(75, 23); + this.btn_Search.TabIndex = 4; + this.btn_Search.Text = "검 색"; + this.btn_Search.UseVisualStyleBackColor = true; + this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click); + // + // tb_SearchBox + // + this.tb_SearchBox.Location = new System.Drawing.Point(109, 5); + this.tb_SearchBox.Name = "tb_SearchBox"; + this.tb_SearchBox.Size = new System.Drawing.Size(238, 21); + this.tb_SearchBox.TabIndex = 3; + this.tb_SearchBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_SearchBox_KeyDown); + // + // cb_SearchFilter + // + this.cb_SearchFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_SearchFilter.FormattingEnabled = true; + this.cb_SearchFilter.Items.AddRange(new object[] { + "도서명", + "저자", + "출판사"}); + this.cb_SearchFilter.Location = new System.Drawing.Point(11, 5); + this.cb_SearchFilter.Name = "cb_SearchFilter"; + this.cb_SearchFilter.Size = new System.Drawing.Size(91, 20); + this.cb_SearchFilter.TabIndex = 2; + // // btn_ShowDeleteMarc // this.btn_ShowDeleteMarc.Location = new System.Drawing.Point(844, 4); @@ -247,44 +187,6 @@ namespace UniMarc.마크 this.panel3.Size = new System.Drawing.Size(1109, 540); this.panel3.TabIndex = 3; // - // cb_SearchFilter - // - this.cb_SearchFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_SearchFilter.FormattingEnabled = true; - this.cb_SearchFilter.Items.AddRange(new object[] { - "도서명", - "저자", - "출판사"}); - this.cb_SearchFilter.Location = new System.Drawing.Point(11, 5); - this.cb_SearchFilter.Name = "cb_SearchFilter"; - this.cb_SearchFilter.Size = new System.Drawing.Size(91, 20); - this.cb_SearchFilter.TabIndex = 2; - // - // tb_SearchBox - // - this.tb_SearchBox.Location = new System.Drawing.Point(109, 5); - this.tb_SearchBox.Name = "tb_SearchBox"; - this.tb_SearchBox.Size = new System.Drawing.Size(238, 21); - this.tb_SearchBox.TabIndex = 3; - this.tb_SearchBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_SearchBox_KeyDown); - // - // btn_Search - // - this.btn_Search.Location = new System.Drawing.Point(353, 4); - this.btn_Search.Name = "btn_Search"; - this.btn_Search.Size = new System.Drawing.Size(75, 23); - this.btn_Search.TabIndex = 4; - this.btn_Search.Text = "검 색"; - this.btn_Search.UseVisualStyleBackColor = true; - this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click); - // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(434, 4); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(100, 23); - this.progressBar1.TabIndex = 5; - // // MarcCopySelect // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -314,17 +216,6 @@ namespace UniMarc.마크 private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.Button btn_Delete; private System.Windows.Forms.Button btn_ShowDeleteMarc; - private System.Windows.Forms.DataGridViewTextBoxColumn idx; - private System.Windows.Forms.DataGridViewTextBoxColumn compidx; - private System.Windows.Forms.DataGridViewTextBoxColumn isbn; - private System.Windows.Forms.DataGridViewTextBoxColumn Title; - private System.Windows.Forms.DataGridViewTextBoxColumn Author; - private System.Windows.Forms.DataGridViewTextBoxColumn Comp; - private System.Windows.Forms.DataGridViewTextBoxColumn user; - private System.Windows.Forms.DataGridViewTextBoxColumn date; - private System.Windows.Forms.DataGridViewTextBoxColumn grade; - private System.Windows.Forms.DataGridViewTextBoxColumn tag008; - private System.Windows.Forms.DataGridViewTextBoxColumn marc; private System.Windows.Forms.ComboBox cb_SearchFilter; private System.Windows.Forms.Button btn_Search; private System.Windows.Forms.TextBox tb_SearchBox; diff --git a/unimarc/unimarc/마크/MarcCopySelect.cs b/unimarc/unimarc/마크/MarcCopySelect.cs index 8310a95..d282f07 100644 --- a/unimarc/unimarc/마크/MarcCopySelect.cs +++ b/unimarc/unimarc/마크/MarcCopySelect.cs @@ -18,12 +18,19 @@ namespace UniMarc.마크 Helper_DB db = new Helper_DB(); Marc m; AddMarc am; + CD_LP cp; public int MarcFormRowIndex; public MarcCopySelect() { InitializeComponent(); } + public MarcCopySelect(CD_LP cD) + { + InitializeComponent(); + cp = cD; + db.DBcon(); + } public MarcCopySelect(Marc _m) { @@ -72,8 +79,70 @@ namespace UniMarc.마크 Init(search_Col, search_Target); } + public void Init(string search_col, string search_Target, string CD_LP) + { + SettingGrid_CDLP(); + + btn_ShowDeleteMarc.Visible = false; + btn_Delete.Visible = false; + + if (search_Target == "") return; + + string Area = "`idx`, `Code`, `user`, `date`, `Marc`"; + string Table = "DVD_Marc"; + string Query = string.Format("SELECT {0} FROM {1} WHERE `{2}` = \"{3}\"", Area, Table, search_col, search_Target); + string Result = db.DB_Send_CMD_Search(Query); + string[] GridData = Result.Split('|'); + + InputGrid_CDLP(GridData); + } + + private void SettingGrid_CDLP() + { + DataGridView dgv = dataGridView1; + dgv.Columns.Add("idx", "idx"); + dgv.Columns.Add("code", "CODE"); + dgv.Columns.Add("user", "수정자"); + dgv.Columns.Add("date", "수정시각"); + dgv.Columns.Add("marc", "Marc"); + + dgv.Columns["idx"].Visible = false; + dgv.Columns["user"].Width = 120; + dgv.Columns["date"].Width = 120; + dgv.Columns["marc"].Width = 300; + } + + private void InputGrid_CDLP(string[] Value) + { + progressBar1.Value = 0; + progressBar1.Maximum = Value.Length / 5; + + string[] Grid = { "", "", "", "", "" }; + + for (int a = 0; a < Value.Length; a++) + { + if (a % 5 == 0) Grid[0] = Value[a]; // idx + if (a % 5 == 1) Grid[1] = Value[a]; // CODE + if (a % 5 == 2) Grid[2] = Value[a]; // user + if (a % 5 == 3) Grid[3] = Value[a]; // date + if (a % 5 == 4) + { + Grid[4] = Value[a]; // marc + dataGridView1.Rows.Add(Grid); + progressBar1.Value += 1; + } + } + + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + string savedate = dataGridView1.Rows[a].Cells["date"].Value.ToString(); + SaveDataCheck(savedate, a); + } + } + public void Init(string search_col, string search_Target) { + SettingGrid_Book(); if (search_Target == "") return; // 0 1 2 3 4 @@ -91,6 +160,30 @@ namespace UniMarc.마크 InputGrid(GridData); } + private void SettingGrid_Book() + { + DataGridView dgv = dataGridView1; + dgv.Columns.Add("idx", "idx"); + dgv.Columns.Add("compidx", "compidx"); + dgv.Columns.Add("isbn", "ISBN"); + dgv.Columns.Add("Title", "서명"); + dgv.Columns.Add("Author", "저자"); + dgv.Columns.Add("Comp", "출판사"); + dgv.Columns.Add("user", "수정자"); + dgv.Columns.Add("date", "수정시각"); + dgv.Columns.Add("grade", "등급"); + dgv.Columns.Add("tag008", "008Tag"); + dgv.Columns.Add("marc", "Marc"); + + dgv.Columns["idx"].Visible = false; + dgv.Columns["compidx"].Visible = false; + dgv.Columns["user"].Width = 120; + dgv.Columns["date"].Width = 120; + dgv.Columns["grade"].Width = 60; + dgv.Columns["tag008"].Width = 150; + dgv.Columns["marc"].Width = 200; + } + private void InputGrid(string[] Value) { progressBar1.Value = 0; @@ -293,6 +386,16 @@ namespace UniMarc.마크 private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { int row = e.RowIndex; + if (cp != null) + { + string[] GridData = { + dataGridView1.Rows[row].Cells["idx"].Value.ToString(), + dataGridView1.Rows[row].Cells["marc"].Value.ToString() + }; + cp.SelectMarc_Sub(row, GridData); + + return; + } SelectMarc(row); } @@ -302,8 +405,8 @@ namespace UniMarc.마크 dataGridView1.Rows[row].Cells["idx"].Value.ToString(), dataGridView1.Rows[row].Cells["compidx"].Value.ToString(), dataGridView1.Rows[row].Cells["user"].Value.ToString(), - dataGridView1.Rows[row].Cells["date"].Value.ToString(), ChangeGrade(dataGridView1.Rows[row].Cells["grade"].Value.ToString()), + dataGridView1.Rows[row].Cells["date"].Value.ToString(), dataGridView1.Rows[row].Cells["tag008"].Value.ToString(), dataGridView1.Rows[row].Cells["marc"].Value.ToString() }; diff --git a/unimarc/unimarc/마크/MarcCopySelect.resx b/unimarc/unimarc/마크/MarcCopySelect.resx index a04e178..1af7de1 100644 --- a/unimarc/unimarc/마크/MarcCopySelect.resx +++ b/unimarc/unimarc/마크/MarcCopySelect.resx @@ -117,37 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Macro_Sub.cs b/unimarc/unimarc/마크/Marc_Macro_Sub.cs index 0b3708e..99932bb 100644 --- a/unimarc/unimarc/마크/Marc_Macro_Sub.cs +++ b/unimarc/unimarc/마크/Marc_Macro_Sub.cs @@ -68,6 +68,17 @@ namespace UniMarc.마크 private string ChangeTagByIndex(string idx, string TagNum, string RunCode, string ViewMarc) { + #region 방식이 달라 특별관리 + + // 440n p x -> 490v [p-n-v 순서]로 변환 / 440n p x -> 830 n p v로 변환 + if (idx == "56" || idx == "57") + { + ViewMarc = Sub_440npv(ViewMarc, idx); + return ViewMarc; + } + + #endregion + if (RunCode.IndexOf("/") < 0) return ViewMarc; bool isDelete = RunCode.Contains("del"); @@ -78,14 +89,6 @@ namespace UniMarc.마크 string TargetTag = CodeSplit[0].Substring(3, 1); string MoveTagNum = CodeSplit[1].Substring(0, 3); string MoveTag = CodeSplit[1].Substring(3, 1); - - #region 방식이 달라 특별관리 - - // 440n p x -> 490v [p-n-v 순서]로 변환 / 440n p x -> 830 n p v로 변환 - if (idx == "56" || idx == "57") - ViewMarc = Sub_440npv(ViewMarc, idx); - - #endregion ViewMarc = TagToOtherTag(TargetTagNum, TargetTag, MoveTagNum, MoveTag, ViewMarc, isDelete); @@ -129,38 +132,46 @@ namespace UniMarc.마크 private string Sub_440npv(string ViewMarc, string idx) { - string oriMarc = st.made_Ori_marc(ViewMarc); - string[] TakeMarc = { "440n", "440p", "440v" }; + string[] TakeMarc = { "440a", "440n", "440p", "440v" }; string[] TakeTag = st.Take_Tag(oriMarc, TakeMarc); - /// 해당 태그 내용 있는지 확인. - bool isEmpty = true; - if (TakeTag[0]!="") isEmpty = false; - if (TakeTag[1]!="") isEmpty = false; - if (TakeTag[2]!="") isEmpty = false; - if (isEmpty) return ViewMarc; + if (TakeTag[0] == "") + return ViewMarc; - if (idx == "56") // 440n p x -> 490v [p-n-v 순서]로 변환 + if (idx == "56") // 440 a n p v -> 490a 490v [p-n-v 순서]로 변환 { // 구분 , - string Tag = "490\t \t▼v"; + string Tag = "490\t \t"; + string Content = ""; - if (TakeTag[0] != "") Tag += TakeTag[0] + ", "; - if (TakeTag[1] != "") Tag += TakeTag[1] + ", "; - if (TakeTag[2] != "") Tag += TakeTag[2]; + if (TakeTag[0] != "") + Tag += "▼a" + TakeTag[0]; + Tag += "▼v"; + if (TakeTag[2] != "") + Content += TakeTag[2] + "-"; + if (TakeTag[1] != "") + Content += TakeTag[1] + "-"; + if (TakeTag[3] != "") + Content += TakeTag[3]; - Tag += "▲"; + Content = Content.TrimEnd('-'); + + Tag += Content + "▲"; ViewMarc = st.AddTagInMarc(Tag, ViewMarc); } - if (idx == "57") // 440n p x -> 830 n p v로 변환 + if (idx == "57") // 440 a n p v -> 830 a n p v로 변환 { - string Tag = "830\t \t"; - - if (TakeTag[0] != "") Tag += "▼n" + TakeTag[0]; - if (TakeTag[1] != "") Tag += "▼p" + TakeTag[1]; - if (TakeTag[2] != "") Tag += "▼v" + TakeTag[2]; + string Tag = string.Format("830\t \t"); + if (TakeTag[0] != "") + Tag += "▼a" + TakeTag[0]; + if (TakeTag[1] != "") + Tag += "▼n" + TakeTag[1]; + if (TakeTag[2] != "") + Tag += "▼p" + TakeTag[2]; + if (TakeTag[3] != "") + Tag += "▼v" + TakeTag[3]; Tag += "▲"; ViewMarc = st.AddTagInMarc(Tag, ViewMarc); } @@ -185,6 +196,9 @@ namespace UniMarc.마크 break; } } + if (ContentTag == "020" && Jisi == "1 " && idx == "75") { + Target = ""; + } switch (ContentTag) { @@ -293,9 +307,13 @@ namespace UniMarc.마크 for (int a = 0; a < SplitContent.Length; a++) { - // $c 원표시 제거 - if (SplitContent[a].StartsWith("c") && idx == "63") - SplitContent[a] = SplitContent[a].Replace("\\", ""); + if (SplitContent[a].StartsWith("c")) + { + if (idx == "63") // $c 원표시 제거 + SplitContent[a] = SplitContent[a].Replace("\\", ""); + if (idx == "71") // $b 원표시 추가 + SplitContent[a] = SplitContent[a].Insert(1, "\\"); + } if (a <= 1) continue; @@ -524,10 +542,20 @@ namespace UniMarc.마크 if (!SplitContent[a - 1].EndsWith(":")) SplitContent[a - 1] += ":"; - // $c 앞에는 ";" 적용 - if (SplitContent[a].StartsWith("c") && idx == "19") - if (!SplitContent[a - 1].EndsWith(";")) - SplitContent[a - 1] += ";"; + if (SplitContent[a].StartsWith("c")) + { + // $c 앞에는 ";" 적용 + if( idx == "19") + if (!SplitContent[a - 1].EndsWith(";")) + SplitContent[a - 1] += ";"; + + // $c X포함 뒷부분 삭제 + if (idx == "73") { + SplitContent[a] = SplitContent[a].ToLower(); + string[] tmp = SplitContent[a].Split('x'); + SplitContent[a] = tmp[0] + "cm▲"; + } + } // $e 앞에는 "+" 적용 if (SplitContent[a].StartsWith("e") && idx == "20") @@ -643,9 +671,14 @@ namespace UniMarc.마크 for (int a = 0; a < SplitContent.Length; a++) { - // $b 원표시 제거 - if (SplitContent[a].StartsWith("b") && idx == "63") - SplitContent[a] = SplitContent[a].Replace("\\", ""); + if (SplitContent[a].StartsWith("b")) + { + + if (idx == "63") // $b 원표시 제거 + SplitContent[a] = SplitContent[a].Replace("\\", ""); + if (idx == "71") // $b 원표시 추가 + SplitContent[a] = SplitContent[a].Insert(1, "\\"); + } if (a <= 1) continue; } diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs index 53fc415..9ad906a 100644 --- a/unimarc/unimarc/마크/Marc_Plan.cs +++ b/unimarc/unimarc/마크/Marc_Plan.cs @@ -1176,6 +1176,8 @@ namespace WindowsFormsApp1.Mac private void btn_ChangeColor_Click(object sender, EventArgs e) { if (dataGridView1.RowCount < 0) return; + if (tb_SearchChangeColor.Text == "여러 개 입력시 , 로 구분") return; + for (int a = 0; a < dataGridView1.RowCount; a++) { dataGridView1.Rows[a].Cells["Search_Tag"].Style.BackColor = Color.White; diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs index c8ec2b7..f8c062f 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs @@ -452,7 +452,7 @@ namespace UniMarc.마크 this.btn_Save.Name = "btn_Save"; this.btn_Save.Size = new System.Drawing.Size(115, 51); this.btn_Save.TabIndex = 4; - this.btn_Save.Text = "저 장\r\n\r\n(F1)"; + this.btn_Save.Text = "저 장\r\n\r\n(F9)"; this.btn_Save.UseVisualStyleBackColor = true; this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); // @@ -716,7 +716,7 @@ namespace UniMarc.마크 this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(162, 12); this.label11.TabIndex = 206; - this.label11.Text = "단축키 F9 : 090 태그 생성"; + this.label11.Text = "단축키 F7 : 090 태그 생성"; // // label4 // diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs index 76ab87d..f0da402 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs @@ -662,7 +662,7 @@ namespace UniMarc.마크 private void richTextBox1_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.F1) + if (e.KeyCode == Keys.F9) btn_Save_Click(null, null); if (e.KeyCode == Keys.F11) @@ -674,7 +674,7 @@ namespace UniMarc.마크 if (e.KeyCode == Keys.Escape) btn_Close_Click(null, null); - if (e.KeyCode == Keys.F9) { + if (e.KeyCode == Keys.F7) { string Tag090 = Sample_090(); Tag_Create("090", Tag090); } diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs index 96bfa67..af8012a 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs @@ -226,6 +226,7 @@ namespace UniMarc.마크 OpenFileDialog OpenFileDialog = new OpenFileDialog(); if (OpenFileDialog.ShowDialog() == DialogResult.OK) { + mp.dataGridView1.Rows.Clear(); string filePath = OpenFileDialog.FileName; try { @@ -245,16 +246,6 @@ namespace UniMarc.마크 void InputGridByFileData(string text) { String_Text st = new String_Text(); - - /* "TODO: 마크 파일 내 마크만 표출하여 수정할 수 있게 추가작업 시작할 것." - 1. 목록을 만든다. (목록명은 파일명) - ㄴ> 굳이 저장해서 더 보관할 필요가 있을까? 파일이 있는데? - - 2. 마크 파일내의 마크만 표출한다. **** - ㄴ> 현재 소스파일 분석결과 idx가 없을 경우 몇몇 기능에 장애가 생김. - ㄴ> 만약 저장기능만 제외하고 전부 쓸 수 있게 변경이 된다면? - ㄴ> 현재로썬 가장 가능성있음. DB에 저장할 필요 자체가 없이 로컬로 작업하는 것도 필요하다고 느낌. - */ string[] grid = text.Split(''); for (int a = 0; a < grid.Length - 1; a++) @@ -262,14 +253,14 @@ namespace UniMarc.마크 string[] Search = { // 등록번호, 분류기호, 저자기호, 볼륨v, 복본c, 별치f "049l", "090a", "090b", "049v", "049c", "049f", - // ISBN, 도서명, 총서명1, 총서번호1, 총서명2, 총서번호2, 출판사, 정가 - "020a", "245a", "440a", "440n", "490a", "490n", "260b", "950b" }; + // ISBN, 도서명, 총서명1, 총서번호1, 총서명2, 총서번호2, 출판사, 정가, 저자 + "020a", "245a", "440a", "440v", "490a", "490v", "260b", "950b", "245d" }; string[] Search_Res = st.Take_Tag(grid[a], Search); - string[] Author_Search = { "100a", "110", "111a" }; + string[] Author_Search = { "100a", "110a", "111a" }; string[] Author_Res = st.Take_Tag(grid[a], Author_Search); - string author_Fin = ""; + string author_Fin = Search_Res[14]; foreach (string author in Author_Res) { if (author != "") { diff --git a/unimarc/unimarc/마크/Marc_mkList.Designer.cs b/unimarc/unimarc/마크/Marc_mkList.Designer.cs index 16a9cca..0d8cdf5 100644 --- a/unimarc/unimarc/마크/Marc_mkList.Designer.cs +++ b/unimarc/unimarc/마크/Marc_mkList.Designer.cs @@ -279,7 +279,7 @@ namespace UniMarc.마크 // this.tb_outnum.Location = new System.Drawing.Point(340, 11); this.tb_outnum.Name = "tb_outnum"; - this.tb_outnum.Size = new System.Drawing.Size(41, 21); + this.tb_outnum.Size = new System.Drawing.Size(31, 21); this.tb_outnum.TabIndex = 5; this.tb_outnum.Text = "0"; this.tb_outnum.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -287,7 +287,7 @@ namespace UniMarc.마크 // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(383, 15); + this.label4.Location = new System.Drawing.Point(377, 15); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(17, 12); this.label4.TabIndex = 3; diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs index 2b3a2c5..70166ce 100644 --- a/unimarc/unimarc/마크/Marc_mkList.cs +++ b/unimarc/unimarc/마크/Marc_mkList.cs @@ -18,6 +18,7 @@ namespace UniMarc.마크 public partial class Marc_mkList : Form { Marc marc; + CD_LP cp; Helper_DB db = new Helper_DB(); string compidx = Settings.Default.compidx; @@ -27,6 +28,12 @@ namespace UniMarc.마크 marc = _marc; } + public Marc_mkList(CD_LP _cp) + { + InitializeComponent(); + cp = _cp; + } + private void Marc_mkList_Load(object sender, EventArgs e) { db.DBcon(); @@ -94,7 +101,7 @@ namespace UniMarc.마크 string listName = tb_listName.Text; string Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string outnum = tb_outnum.Text + "차"; - string user = marc.user_name; + string user = Settings.Default.User; bool isAuthor = false; bool isBook = false; @@ -235,7 +242,6 @@ namespace UniMarc.마크 cmdByMarc = cmdByMarc.TrimEnd(','); cmdByMarc += ";"; - db.DB_Send_CMD_reVoid(cmdByList); db.DB_Send_CMD_reVoid(cmdByMarc); progressBar1.PerformStep(); diff --git a/unimarc/unimarc/홈/Transaction_manage.cs b/unimarc/unimarc/홈/Transaction_manage.cs index a5098e6..93fd92f 100644 --- a/unimarc/unimarc/홈/Transaction_manage.cs +++ b/unimarc/unimarc/홈/Transaction_manage.cs @@ -44,8 +44,8 @@ namespace WindowsFormsApp1.Home string seartempdb = "`idx`, `c_sangho`, `c_gu`, `c_boss`, `c_bubin`, " + "`c_uptae`, `c_jongmok`, `c_tel`, `c_fax`, `c_email`, " + "`c_man`, `c_mantel`, `c_user`, `c_zip`, `c_addr`, " + - "`c_dlsArea`, `c_dlsID`, `c_dlsPW`, `c_division`, `c_label`," + - " `c_program`, `c_etc`"; + "`c_dlsArea`, `c_dlsID`, `c_dlsPW`, `c_division`, `c_label`, " + + "`c_program`, `c_etc`"; string cmd = db.DB_Select_Search(seartempdb, "Client", "campanyidx", compidx); string db_res = db.DB_Send_CMD_Search(cmd); dataGridView1.Rows.Clear();