diff --git a/.gitignore b/.gitignore index 0e4a9e9..caa46f6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,6 @@ Skill.cs ## 폴더 무시 unimarc/Factory_Client/ ISBN_Client/ -Test_Project/ \ No newline at end of file +Test_Project/ +Test_HTML/ +AuthorSymbol/ \ No newline at end of file diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index 1319ddf..199d3ee 100644 Binary files a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo and b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo differ diff --git a/Test_Project/.vs/Test_Project/v16/.suo b/Test_Project/.vs/Test_Project/v16/.suo index d73eed6..0e775d5 100644 Binary files a/Test_Project/.vs/Test_Project/v16/.suo and b/Test_Project/.vs/Test_Project/v16/.suo differ diff --git a/Test_Project/bin/Debug/Test_Project.pdb b/Test_Project/bin/Debug/Test_Project.pdb index ee10ac6..2c3419e 100644 Binary files a/Test_Project/bin/Debug/Test_Project.pdb and b/Test_Project/bin/Debug/Test_Project.pdb differ diff --git a/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 3bbe158..680bcfd 100644 Binary files a/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 15b9b51..abdac31 100644 Binary files a/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Test_Project/obj/Debug/Test_Project.csproj.AssemblyReference.cache b/Test_Project/obj/Debug/Test_Project.csproj.AssemblyReference.cache index f5e894a..76f226a 100644 Binary files a/Test_Project/obj/Debug/Test_Project.csproj.AssemblyReference.cache and b/Test_Project/obj/Debug/Test_Project.csproj.AssemblyReference.cache differ diff --git a/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache b/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache index 282b345..15b3037 100644 --- a/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache +++ b/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6aefef5cdcf843f26c61154cb636b4f360be5390 +c233669835bb4757d27d7338d497d11ec470b347 diff --git a/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt b/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt index 5f3a1f3..f58ad4e 100644 --- a/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt +++ b/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt @@ -8,3 +8,4 @@ C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.cspro C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.exe C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.pdb C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.Form1.resources +C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.Form2.resources diff --git a/Test_Project/obj/Debug/Test_Project.csproj.GenerateResource.cache b/Test_Project/obj/Debug/Test_Project.csproj.GenerateResource.cache index 9a2fb27..7e96ab3 100644 Binary files a/Test_Project/obj/Debug/Test_Project.csproj.GenerateResource.cache and b/Test_Project/obj/Debug/Test_Project.csproj.GenerateResource.cache differ diff --git a/Test_Project/obj/Debug/Test_Project.pdb b/Test_Project/obj/Debug/Test_Project.pdb index ee10ac6..2c3419e 100644 Binary files a/Test_Project/obj/Debug/Test_Project.pdb and b/Test_Project/obj/Debug/Test_Project.pdb differ diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 1261ac1..56aafc1 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs index e1ad0f4..17729f1 100644 --- a/unimarc/unimarc/Main.Designer.cs +++ b/unimarc/unimarc/Main.Designer.cs @@ -398,7 +398,7 @@ this.불용어ToolStripMenuItem, this.작업지시서ToolStripMenuItem}); this.설정ToolStripMenuItem.Name = "설정ToolStripMenuItem"; - this.설정ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.설정ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.설정ToolStripMenuItem.Text = "설정"; // // 단축키설정ToolStripMenuItem @@ -437,7 +437,7 @@ this.엑셀작성ToolStripMenuItem, this.iSBN조회ToolStripMenuItem}); this.마크작업ToolStripMenuItem.Name = "마크작업ToolStripMenuItem"; - this.마크작업ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.마크작업ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.마크작업ToolStripMenuItem.Text = "마크 작업"; // // 마크목록ToolStripMenuItem @@ -474,7 +474,7 @@ this.반입ToolStripMenuItem, this.반출ToolStripMenuItem}); this.반입및반출ToolStripMenuItem.Name = "반입및반출ToolStripMenuItem"; - this.반입및반출ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.반입및반출ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.반입및반출ToolStripMenuItem.Text = "반입 및 반출"; // // 반입ToolStripMenuItem @@ -497,7 +497,7 @@ this.복본조사ToolStripMenuItem1, this.dLS복본조사ToolStripMenuItem}); this.복본조사ToolStripMenuItem.Name = "복본조사ToolStripMenuItem"; - this.복본조사ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.복본조사ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.복본조사ToolStripMenuItem.Text = "복본 조사"; // // 복본조사ToolStripMenuItem1 @@ -522,34 +522,34 @@ this.검수ToolStripMenuItem, this.저자기호ToolStripMenuItem}); this.부가기능ToolStripMenuItem.Name = "부가기능ToolStripMenuItem"; - this.부가기능ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.부가기능ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.부가기능ToolStripMenuItem.Text = "부가기능"; // // 마크수집ToolStripMenuItem // this.마크수집ToolStripMenuItem.Name = "마크수집ToolStripMenuItem"; - this.마크수집ToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.마크수집ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.마크수집ToolStripMenuItem.Text = "마크수집"; this.마크수집ToolStripMenuItem.Click += new System.EventHandler(this.마크수집ToolStripMenuItem_Click); // // 전집관리ToolStripMenuItem1 // this.전집관리ToolStripMenuItem1.Name = "전집관리ToolStripMenuItem1"; - this.전집관리ToolStripMenuItem1.Size = new System.Drawing.Size(122, 22); + this.전집관리ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.전집관리ToolStripMenuItem1.Text = "전집관리"; this.전집관리ToolStripMenuItem1.Click += new System.EventHandler(this.전집관리ToolStripMenuItem1_Click); // // 검수ToolStripMenuItem // this.검수ToolStripMenuItem.Name = "검수ToolStripMenuItem"; - this.검수ToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.검수ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.검수ToolStripMenuItem.Text = "검수"; this.검수ToolStripMenuItem.Click += new System.EventHandler(this.검수ToolStripMenuItem_Click); // // 저자기호ToolStripMenuItem // this.저자기호ToolStripMenuItem.Name = "저자기호ToolStripMenuItem"; - this.저자기호ToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.저자기호ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.저자기호ToolStripMenuItem.Text = "저자기호"; this.저자기호ToolStripMenuItem.Click += new System.EventHandler(this.저자기호ToolStripMenuItem_Click); // @@ -559,20 +559,20 @@ this.dLS조회ToolStripMenuItem, this.dLS입력ToolStripMenuItem}); this.dLSToolStripMenuItem.Name = "dLSToolStripMenuItem"; - this.dLSToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.dLSToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.dLSToolStripMenuItem.Text = "DLS"; // // dLS조회ToolStripMenuItem // this.dLS조회ToolStripMenuItem.Name = "dLS조회ToolStripMenuItem"; - this.dLS조회ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.dLS조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.dLS조회ToolStripMenuItem.Text = "DLS 조회"; this.dLS조회ToolStripMenuItem.Click += new System.EventHandler(this.dLS조회ToolStripMenuItem_Click); // // dLS입력ToolStripMenuItem // this.dLS입력ToolStripMenuItem.Name = "dLS입력ToolStripMenuItem"; - this.dLS입력ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.dLS입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.dLS입력ToolStripMenuItem.Text = "DLS 입력"; this.dLS입력ToolStripMenuItem.Click += new System.EventHandler(this.dLS입력ToolStripMenuItem_Click_1); // @@ -583,27 +583,27 @@ this.마크통계ToolStripMenuItem, this.장비관리ToolStripMenuItem1}); this.기타ToolStripMenuItem.Name = "기타ToolStripMenuItem"; - this.기타ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.기타ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.기타ToolStripMenuItem.Text = "기타"; // // 서류작성ToolStripMenuItem // this.서류작성ToolStripMenuItem.Name = "서류작성ToolStripMenuItem"; - this.서류작성ToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.서류작성ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.서류작성ToolStripMenuItem.Text = "서류작성"; this.서류작성ToolStripMenuItem.Click += new System.EventHandler(this.서류작성ToolStripMenuItem_Click); // // 마크통계ToolStripMenuItem // this.마크통계ToolStripMenuItem.Name = "마크통계ToolStripMenuItem"; - this.마크통계ToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.마크통계ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.마크통계ToolStripMenuItem.Text = "마크통계"; this.마크통계ToolStripMenuItem.Click += new System.EventHandler(this.마크통계ToolStripMenuItem_Click); // // 장비관리ToolStripMenuItem1 // this.장비관리ToolStripMenuItem1.Name = "장비관리ToolStripMenuItem1"; - this.장비관리ToolStripMenuItem1.Size = new System.Drawing.Size(122, 22); + this.장비관리ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.장비관리ToolStripMenuItem1.Text = "장비관리"; this.장비관리ToolStripMenuItem1.Click += new System.EventHandler(this.장비관리ToolStripMenuItem1_Click); // diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index 5712bd3..ddeab12 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -108,6 +108,12 @@ Order_Send_Chk.cs + + Form + + + All_Book_manage_Add.cs + Form @@ -630,6 +636,9 @@ Order_Send_Chk.cs + + All_Book_manage_Add.cs + Check_ISBN_Sub.cs diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 5ee465c..ec70d4a 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 4bf5572..a15d310 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 d6c4141..ff5f2b0 100644 Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache index 25e9420..ee3407c 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d2731517ce60a3dc8b8c6b18b3ba868b48ad75db +633b9d395fc7540535e6b0184ba54303a9134e29 diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt index e98dcfc..450a1cc 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt @@ -116,3 +116,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크. C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Check_ISBN_Yes24.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.csproj.AssemblyReference.cache C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.회계.Part_time.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.All_Book_manage_Add.resources diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index 2c9f6a4..732a202 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 5ee465c..ec70d4a 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 4bf5572..a15d310 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.마크.All_Book_manage_Add.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.All_Book_manage_Add.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.All_Book_manage_Add.resources differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index d6c4141..ff5f2b0 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/납품관리/Book_Lookup.Designer.cs b/unimarc/unimarc/납품관리/Book_Lookup.Designer.cs index 262ff0b..ce02073 100644 --- a/unimarc/unimarc/납품관리/Book_Lookup.Designer.cs +++ b/unimarc/unimarc/납품관리/Book_Lookup.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.lbl_idx = new System.Windows.Forms.Label(); this.tb_isbn = new System.Windows.Forms.TextBox(); @@ -460,6 +460,7 @@ this.btn_printLine.Text = "띠지출력"; this.btn_printLine.UseVisualStyleBackColor = true; this.btn_printLine.Visible = false; + this.btn_printLine.Click += new System.EventHandler(this.btn_printLine_Click); // // panel2 // @@ -519,14 +520,14 @@ this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.AllowUserToResizeColumns = false; this.dataGridView1.AllowUserToResizeRows = false; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + 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.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column1, this.Column2, @@ -534,14 +535,14 @@ this.Column4, this.Column5, this.Column6}); - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle12.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle6; this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridView1.Location = new System.Drawing.Point(9, 311); this.dataGridView1.Name = "dataGridView1"; diff --git a/unimarc/unimarc/납품관리/Book_Lookup.cs b/unimarc/unimarc/납품관리/Book_Lookup.cs index 21b5308..f7b052c 100644 --- a/unimarc/unimarc/납품관리/Book_Lookup.cs +++ b/unimarc/unimarc/납품관리/Book_Lookup.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Data; using System.Drawing; using System.Drawing.Drawing2D; +using System.Drawing.Printing; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -85,6 +86,7 @@ namespace WindowsFormsApp1.Delivery if (db_data[5] != "") { add_grid[0] = db_data[5]; add_grid[1] = "입고"; + btn_printLine.Visible = true; dataGridView1.Rows.Add(add_grid); } if (db_data[6] != "") { @@ -244,5 +246,63 @@ namespace WindowsFormsApp1.Delivery { tb_order_date.Text = DateTime.Now.ToString("G").Substring(0, 10); } + + private void btn_printLine_Click(object sender, EventArgs e) + { + PrintDocument pd = new PrintDocument(); + pd.DocumentName = "띠지 출력"; + pd.DefaultPageSettings.Landscape = true; + pd.PrintPage += new PrintPageEventHandler(this.pd_Print_Page); + pd.Print(); + } + #region PrintLine_Sub + private void pd_Print_Page(object sender, PrintPageEventArgs e) + { + string list_name = tb_List_name.Text.Replace("[", ""); + list_name = list_name.Replace("]", "-"); + + string book_name = tb_book_name.Text; + string price = tb_pay.Text.Replace(",", ""); + price = string.Format("{0:#,###}", Convert.ToInt32(price)); + tb_pay.Text = price; + string[] text = { tb_num.Text, tb_count.Text, list_name, book_name, price, tb_book_comp.Text, tb_isbn.Text }; + + Graphics g = e.Graphics; + + int xPos = 0; + int yPos = 0; + + int MaxX = 133; + + Pen p = new Pen(Color.Black); + + Font title = new Font("굴림", 22, FontStyle.Bold); + Font count = new Font("굴림", 16, FontStyle.Bold); + Font list = new Font("굴림", 14, FontStyle.Regular); + Font book = new Font("굴림", 18, FontStyle.Regular); + Font price_f = new Font("굴림", 14, FontStyle.Regular); + + RectangleF title_Area = new RectangleF(xPos, yPos, MaxX, 35); + yPos += 30; + RectangleF count_Area = new RectangleF(xPos, yPos, MaxX, 35); + yPos += 25; + RectangleF list_Area = new RectangleF(xPos, yPos, MaxX, 70); + yPos += 65; + RectangleF book_Area1 = new RectangleF(xPos, yPos, MaxX, 120); + yPos += 115; + RectangleF price_Area = new RectangleF(xPos, yPos, MaxX, 70); + + //g.DrawLine(p, MaxX, 0, MaxX, yPos); + + using (SolidBrush drawBrush = new SolidBrush(Color.Black)) + { + g.DrawString(text[0], title, drawBrush, title_Area); + g.DrawString(text[1], count, drawBrush, count_Area); + g.DrawString(text[2], list, drawBrush, list_Area); + g.DrawString(text[3], book, drawBrush, book_Area1); + g.DrawString(text[4], price_f, drawBrush, price_Area); + } + } + #endregion } } diff --git a/unimarc/unimarc/납품관리/List_aggregation.Designer.cs b/unimarc/unimarc/납품관리/List_aggregation.Designer.cs index 306f969..cd6ad8c 100644 --- a/unimarc/unimarc/납품관리/List_aggregation.Designer.cs +++ b/unimarc/unimarc/납품관리/List_aggregation.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(List_aggregation)); this.btn_lookup = new System.Windows.Forms.Button(); this.btn_save = new System.Windows.Forms.Button(); @@ -105,7 +105,6 @@ this.printDocument1 = new System.Drawing.Printing.PrintDocument(); this.panel4 = new System.Windows.Forms.Panel(); this.lbl_total = new System.Windows.Forms.Label(); - this.lbl_pay = new System.Windows.Forms.Label(); this.lbl_count = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); @@ -194,14 +193,14 @@ this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control; - 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.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + 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.list_name, this.list_date, @@ -806,7 +805,6 @@ // this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel4.Controls.Add(this.lbl_total); - this.panel4.Controls.Add(this.lbl_pay); this.panel4.Controls.Add(this.lbl_count); this.panel4.Controls.Add(this.label16); this.panel4.Location = new System.Drawing.Point(12, 613); @@ -824,21 +822,11 @@ this.lbl_total.TabIndex = 0; this.lbl_total.Text = "합계 : "; // - // lbl_pay - // - this.lbl_pay.AutoSize = true; - this.lbl_pay.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_pay.Location = new System.Drawing.Point(469, 5); - this.lbl_pay.Name = "lbl_pay"; - this.lbl_pay.Size = new System.Drawing.Size(50, 13); - this.lbl_pay.TabIndex = 0; - this.lbl_pay.Text = "단가 : "; - // // lbl_count // this.lbl_count.AutoSize = true; this.lbl_count.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_count.Location = new System.Drawing.Point(248, 5); + this.lbl_count.Location = new System.Drawing.Point(357, 5); this.lbl_count.Name = "lbl_count"; this.lbl_count.Size = new System.Drawing.Size(50, 13); this.lbl_count.TabIndex = 0; @@ -970,7 +958,6 @@ private System.Windows.Forms.Label label15; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Label lbl_total; - private System.Windows.Forms.Label lbl_pay; private System.Windows.Forms.Label lbl_count; private System.Windows.Forms.Label label16; } diff --git a/unimarc/unimarc/납품관리/List_aggregation.cs b/unimarc/unimarc/납품관리/List_aggregation.cs index 78c0190..9ef9638 100644 --- a/unimarc/unimarc/납품관리/List_aggregation.cs +++ b/unimarc/unimarc/납품관리/List_aggregation.cs @@ -86,10 +86,26 @@ namespace WindowsFormsApp1.Delivery string db_tmp = db.More_DB_Search("Obj_List", searchdb1, searchdb2, searchdb); Made_Grid(db_tmp); + Print_lbl_Total(); dataGridView1.Focus(); } #region Lookup_Click_Sub /// + /// 라벨에 총 합계 출력 + /// + private void Print_lbl_Total() + { + int count = 0; + int total = 0; + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + count += Convert.ToInt32(dataGridView1.Rows[a].Cells["count"].Value.ToString()); + total += Convert.ToInt32(dataGridView1.Rows[a].Cells["total"].Value.ToString()); + } + lbl_count.Text = string.Format("수량 : {0:#,###}", count); + lbl_total.Text = string.Format("합계 : {0:#,###}", total); + } + /// /// 표에 값을 채우는 함수. /// /// 분할을 하지않은 데이터베이스 값 @@ -100,7 +116,7 @@ namespace WindowsFormsApp1.Delivery string[] grid = { "", "", "", "", "", "", "", "", "", "", - "", "", "", "", "", + "", "", "", "", "", "", "" }; int count = 15; for (int a = 0; a < db_data.Length; a++) @@ -133,7 +149,7 @@ namespace WindowsFormsApp1.Delivery if (a % count == 12) { grid[14] = db_data[a]; } if (a % count == 13) { grid[15] = db_data[a]; } if (a % count == 14) { - grid[16] = db_data[a]; + grid[16] = db_data[a]; if (Grid_filter(grid)) { dataGridView1.Rows.Add(grid); @@ -227,7 +243,7 @@ namespace WindowsFormsApp1.Delivery value = Regex.Replace(value, @"[^0-9]", ""); - if(value == "") return; + if (value == "") return; string[] Edit_col = { "state" }; string[] Edit_data = { "완료" }; @@ -255,8 +271,8 @@ namespace WindowsFormsApp1.Delivery { string[] tmp = book_list.Split('|'); List l_book = new List(); - string[] book = { "", "", "", "", "", "", "" }; - for(int a= 0; a < tmp.Length; a++) + + for (int a = 0; a < tmp.Length; a++) { if (a % 8 == 0) { l_book.Add(tmp[a]); } // isbn if (a % 8 == 1) { l_book.Add(tmp[a]); } // isbn_import @@ -266,7 +282,7 @@ namespace WindowsFormsApp1.Delivery if (a % 8 == 5) { l_book.Add(tmp[a]); } // price if (a % 8 == 6) { l_book.Add(tmp[a]); } // input_count if (a % 8 == 7) { l_book.Add(tmp[a]); // persent - book = db_data_filter(l_book, book); + string[] book = db_data_filter(l_book); input_sales(book, out_per); } } @@ -288,8 +304,8 @@ namespace WindowsFormsApp1.Delivery "count", "out_per", "total", "in_price", "out_price", "in_per", "etc" }; string[] insert_data = { compidx, date, dataGridView1.Rows[row].Cells["list_date"].Value.ToString(), dataGridView1.Rows[row].Cells["list_name"].Value.ToString(), clt, - book[0], book[1], book[2], book[3], book[4], - book[5], out_per, total[0], total[1], total[2], book[6], etc }; + book[0], book[1], book[2], book[3], book[4], + book[5], out_per, total[0], total[1], total[2], book[6], etc }; db.DB_INSERT("Sales", col_name, insert_data); } @@ -309,7 +325,7 @@ namespace WindowsFormsApp1.Delivery string[] result = { total.ToString(), in_price.ToString(), out_price.ToString() }; return result; } - private string[] db_data_filter(List l_book, string[] book) + private string[] db_data_filter(List l_book) { if (l_book[0] == "") { l_book.RemoveAt(0); @@ -317,7 +333,7 @@ namespace WindowsFormsApp1.Delivery else if(l_book[0] != l_book[1]){ l_book.RemoveAt(1); } - book = l_book.ToArray(); + string[] book = l_book.ToArray(); return book; } int cnt = 0; int pageNo = 1; diff --git a/unimarc/unimarc/납품관리/Order_Send_Chk.cs b/unimarc/unimarc/납품관리/Order_Send_Chk.cs index 5be58a2..dfe0537 100644 --- a/unimarc/unimarc/납품관리/Order_Send_Chk.cs +++ b/unimarc/unimarc/납품관리/Order_Send_Chk.cs @@ -4,7 +4,9 @@ using System.ComponentModel; using System.Data; using System.Diagnostics; using System.Drawing; +using System.IO; using System.Linq; +using System.Net; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -49,6 +51,9 @@ namespace WindowsFormsApp1.납품관리 private void btn_Lookup_Click(object sender, EventArgs e) { + dataGrid_Email.Rows.Clear(); + dataGrid_Fax.Rows.Clear(); + set_date[0] = Start_DatePicker.Value.ToString().Substring(0, 10); set_date[1] = End_DatePicker.Value.ToString().Substring(0, 10); @@ -105,7 +110,6 @@ namespace WindowsFormsApp1.납품관리 // 수신자회사명, 수신번호, 전송일시, 전송상태, 전송페이지수, 성공페이지수, 전송파일명, 전송결과 string[] data = fax.Send_chk_BaroFax(db_data[a]); - MessageBox.Show(db_data[a]); grid[0] = db_data[a]; grid[1] = data[0]; grid[2] = data[1]; @@ -169,9 +173,46 @@ namespace WindowsFormsApp1.납품관리 } try { - Process.Start(Application.StartupPath + "\\Excel\\" + filename + ".xlsx"); + string localPath = Application.StartupPath + "\\Excel\\"; + // filename += ".xlsx"; + string strFile = localPath + filename; + FileInfo fileInfo = new FileInfo(strFile); + + if (fileInfo.Exists) // 로컬 경로에 파일이 존재 할 경우 + Process.Start(strFile); + else { + // 존재하지 않을 경우 FTP에 접속하여 로컬경로로 파일을 다운로드 함. + FTP_Down(filename); + Process.Start(strFile); + } } catch { } } + #region Sub + private void FTP_Down(string file_name) + { + string ip = "1.215.250.130"; + string id = "ftpgloria"; + string pw = "admin@!@#$"; + + WebClient clnt = new WebClient(); + + clnt.Credentials = new NetworkCredential(id, pw); + + Uri uri = new Uri(string.Format("FTP://{0}@{1}/Excel/{2}", id, ip, file_name)); + + clnt.DownloadFileAsync(uri, Application.StartupPath + "\\Excel\\" + file_name); + + clnt.DownloadFileCompleted += new AsyncCompletedEventHandler(DownloadFileCallBack); + } + private static void DownloadFileCallBack(object sender, AsyncCompletedEventArgs e) + { + if (e.Cancelled) + MessageBox.Show("File Download Cancelled"); + + if (e.Error != null) + MessageBox.Show(e.Error.ToString()); + } + #endregion } } diff --git a/unimarc/unimarc/납품관리/Order_input.cs b/unimarc/unimarc/납품관리/Order_input.cs index a507114..2459b5b 100644 --- a/unimarc/unimarc/납품관리/Order_input.cs +++ b/unimarc/unimarc/납품관리/Order_input.cs @@ -6,6 +6,7 @@ using System.Diagnostics; using System.Drawing; using System.IO; using System.Linq; +using System.Net; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -430,9 +431,11 @@ namespace WindowsFormsApp1.Delivery // 엑셀파일 생성 string filename = Excel_sub(); - string filePath = Application.StartupPath + "\\Excel"; + string filePath = Application.StartupPath + "\\Excel\\"; - switch (emchk) + Upload_File(filename, filePath); + + switch (emchk) { case "0": Send_FAX(pur, filename, filePath); @@ -443,6 +446,33 @@ namespace WindowsFormsApp1.Delivery } } #region Order_Send_Sub + + private void Upload_File(string file_name, string path) + { + FTP ftp = new FTP(); + bool result = ftp.ConnectToServer("1.215.250.130", "21", "ftpgloria", "admin@!@#$"); + + DirectoryInfo dirInfo = new DirectoryInfo(path); + FileInfo[] infos = dirInfo.GetFiles(); + + if (result) + { + foreach (FileInfo info in dirInfo.GetFiles()) + { + if (Path.GetFileName(info.Name) == file_name) + { + path = path.Replace(Application.StartupPath, ""); + if (!ftp.UpLoad(path, info.FullName)) + MessageBox.Show("FTP Upload 실패"); + + else + MessageBox.Show("FTP Upload 성공"); + } + } + } + else + MessageBox.Show("FTP 접속 실패"); + } /// /// 보낼 경로가 메일인지 팩스인지 확인 /// @@ -461,7 +491,6 @@ namespace WindowsFormsApp1.Delivery /// 파일경로 (파일명 포함) private void Send_FAX(string pur, string filename, string FilePath) { - List data_list = new List(); string Area = "`fax`"; @@ -508,22 +537,22 @@ namespace WindowsFormsApp1.Delivery FTP ftp = new FTP(); - bool result = ftp.ConnectToServer(); + bool result = ftp.ConnectToServer("testftp.barobill.co.kr", "9031", "gloriabook", "gloria7300"); string path = @""; DirectoryInfo dirInfo = new DirectoryInfo(FilePath); FileInfo[] infos = dirInfo.GetFiles(); - if (result == true) + if (result) { foreach (FileInfo info in dirInfo.GetFiles()) { if (Path.GetFileName(info.Name) == filename) { if (ftp.UpLoad(path, info.FullName) == false) - MessageBox.Show("FTP Upload 실패"); + MessageBox.Show("팩스 FTP Upload 실패"); else - MessageBox.Show("FTP Upload 성공"); + MessageBox.Show("팩스 FTP Upload 성공"); } } @@ -604,7 +633,6 @@ namespace WindowsFormsApp1.Delivery { Order_Send_Chk orc = new Order_Send_Chk(this); orc.Show(); - } private void btn_order_list_change_Click(object sender, EventArgs e) { diff --git a/unimarc/unimarc/납품관리/Purchase.cs b/unimarc/unimarc/납품관리/Purchase.cs index acf7957..a351c1b 100644 --- a/unimarc/unimarc/납품관리/Purchase.cs +++ b/unimarc/unimarc/납품관리/Purchase.cs @@ -376,14 +376,14 @@ namespace WindowsFormsApp1.Delivery * btn취소 isbn 입고시간 */ string[] grid2 = {"", "", "", "", "", "", "", "", "", "", - "취소", "", System.DateTime.Now.ToString("g")}; + "취소", "", DateTime.Now.ToString("g")}; /* 번호 수량 도서명 출판사 저자 * 정가 매입율 합계 비고 구분 * 주문처 날짜 isbn */ string[] grid3 = {"", "", "", "", "", "0", "", "", "", "", - "", System.DateTime.Now.ToString("g"), ""}; + "", DateTime.Now.ToString("g"), ""}; if(row < 0 || col < 0) { return; @@ -446,6 +446,23 @@ namespace WindowsFormsApp1.Delivery dataGridView1.Rows.RemoveAt(row); } + private bool stock_chk(string isbn) + { + string Area = "`isbn`"; + string[] table = { "compidx" }; + string[] colum = { compidx }; + string tmp = db.More_DB_Search("Inven", table, colum, Area); + string[] inven_isbn = tmp.Split('|'); + for (int a = 0; a < inven_isbn.Length - 1; a++) + { + inven_isbn[a] = inven_isbn[a].Replace("\r", string.Empty); + } + for (int a = 0; a < inven_isbn.Length - 1; a++) + { + if (isbn == inven_isbn[a]) { return true; } + } + return false; + } private int stock_count_chk(string isbn) { string Area = "`count`"; @@ -560,61 +577,6 @@ namespace WindowsFormsApp1.Delivery } Grid3_Book_Count(); } - private void input_Inven(int data, int row_count) - { - string Search_Table = "`compidx`, `list_name`, `header`, `num`, `book_name`, " + - "`author`, `book_comp`, `count`, `pay`, " + //`persent`, " + - "`total`, `etc`, `isbn`, `order`, `order_stat`, " + - "`order_date`, `send_date`, `stat`, `chk_date`, `import`, " + - "`import_date`, `export`, `export_date`"; - string[] Where_Table = { "compidx", "book_name", "author", "book_comp", "list_name" }; - string[] Search_Data = { compidx, - dataGridView2.Rows[row_count].Cells["Book_name2"].Value.ToString(), - dataGridView2.Rows[row_count].Cells["author2"].Value.ToString(), - dataGridView2.Rows[row_count].Cells["Book_comp2"].Value.ToString(), - dataGridView2.Rows[row_count].Cells["list_name2"].Value.ToString() }; - string db_tmp_data = db.More_DB_Search("Obj_List_Book", Where_Table, Search_Data, Search_Table); - string[] db_data = db_tmp_data.Split('|'); - - string[] input_data = { "", "", "", "", "", - "", "", "", "", //"", - "", "", "", "", "", - "", "", "", "", "", - "", "", "" }; - string[] input_col = { "compidx", "list_name", "header", "num", "book_name", - "author", "book_comp", "count", "pay", //"persent", - "total", "etc", "isbn", "order", "order_stat", - "order_date", "send_date", "stat", "chk_date", "import", - "import_date", "export", "export_date" }; - - // 마지막 공란 제거 for문 - for(int a= 0; a < db_data.Length-1; a++) - { - input_data[a] = db_data[a]; - - if (a == 7) input_data[a] = data.ToString(); - } - - // Inven테이블내 데이터중복체크 - string[] chk_Table = { "compidx", "isbn" }; - string[] chk_Data = { compidx, db_data[12] }; - string chk = db.More_DB_Search("Inven", chk_Table, chk_Data); - - // 중복데이터가 검색되지않음. - if (chk.Length < 3) { - db.DB_INSERT("Inven", input_col, input_data); - MessageBox.Show("DB 새로 추가"); - return; - } - else { - string count_tmp = db.More_DB_Search("Inven", chk_Table, chk_Data, "`count`, `idx`"); - string[] cout = count_tmp.Split('|'); - int count = Convert.ToInt32(cout[0]); - count += data; - MessageBox.Show("DB 수정"); - db.DB_Update("Inven", "count", count.ToString(), "idx", cout[0]); - } - } private void press_Grid2_Btn(DataGridViewCellEventArgs e) { string number = dataGridView2.Rows[e.RowIndex].Cells["num2"].Value.ToString(); @@ -629,17 +591,17 @@ namespace WindowsFormsApp1.Delivery string db_data = db.More_DB_Search("Obj_List_Book", Table, Data, Area); Insert_Grid(db_data); - for(int a = 0; a < dataGridView3.Rows.Count-1; a++) + for (int a = 0; a < dataGridView3.Rows.Count - 1; a++) { - if (dataGridView3.Rows[a].Cells["book_name3"].Value.ToString() == Data[0] && + if (dataGridView3.Rows[a].Cells["book_name3"].Value.ToString() == Data[0] && dataGridView3.Rows[a].Cells["book_comp3"].Value.ToString() == Data[1] && dataGridView3.Rows[a].Cells["author3"].Value.ToString() == Data[2]) { int count = Convert.ToInt32(dataGridView3.Rows[a].Cells["count3"].Value.ToString()); count--; - if(count == 0) { + if (count == 0) { dataGridView3.Rows.RemoveAt(a); } - else if(count > 0) { + else if (count > 0) { dataGridView3.Rows[a].Cells["count3"].Value = count.ToString(); } } @@ -658,25 +620,163 @@ namespace WindowsFormsApp1.Delivery { for(int a = 0; a < dataGridView2.Rows.Count; a++) { string[] search_Col = { "book_name", "book_comp", "author", "list_name" }; - string[] search_Data = { dataGridView2.Rows[a].Cells["Book_name2"].Value.ToString(), - dataGridView2.Rows[a].Cells["Book_comp2"].Value.ToString(), - dataGridView2.Rows[a].Cells["author2"].Value.ToString(), - dataGridView2.Rows[a].Cells["list_name2"].Value.ToString() }; + string[] search_Data = { + dataGridView2.Rows[a].Cells["Book_name2"].Value.ToString(), + dataGridView2.Rows[a].Cells["Book_comp2"].Value.ToString(), + dataGridView2.Rows[a].Cells["author2"].Value.ToString(), + dataGridView2.Rows[a].Cells["list_name2"].Value.ToString() + }; string[] edit_Col = { "import", "import_date", "isbn_import" }; string[] edit_Data = { "입고", dataGridView2.Rows[a].Cells["Date"].Value.ToString(), dataGridView2.Rows[a].Cells["isbn2"].Value.ToString() }; db.More_Update("Obj_List_Book", edit_Col, edit_Data, search_Col, search_Data); } - // 입고작업을 하려는 책이 재고에 있을 경우, 재고 -1이 되어야함. - /* 만약 재고수보다 입고수가 더 많을경우는? + /* 입고작업을 하려는 책이 재고에 있을 경우, 재고 -1이 되어야함. + * 만약 재고수보다 입고수가 더 많을경우는? * 1. 재고수량이 0이 되며, 나머지값을 매입원장에 기입. * (재고1, 입고필요수량3 일 경우 재고는 사라지고, 매입원장에 2권분량의 값이 들어가야함.) */ save_grid2(); - //save_grid3(); input_ledger(); } + #region Save_Sub + /// + /// 목록도서DB 안의 입고수량 수정하는 함수 + /// + private void save_grid2() + { + for (int a = 0; a < dataGridView2.Rows.Count; a++) + { + string[] grid2 = { + dataGridView2.Rows[a].Cells["num2"].Value.ToString(), // 번호 + dataGridView2.Rows[a].Cells["count2"].Value.ToString(), // 수량 + dataGridView2.Rows[a].Cells["Book_name2"].Value.ToString(), // 도서명 + dataGridView2.Rows[a].Cells["Book_comp2"].Value.ToString(), // 출판사 + dataGridView2.Rows[a].Cells["author2"].Value.ToString(), // 저자 + dataGridView2.Rows[a].Cells["pay2"].Value.ToString(), // 단가 + dataGridView2.Rows[a].Cells["total2"].Value.ToString(), // 합계 + dataGridView2.Rows[a].Cells["list_name2"].Value.ToString(), // 구분 + dataGridView2.Rows[a].Cells["edasd"].Value.ToString(), // 비고 + dataGridView2.Rows[a].Cells["order2"].Value.ToString(), // 주문처명 + dataGridView2.Rows[a].Cells["Date"].Value.ToString() // 입고시간 + }; + + string[] Search_col = { "compidx", "book_name", "book_comp", "author", "list_name" }; + string[] Search_data = { compidx, grid2[2], grid2[3], grid2[4], grid2[7] }; + + string tmp_db = db.More_DB_Search("Obj_List_Book", Search_col, Search_data, "`count`"); + string[] db_data = tmp_db.Split('|'); + + string[] Edit_col = { "input_count" }; + string[] Edit_data = { Inven_count(db_data[0], dataGridView2.Rows[a].Cells["count2"].Value.ToString(), a) }; + db.More_Update("Obj_List_Book", Edit_col, Edit_data, Search_col, Search_data); + } + } + /// + /// 재고에 들어갈 카운트를 재는거 + /// + /// 목록DB내 수량 + /// 입고된 수량 + /// + private string Inven_count(string ori, string change, int count) + { + string result = change; + int i_ori = Convert.ToInt32(ori); + int i_change = Convert.ToInt32(change); + if (i_ori < i_change) + { + int i_result = i_change - i_ori; + Input_Inven(i_result, count); + return ori; + } + else if (i_ori > i_change) + { + // 비고로 부족한 수량이 들어가야함 + int i_result = i_change - i_ori; + Etc_Count(i_result, count); + } + return result; + } + private void Etc_Count(int res, int row) + { + + string[] Edit_Col = { "etc", "import" }; + string[] Edit_Data = { res.ToString(), "미입고" }; + string[] Search_Name = { "compidx", "book_name", "author", "book_comp", "list_name" }; + string[] Search_Data = { compidx, + dataGridView2.Rows[row].Cells["Book_name2"].Value.ToString(), + dataGridView2.Rows[row].Cells["author2"].Value.ToString(), + dataGridView2.Rows[row].Cells["Book_comp2"].Value.ToString(), + dataGridView2.Rows[row].Cells["list_name2"].Value.ToString() + }; + db.More_Update("Obj_List_Book", Edit_Col, Edit_Data, Search_Name, Search_Data); + + dataGridView2.Rows[row].Cells["edasd"].Value = res.ToString(); + } + /// + /// 입고 추가수량이 재고로 들어가는 함수 + /// + /// + /// + private void Input_Inven(int data, int row_count) + { + string Search_Table = "`compidx`, `list_name`, `header`, `num`, `book_name`, " + + "`author`, `book_comp`, `count`, `pay`, " + //`persent`, " + + "`total`, `etc`, `isbn`, `order`, `order_stat`, " + + "`order_date`, `send_date`, `stat`, `chk_date`, `import`, " + + "`import_date`, `export`, `export_date`"; + string[] Where_Table = { "compidx", "book_name", "author", "book_comp", "list_name" }; + string[] Search_Data = { compidx, + dataGridView2.Rows[row_count].Cells["Book_name2"].Value.ToString(), + dataGridView2.Rows[row_count].Cells["author2"].Value.ToString(), + dataGridView2.Rows[row_count].Cells["Book_comp2"].Value.ToString(), + dataGridView2.Rows[row_count].Cells["list_name2"].Value.ToString() }; + string db_tmp_data = db.More_DB_Search("Obj_List_Book", Where_Table, Search_Data, Search_Table); + string[] db_data = db_tmp_data.Split('|'); + + string[] input_data = { "", "", "", "", "", + "", "", "", "", // "", + "", "", "", "", "", + "", "", "", "", "", + "", "", "" }; + string[] input_col = { "compidx", "list_name", "header", "num", "book_name", + "author", "book_comp", "count", "pay", //"persent", + "total", "etc", "isbn", "order", "order_stat", + "order_date", "send_date", "stat", "chk_date", "import", + "import_date", "export", "export_date" }; + + // 마지막 공란 제거 for문 + for (int a = 0; a < db_data.Length - 1; a++) + { + input_data[a] = db_data[a]; + + if (a == 7) input_data[a] = data.ToString(); + } + + // Inven테이블내 데이터중복체크 + string[] chk_Table = { "compidx", "isbn" }; + string[] chk_Data = { compidx, db_data[12] }; + string chk = db.More_DB_Search("Inven", chk_Table, chk_Data); + + // 중복데이터가 검색되지않음. + if (chk.Length < 3) + { + db.DB_INSERT("Inven", input_col, input_data); + MessageBox.Show("DB 새로 추가"); + return; + } + else + { + string count_tmp = db.More_DB_Search("Inven", chk_Table, chk_Data, "`count`, `idx`"); + string[] cout = count_tmp.Split('|'); + int count = Convert.ToInt32(cout[0]); + count += data; + MessageBox.Show("DB 수정"); + db.DB_Update("Inven", "count", count.ToString(), "idx", cout[0]); + } + + } /// /// 매입원장에 추가하는 함수 /// @@ -703,23 +803,6 @@ namespace WindowsFormsApp1.Delivery db.DB_INSERT("Buy_ledger", Area, tata); } } - private bool stock_chk(string isbn) - { - string Area = "`isbn`"; - string[] table = { "compidx" }; - string[] colum = { compidx }; - string tmp = db.More_DB_Search("Inven", table, colum, Area); - string[] inven_isbn = tmp.Split('|'); - for (int a= 0; a < inven_isbn.Length - 1; a++) - { - inven_isbn[a] = inven_isbn[a].Replace("\r", string.Empty); - } - for(int a = 0; a < inven_isbn.Length - 1; a++) - { - if (isbn == inven_isbn[a]) { return true; } - } - return false; - } /// /// input_ledger를 도와주는 함수 /// @@ -732,14 +815,17 @@ namespace WindowsFormsApp1.Delivery { string[] result = { "", "", "", "", "0", "0", "0", "0", "0", "" }; - if (book_name == "" || book_comp == "" || author == "") { + if (book_name == "" || book_comp == "" || author == "") + { for (int a = count; a > 0; a--) { - if (dataGridView2.Rows[a].Cells["order2"].Value.ToString() != "") { + if (dataGridView2.Rows[a].Cells["order2"].Value.ToString() != "") + { result[0] = compidx; result[1] = dataGridView3.Rows[count].Cells["Order3"].Value.ToString(); result[7] = dataGridView3.Rows[count].Cells["total3"].Value.ToString(); - if (Convert.ToInt32(result[7]) < 0) { + if (Convert.ToInt32(result[7]) < 0) + { int tmp7 = Convert.ToInt32(result[7]) * -1; result[7] = tmp7.ToString(); } @@ -766,56 +852,7 @@ namespace WindowsFormsApp1.Delivery } return result; } - /// - /// 목록도서DB 안의 입고수량 수정하는 함수 - /// - private void save_grid2() - { - for(int a= 0; a < dataGridView2.Rows.Count; a++) - { - string[] grid2 = { dataGridView2.Rows[a].Cells["num2"].Value.ToString(), // 번호 - dataGridView2.Rows[a].Cells["count2"].Value.ToString(), // 수량 - dataGridView2.Rows[a].Cells["Book_name2"].Value.ToString(), // 도서명 - dataGridView2.Rows[a].Cells["Book_comp2"].Value.ToString(), // 출판사 - dataGridView2.Rows[a].Cells["author2"].Value.ToString(), // 저자 - dataGridView2.Rows[a].Cells["pay2"].Value.ToString(), // 단가 - dataGridView2.Rows[a].Cells["total2"].Value.ToString(), // 합계 - dataGridView2.Rows[a].Cells["list_name2"].Value.ToString(), // 구분 - dataGridView2.Rows[a].Cells["edasd"].Value.ToString(), // 비고 - dataGridView2.Rows[a].Cells["order2"].Value.ToString(), // 주문처명 - dataGridView2.Rows[a].Cells["Date"].Value.ToString() }; // 입고시간 - - string[] Search_col = { "compidx", "book_name", "book_comp", "author", "list_name" }; - string[] Search_data = { compidx, grid2[2], grid2[3], grid2[4], grid2[7] }; - string tmp_db = db.More_DB_Search("Obj_List_Book", Search_col, Search_data, "`count`"); - string[] db_data = tmp_db.Split('|'); - - string[] Edit_col = { "input_count" }; - string[] Edit_data = { Inven_count(db_data[0],dataGridView2.Rows[a].Cells["count2"].Value.ToString(), a) }; - db.More_Update("Obj_List_Book", Edit_col, Edit_data, Search_col, Search_data); - } - } - /// - /// 재고에 들어갈 카운트를 재는거 - /// - /// 목록DB내 수량 - /// 입고된 수량 - /// - private string Inven_count(string ori, string change, int count) - { - string result = change; - int i_ori = Convert.ToInt32(ori); - int i_change = Convert.ToInt32(change); - if (i_ori < i_change) { - int i_result = i_change - i_ori; - input_Inven(i_result, count); - return ori; - } - else if (i_ori > i_change) { - // 비고로 부족한 수량이 들어가야함 - } - return result; - } + #endregion private void dataGridView3_CellValueChanged(object sender, DataGridViewCellEventArgs e) { if (dataGridView3.CurrentCell != null) diff --git a/unimarc/unimarc/마크/All_Book_manage.Designer.cs b/unimarc/unimarc/마크/All_Book_manage.Designer.cs index 70640dc..f77caf5 100644 --- a/unimarc/unimarc/마크/All_Book_manage.Designer.cs +++ b/unimarc/unimarc/마크/All_Book_manage.Designer.cs @@ -28,26 +28,158 @@ /// private void InitializeComponent() { + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.set_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.set_isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.set_count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.set_price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.textBox1 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); + this.btn_Search = new System.Windows.Forms.Button(); + this.btn_Add = new System.Windows.Forms.Button(); + this.btn_Edit = new System.Windows.Forms.Button(); + this.btn_Delete = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // + // dataGridView1 + // + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AllowUserToDeleteRows = false; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.set_name, + this.set_isbn, + this.set_count, + this.set_price, + this.author, + this.book_comp}); + this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; + this.dataGridView1.Location = new System.Drawing.Point(12, 40); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(792, 318); + this.dataGridView1.TabIndex = 6; + this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); + // + // set_name + // + this.set_name.HeaderText = "세트명"; + this.set_name.Name = "set_name"; + this.set_name.Width = 250; + // + // set_isbn + // + this.set_isbn.HeaderText = "세트 ISBN"; + this.set_isbn.Name = "set_isbn"; + // + // set_count + // + this.set_count.HeaderText = "총 수량"; + this.set_count.Name = "set_count"; + this.set_count.Width = 80; + // + // set_price + // + this.set_price.HeaderText = "세트 정가"; + this.set_price.Name = "set_price"; + // + // author + // + this.author.HeaderText = "저자"; + this.author.Name = "author"; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(59, 12); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(271, 21); + this.textBox1.TabIndex = 7; + this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); + // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(371, 219); + this.label1.Location = new System.Drawing.Point(12, 16); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(107, 12); - this.label1.TabIndex = 5; - this.label1.Text = "마크관리_전집관리"; + this.label1.Size = new System.Drawing.Size(41, 12); + this.label1.TabIndex = 8; + this.label1.Text = "검색어"; + // + // btn_Search + // + this.btn_Search.Location = new System.Drawing.Point(336, 11); + this.btn_Search.Name = "btn_Search"; + this.btn_Search.Size = new System.Drawing.Size(75, 23); + this.btn_Search.TabIndex = 9; + this.btn_Search.Text = "검 색"; + this.btn_Search.UseVisualStyleBackColor = true; + this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click); + // + // btn_Add + // + this.btn_Add.Location = new System.Drawing.Point(417, 11); + this.btn_Add.Name = "btn_Add"; + this.btn_Add.Size = new System.Drawing.Size(75, 23); + this.btn_Add.TabIndex = 9; + this.btn_Add.Text = "추 가"; + this.btn_Add.UseVisualStyleBackColor = true; + this.btn_Add.Click += new System.EventHandler(this.btn_Add_Click); + // + // btn_Edit + // + this.btn_Edit.Location = new System.Drawing.Point(498, 11); + this.btn_Edit.Name = "btn_Edit"; + this.btn_Edit.Size = new System.Drawing.Size(75, 23); + this.btn_Edit.TabIndex = 9; + this.btn_Edit.Text = "수 정"; + this.btn_Edit.UseVisualStyleBackColor = true; + this.btn_Edit.Click += new System.EventHandler(this.btn_Edit_Click); + // + // btn_Delete + // + this.btn_Delete.Location = new System.Drawing.Point(579, 11); + this.btn_Delete.Name = "btn_Delete"; + this.btn_Delete.Size = new System.Drawing.Size(75, 23); + this.btn_Delete.TabIndex = 9; + this.btn_Delete.Text = "삭 제"; + this.btn_Delete.UseVisualStyleBackColor = true; + this.btn_Delete.Click += new System.EventHandler(this.btn_Delete_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(660, 11); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(75, 23); + this.btn_Close.TabIndex = 9; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); // // All_Book_manage // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); + this.ClientSize = new System.Drawing.Size(816, 450); + this.Controls.Add(this.btn_Close); + this.Controls.Add(this.btn_Delete); + this.Controls.Add(this.btn_Edit); + this.Controls.Add(this.btn_Add); + this.Controls.Add(this.btn_Search); this.Controls.Add(this.label1); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.dataGridView1); this.Name = "All_Book_manage"; - this.Text = "All_Book_manage"; + this.Text = "전집 관리"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -55,6 +187,19 @@ #endregion + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn set_name; + private System.Windows.Forms.DataGridViewTextBoxColumn set_isbn; + private System.Windows.Forms.DataGridViewTextBoxColumn set_count; + private System.Windows.Forms.DataGridViewTextBoxColumn set_price; + private System.Windows.Forms.DataGridViewTextBoxColumn author; + private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; + private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btn_Add; + private System.Windows.Forms.Button btn_Edit; + private System.Windows.Forms.Button btn_Delete; + private System.Windows.Forms.Button btn_Close; + public System.Windows.Forms.Button btn_Search; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/All_Book_manage.cs b/unimarc/unimarc/마크/All_Book_manage.cs index 902f9b6..1c7082d 100644 --- a/unimarc/unimarc/마크/All_Book_manage.cs +++ b/unimarc/unimarc/마크/All_Book_manage.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using UniMarc.마크; namespace WindowsFormsApp1.Mac { @@ -18,5 +19,48 @@ namespace WindowsFormsApp1.Mac InitializeComponent(); main = _main; } + + public void btn_Search_Click(object sender, EventArgs e) + { + string text = textBox1.Text; + } + + private void textBox1_KeyDown(object sender, KeyEventArgs e) + { + if(e.KeyCode == Keys.Enter) + { + btn_Search_Click(null, null); + } + } + + private void btn_Add_Click(object sender, EventArgs e) + { + // 새로운 폼 작업이 필요함. + All_Book_manage_Add add = new All_Book_manage_Add(this); + add.Show(); + + } + + private void btn_Edit_Click(object sender, EventArgs e) + { + // 새로운 폼 작업이 필요함. + + } + + private void btn_Delete_Click(object sender, EventArgs e) + { + + } + + private void btn_Close_Click(object sender, EventArgs e) + { + + } + + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } } } diff --git a/unimarc/unimarc/마크/All_Book_manage.resx b/unimarc/unimarc/마크/All_Book_manage.resx index 1af7de1..2752c88 100644 --- a/unimarc/unimarc/마크/All_Book_manage.resx +++ b/unimarc/unimarc/마크/All_Book_manage.resx @@ -117,4 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/unimarc/unimarc/마크/All_Book_manage_Add.Designer.cs b/unimarc/unimarc/마크/All_Book_manage_Add.Designer.cs new file mode 100644 index 0000000..d9f8e9d --- /dev/null +++ b/unimarc/unimarc/마크/All_Book_manage_Add.Designer.cs @@ -0,0 +1,253 @@ + +namespace UniMarc.마크 +{ + partial class All_Book_manage_Add + { + /// + /// 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.tb_setName = new System.Windows.Forms.TextBox(); + this.tb_setCount = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.tb_setYear = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.tb_setISBN = new System.Windows.Forms.TextBox(); + this.tb_setPrice = new System.Windows.Forms.TextBox(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.btn_Save = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(13, 16); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(55, 12); + this.label1.TabIndex = 0; + this.label1.Text = "* 세트 명"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(13, 43); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 12); + this.label2.TabIndex = 0; + this.label2.Text = "구성 수량"; + // + // tb_setName + // + this.tb_setName.Location = new System.Drawing.Point(74, 12); + this.tb_setName.Name = "tb_setName"; + this.tb_setName.Size = new System.Drawing.Size(583, 21); + this.tb_setName.TabIndex = 1; + // + // tb_setCount + // + this.tb_setCount.Location = new System.Drawing.Point(74, 39); + this.tb_setCount.Name = "tb_setCount"; + this.tb_setCount.Size = new System.Drawing.Size(232, 21); + this.tb_setCount.TabIndex = 1; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(362, 43); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(57, 12); + this.label3.TabIndex = 0; + this.label3.Text = "출간 연도"; + // + // tb_setYear + // + this.tb_setYear.Location = new System.Drawing.Point(425, 39); + this.tb_setYear.Name = "tb_setYear"; + this.tb_setYear.Size = new System.Drawing.Size(232, 21); + this.tb_setYear.TabIndex = 1; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(13, 70); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(61, 12); + this.label4.TabIndex = 0; + this.label4.Text = "세트 ISBN"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(362, 70); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(57, 12); + this.label5.TabIndex = 0; + this.label5.Text = "세트 정가"; + // + // tb_setISBN + // + this.tb_setISBN.Location = new System.Drawing.Point(74, 66); + this.tb_setISBN.Name = "tb_setISBN"; + this.tb_setISBN.Size = new System.Drawing.Size(232, 21); + this.tb_setISBN.TabIndex = 1; + // + // tb_setPrice + // + this.tb_setPrice.Location = new System.Drawing.Point(425, 66); + this.tb_setPrice.Name = "tb_setPrice"; + this.tb_setPrice.Size = new System.Drawing.Size(232, 21); + this.tb_setPrice.TabIndex = 1; + // + // dataGridView1 + // + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.book_name, + this.author, + this.book_comp, + this.price, + this.ISBN}); + this.dataGridView1.Location = new System.Drawing.Point(12, 93); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(665, 222); + this.dataGridView1.TabIndex = 2; + this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); + this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); + // + // btn_Save + // + this.btn_Save.Location = new System.Drawing.Point(160, 321); + this.btn_Save.Name = "btn_Save"; + this.btn_Save.Size = new System.Drawing.Size(100, 30); + this.btn_Save.TabIndex = 3; + this.btn_Save.Text = "저 장"; + this.btn_Save.UseVisualStyleBackColor = true; + this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(425, 321); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(100, 30); + this.btn_Close.TabIndex = 3; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // book_name + // + this.book_name.HeaderText = "* 도서명"; + this.book_name.Name = "book_name"; + this.book_name.Width = 150; + // + // author + // + this.author.HeaderText = "* 저자"; + this.author.Name = "author"; + // + // book_comp + // + this.book_comp.HeaderText = "* 출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.Width = 150; + // + // price + // + this.price.HeaderText = "* 정가"; + this.price.Name = "price"; + // + // ISBN + // + this.ISBN.HeaderText = "ISBN"; + this.ISBN.Name = "ISBN"; + // + // All_Book_manage_Add + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(689, 358); + this.Controls.Add(this.btn_Close); + this.Controls.Add(this.btn_Save); + this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.tb_setPrice); + this.Controls.Add(this.tb_setYear); + this.Controls.Add(this.tb_setISBN); + this.Controls.Add(this.label5); + this.Controls.Add(this.tb_setCount); + this.Controls.Add(this.label3); + this.Controls.Add(this.label4); + this.Controls.Add(this.tb_setName); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Name = "All_Book_manage_Add"; + this.Text = "전집 목록 생성"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox tb_setName; + private System.Windows.Forms.TextBox tb_setCount; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox tb_setYear; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox tb_setISBN; + private System.Windows.Forms.TextBox tb_setPrice; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button btn_Save; + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.DataGridViewTextBoxColumn book_name; + private System.Windows.Forms.DataGridViewTextBoxColumn author; + private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; + private System.Windows.Forms.DataGridViewTextBoxColumn price; + private System.Windows.Forms.DataGridViewTextBoxColumn ISBN; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/All_Book_manage_Add.cs b/unimarc/unimarc/마크/All_Book_manage_Add.cs new file mode 100644 index 0000000..f9179b9 --- /dev/null +++ b/unimarc/unimarc/마크/All_Book_manage_Add.cs @@ -0,0 +1,77 @@ +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; +using WindowsFormsApp1.Mac; + +namespace UniMarc.마크 +{ + public partial class All_Book_manage_Add : Form + { + All_Book_manage manage; + public All_Book_manage_Add(All_Book_manage _manage) + { + InitializeComponent(); + manage = _manage; + } + + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } + + private void btn_Save_Click(object sender, EventArgs e) + { + bool grid_chk = true; + for(int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["book_name"].Value == null || + dataGridView1.Rows[a].Cells["author"].Value == null || + dataGridView1.Rows[a].Cells["book_comp"].Value == null || + dataGridView1.Rows[a].Cells["price"].Value == null) { + grid_chk = false; + break; + } + else if (dataGridView1.Rows[a].Cells["book_name"].Value.ToString() == "" || + dataGridView1.Rows[a].Cells["author"].Value.ToString() == "" || + dataGridView1.Rows[a].Cells["book_comp"].Value.ToString() == "" || + dataGridView1.Rows[a].Cells["price"].Value.ToString() == "") { + grid_chk = false; + break; + } + else if (tb_setName.Text == "") { + grid_chk = false; + break; + } + } + if (!grid_chk) { + MessageBox.Show("필수 입력사항이 비어있습니다!\n*이 붙은 곳을 확인해주세요."); + return; + } + + + + } + + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void dataGridView1_KeyDown(object sender, KeyEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + if ((e.Shift && e.KeyCode == Keys.Insert) || (e.Control && e.KeyCode == Keys.V)) + { + sg.Excel_to_DataGridView(sender, e); + } + } + } +} diff --git a/unimarc/unimarc/마크/All_Book_manage_Add.resx b/unimarc/unimarc/마크/All_Book_manage_Add.resx new file mode 100644 index 0000000..ba3250f --- /dev/null +++ b/unimarc/unimarc/마크/All_Book_manage_Add.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/마크/Mac_List.Designer.cs b/unimarc/unimarc/마크/Mac_List.Designer.cs index 8f703ae..2b726f1 100644 --- a/unimarc/unimarc/마크/Mac_List.Designer.cs +++ b/unimarc/unimarc/마크/Mac_List.Designer.cs @@ -116,12 +116,13 @@ this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.Location = new System.Drawing.Point(12, 39); this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowHeadersWidth = 10; + this.dataGridView1.RowHeadersWidth = 40; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1127, 598); + this.dataGridView1.Size = new System.Drawing.Size(1156, 598); this.dataGridView1.TabIndex = 48; this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); + this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // // idx // @@ -306,7 +307,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1154, 655); + this.ClientSize = new System.Drawing.Size(1183, 651); this.Controls.Add(this.btn_Close); this.Controls.Add(this.btn_Delete); this.Controls.Add(this.btn_Progress); diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs index dd63e17..570c741 100644 --- a/unimarc/unimarc/마크/Mac_List.cs +++ b/unimarc/unimarc/마크/Mac_List.cs @@ -105,7 +105,7 @@ namespace WindowsFormsApp1.Mac string table = "Obj_List_Marc"; for (int a = 0; a < dataGridView1.Rows.Count - 1; a++) { - if (dataGridView1.Rows[a].Cells["chk_V"].Value.ToString() == "V") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { string[] edit_col = { "date", "date_res", "list_name", "KDC", "total", "flatter", "unflatter", "state", "grade", "etc", "m_charge" }; @@ -132,12 +132,26 @@ namespace WindowsFormsApp1.Mac } private void btn_Excel_Click(object sender, EventArgs e) { - // TODO: 현재 권한 설정때문에 테스트불가. - /* - Skill_Grid sg = new Skill_Grid(); - sg.ExcelCreate(dataGridView1, saveFileDialog1); - MessageBox.Show("엑셀로 저장되었습니다!"); - */ + Excel_text et = new Excel_text(); + string[] Excel_title = { "NO", "등록일", "마감일", "작업처", "분류", "전체", "편목", "미편목", "상태", "등급", "비고", "담당자" }; + int rowCount = dataGridView1.RowCount; + string[,] inputExcel = new string[rowCount, 11]; + for (int a = 0; a < rowCount; a++) + { + int row_idx = dataGridView1.Rows[a].HeaderCell.RowIndex + 1; + inputExcel[a, 0] = row_idx.ToString(); + inputExcel[a, 1] = dataGridView1.Rows[a].Cells["start_date"].Value.ToString(); + inputExcel[a, 2] = dataGridView1.Rows[a].Cells["end_date"].Value.ToString(); + inputExcel[a, 3] = dataGridView1.Rows[a].Cells["list_marc"].Value.ToString(); + inputExcel[a, 4] = dataGridView1.Rows[a].Cells["KDC"].Value.ToString(); + inputExcel[a, 5] = dataGridView1.Rows[a].Cells["total"].Value.ToString(); + inputExcel[a, 6] = dataGridView1.Rows[a].Cells["flatter"].Value.ToString(); + inputExcel[a, 7] = dataGridView1.Rows[a].Cells["unflatter"].Value.ToString(); + inputExcel[a, 8] = dataGridView1.Rows[a].Cells["state"].Value.ToString(); + inputExcel[a, 9] = dataGridView1.Rows[a].Cells["grade"].Value.ToString(); + inputExcel[a, 10] = dataGridView1.Rows[a].Cells["etc"].Value.ToString(); + } + et.Mk_Excel(Excel_title, inputExcel); } private void btn_Merge_Click(object sender, EventArgs e) { @@ -148,7 +162,7 @@ namespace WindowsFormsApp1.Mac { for(int a = 0; a < dataGridView1.Rows.Count - 1; a++) { - if (dataGridView1.Rows[a].Cells["chk_V"].Value.ToString() == "V") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") { MessageBox.Show("체크된 목록이 현재 진행중입니다."); return; @@ -157,7 +171,7 @@ namespace WindowsFormsApp1.Mac } for(int a= 0; a < dataGridView1.Rows.Count - 1; a++) { - if (dataGridView1.Rows[a].Cells["chk_V"].Value.ToString() == "V") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") { dataGridView1.Rows[a].Cells["state"].Value = "진행"; state_Save(a); @@ -183,16 +197,16 @@ namespace WindowsFormsApp1.Mac { for (int a = 0; a < dataGridView1.Rows.Count - 1; a++) { - if (dataGridView1.Rows[a].Cells["chk_V"].Value.ToString() == "V") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") { - MessageBox.Show("체크된 목록은 현재 완료되었습니다."); + MessageBox.Show("체크된 목록은 현재 완료되어있습니다."); return; } } } for (int a = 0; a < dataGridView1.Rows.Count - 1; a++) { - if (dataGridView1.Rows[a].Cells["chk_V"].Value.ToString() == "V") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") { dataGridView1.Rows[a].Cells["state"].Value = "완료"; state_Save(a); @@ -205,7 +219,7 @@ namespace WindowsFormsApp1.Mac { for (int a = 0; a < dataGridView1.Rows.Count - 1; a++) { - if (dataGridView1.Rows[a].Cells["chk_V"].Value.ToString() == "V") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { db.DB_Delete("Obj_List_Marc", "compidx", compidx, "idx", dataGridView1.Rows[a].Cells["idx"].Value.ToString()); } @@ -215,19 +229,6 @@ namespace WindowsFormsApp1.Mac { this.Close(); } - private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) - { - int idx_col = e.ColumnIndex; - if(idx_col == 13) - { - if (((DataGridView)sender).SelectedCells[idx_col].Value.ToString() == "V") { - ((DataGridView)sender).SelectedCells[idx_col].Value = ""; - } - else { - ((DataGridView)sender).SelectedCells[idx_col].Value = "V"; - } - } - } private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { int idx_row = e.RowIndex; @@ -238,8 +239,29 @@ namespace WindowsFormsApp1.Mac marc.Show(); marc.input_list(dataGridView1.Rows[idx_row].Cells[1].Value.ToString(), dataGridView1.Rows[idx_row].Cells[4].Value.ToString()); - } + if (((DataGridView)sender).Columns[idx_col].Name == "check") + { + if (((DataGridView)sender).Rows[idx_row].Cells[idx_col].Value.ToString() == "V") + { + ((DataGridView)sender).Rows[idx_row].Cells[idx_col].Value = ""; + } + else + { + ((DataGridView)sender).Rows[idx_row].Cells[idx_col].Value = "V"; + } + } + } + + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } + + private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + } } } diff --git a/unimarc/unimarc/마크/Mac_List_Merge.cs b/unimarc/unimarc/마크/Mac_List_Merge.cs index 950c0f8..1886f4f 100644 --- a/unimarc/unimarc/마크/Mac_List_Merge.cs +++ b/unimarc/unimarc/마크/Mac_List_Merge.cs @@ -39,14 +39,14 @@ namespace WindowsFormsApp1.마크 int count = ml.dataGridView1.Rows.Count; for(int a = 0; a < count; a++) { - if (ml.dataGridView1.Rows[a].Cells["chk_V"].Value.ToString() == "V") { - input_data[0] = dataGridView1.Rows[a].Cells["idx"].Value.ToString(); - input_data[1] = dataGridView1.Rows[a].Cells["list_marc"].Value.ToString(); - input_data[2] = dataGridView1.Rows[a].Cells["total"].Value.ToString(); - input_data[3] = dataGridView1.Rows[a].Cells["flatter"].Value.ToString(); - input_data[4] = dataGridView1.Rows[a].Cells["unflatter"].Value.ToString(); - lbl_charge.Text = dataGridView1.Rows[a].Cells["charge"].Value.ToString(); - lbl_state.Text = dataGridView1.Rows[a].Cells["state"].Value.ToString(); + if (ml.dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { + input_data[0] = ml.dataGridView1.Rows[a].Cells["idx"].Value.ToString(); + input_data[1] = ml.dataGridView1.Rows[a].Cells["list_marc"].Value.ToString(); + input_data[2] = ml.dataGridView1.Rows[a].Cells["total"].Value.ToString(); + input_data[3] = ml.dataGridView1.Rows[a].Cells["flatter"].Value.ToString(); + input_data[4] = ml.dataGridView1.Rows[a].Cells["unflatter"].Value.ToString(); + lbl_charge.Text = ml.dataGridView1.Rows[a].Cells["charge"].Value.ToString(); + lbl_state.Text = ml.dataGridView1.Rows[a].Cells["state"].Value.ToString(); dataGridView1.Rows.Add(input_data); } } diff --git a/unimarc/unimarc/마크/School_Lookup.Designer.cs b/unimarc/unimarc/마크/School_Lookup.Designer.cs index 9c44a34..838a607 100644 --- a/unimarc/unimarc/마크/School_Lookup.Designer.cs +++ b/unimarc/unimarc/마크/School_Lookup.Designer.cs @@ -348,7 +348,7 @@ this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(71, 23); this.button1.TabIndex = 5; - this.button1.Text = "추 가 (A)"; + this.button1.Text = "추 가 (&A)"; this.button1.UseVisualStyleBackColor = true; // // button2 @@ -357,7 +357,7 @@ this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(71, 23); this.button2.TabIndex = 5; - this.button2.Text = "저 장 (S)"; + this.button2.Text = "저 장 (&S)"; this.button2.UseVisualStyleBackColor = true; // // button3 @@ -366,7 +366,7 @@ this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(71, 23); this.button3.TabIndex = 5; - this.button3.Text = "삭 제 (D)"; + this.button3.Text = "삭 제 (&D)"; this.button3.UseVisualStyleBackColor = true; // // comboBox4 @@ -390,7 +390,7 @@ this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(71, 23); this.button4.TabIndex = 5; - this.button4.Text = "조 회 (H)"; + this.button4.Text = "조 회 (&H)"; this.button4.UseVisualStyleBackColor = true; // // button5 @@ -399,7 +399,7 @@ this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(99, 23); this.button5.TabIndex = 5; - this.button5.Text = "바코드 출력 (B)"; + this.button5.Text = "바코드 출력 (&B)"; this.button5.UseVisualStyleBackColor = true; // // button6 @@ -408,7 +408,7 @@ this.button6.Name = "button6"; this.button6.Size = new System.Drawing.Size(84, 23); this.button6.TabIndex = 5; - this.button6.Text = "복본조사 (O)"; + this.button6.Text = "복본조사 (&O)"; this.button6.UseVisualStyleBackColor = true; // // button7 @@ -417,7 +417,7 @@ this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(71, 23); this.button7.TabIndex = 5; - this.button7.Text = "DLS (L)"; + this.button7.Text = "DLS (&L)"; this.button7.UseVisualStyleBackColor = true; // // School_Lookup diff --git a/unimarc/unimarc/마크/Symbol_Add.Designer.cs b/unimarc/unimarc/마크/Symbol_Add.Designer.cs index 997125e..451ab11 100644 --- a/unimarc/unimarc/마크/Symbol_Add.Designer.cs +++ b/unimarc/unimarc/마크/Symbol_Add.Designer.cs @@ -29,32 +29,353 @@ private void InitializeComponent() { this.label1 = new System.Windows.Forms.Label(); + this.cb_symbol = new System.Windows.Forms.ComboBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.tb_result = new System.Windows.Forms.TextBox(); + this.panel7 = new System.Windows.Forms.Panel(); + this.label7 = new System.Windows.Forms.Label(); + this.panel6 = new System.Windows.Forms.Panel(); + this.tb_author = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.panel5 = new System.Windows.Forms.Panel(); + this.tb_book = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.panel3 = new System.Windows.Forms.Panel(); + this.rb_author1 = new System.Windows.Forms.RadioButton(); + this.label4 = new System.Windows.Forms.Label(); + this.rb_author2 = new System.Windows.Forms.RadioButton(); + this.panel4 = new System.Windows.Forms.Panel(); + this.rb_moum1 = new System.Windows.Forms.RadioButton(); + this.label6 = new System.Windows.Forms.Label(); + this.rb_moum2 = new System.Windows.Forms.RadioButton(); + this.panel2 = new System.Windows.Forms.Panel(); + this.rb_book1 = new System.Windows.Forms.RadioButton(); + this.label5 = new System.Windows.Forms.Label(); + this.rb_book2 = new System.Windows.Forms.RadioButton(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.panel1.SuspendLayout(); + this.panel7.SuspendLayout(); + this.panel6.SuspendLayout(); + this.panel5.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(371, 219); + this.label1.Location = new System.Drawing.Point(16, 11); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(135, 12); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 5; - this.label1.Text = "마크관리_저자기호 생성"; + this.label1.Text = "저자기호표"; + // + // cb_symbol + // + this.cb_symbol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_symbol.FormattingEnabled = true; + this.cb_symbol.Location = new System.Drawing.Point(129, 7); + this.cb_symbol.Name = "cb_symbol"; + this.cb_symbol.Size = new System.Drawing.Size(254, 20); + this.cb_symbol.TabIndex = 6; + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.tb_result); + this.panel1.Controls.Add(this.panel7); + this.panel1.Controls.Add(this.label7); + this.panel1.Controls.Add(this.panel6); + this.panel1.Controls.Add(this.panel5); + this.panel1.Controls.Add(this.panel3); + this.panel1.Controls.Add(this.panel4); + this.panel1.Controls.Add(this.panel2); + this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(400, 253); + this.panel1.TabIndex = 7; + // + // tb_result + // + this.tb_result.Location = new System.Drawing.Point(129, 223); + this.tb_result.Name = "tb_result"; + this.tb_result.Size = new System.Drawing.Size(254, 21); + this.tb_result.TabIndex = 7; + // + // panel7 + // + this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel7.Controls.Add(this.cb_symbol); + this.panel7.Controls.Add(this.label1); + this.panel7.Location = new System.Drawing.Point(-1, -1); + this.panel7.Name = "panel7"; + this.panel7.Size = new System.Drawing.Size(400, 37); + this.panel7.TabIndex = 9; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(16, 227); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(77, 12); + this.label7.TabIndex = 5; + this.label7.Text = "저자기호변환"; + // + // panel6 + // + this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel6.Controls.Add(this.tb_author); + this.panel6.Controls.Add(this.label2); + this.panel6.Location = new System.Drawing.Point(-1, 35); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(400, 37); + this.panel6.TabIndex = 9; + // + // tb_author + // + this.tb_author.Location = new System.Drawing.Point(129, 7); + this.tb_author.Name = "tb_author"; + this.tb_author.Size = new System.Drawing.Size(254, 21); + this.tb_author.TabIndex = 7; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(16, 11); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(63, 12); + this.label2.TabIndex = 5; + this.label2.Text = "대표저자 *"; + // + // panel5 + // + this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel5.Controls.Add(this.tb_book); + this.panel5.Controls.Add(this.label3); + this.panel5.Location = new System.Drawing.Point(-1, 71); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(400, 37); + this.panel5.TabIndex = 9; + // + // tb_book + // + this.tb_book.Location = new System.Drawing.Point(129, 7); + this.tb_book.Name = "tb_book"; + this.tb_book.Size = new System.Drawing.Size(254, 21); + this.tb_book.TabIndex = 7; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(16, 11); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(29, 12); + this.label3.TabIndex = 5; + this.label3.Text = "서명"; + // + // panel3 + // + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.rb_author1); + this.panel3.Controls.Add(this.label4); + this.panel3.Controls.Add(this.rb_author2); + this.panel3.Location = new System.Drawing.Point(-1, 107); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(400, 37); + this.panel3.TabIndex = 9; + // + // rb_author1 + // + this.rb_author1.AutoSize = true; + this.rb_author1.Location = new System.Drawing.Point(133, 9); + this.rb_author1.Name = "rb_author1"; + this.rb_author1.Size = new System.Drawing.Size(95, 16); + this.rb_author1.TabIndex = 8; + this.rb_author1.TabStop = true; + this.rb_author1.Text = "저자음절표시"; + this.rb_author1.UseVisualStyleBackColor = true; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(16, 11); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(107, 12); + this.label4.TabIndex = 5; + this.label4.Text = "저자초성/음절적용"; + // + // rb_author2 + // + this.rb_author2.AutoSize = true; + this.rb_author2.Location = new System.Drawing.Point(272, 9); + this.rb_author2.Name = "rb_author2"; + this.rb_author2.Size = new System.Drawing.Size(95, 16); + this.rb_author2.TabIndex = 8; + this.rb_author2.TabStop = true; + this.rb_author2.Text = "저자초성표시"; + this.rb_author2.UseVisualStyleBackColor = true; + // + // panel4 + // + this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel4.Controls.Add(this.rb_moum1); + this.panel4.Controls.Add(this.label6); + this.panel4.Controls.Add(this.rb_moum2); + this.panel4.Location = new System.Drawing.Point(-1, 179); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(400, 37); + this.panel4.TabIndex = 9; + // + // rb_moum1 + // + this.rb_moum1.AutoSize = true; + this.rb_moum1.Location = new System.Drawing.Point(133, 9); + this.rb_moum1.Name = "rb_moum1"; + this.rb_moum1.Size = new System.Drawing.Size(129, 16); + this.rb_moum1.TabIndex = 8; + this.rb_moum1.TabStop = true; + this.rb_moum1.Text = "모음기호보류(원칙)"; + this.rb_moum1.UseVisualStyleBackColor = true; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(16, 11); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(95, 12); + this.label6.TabIndex = 5; + this.label6.Text = "자음표2자리일때"; + // + // rb_moum2 + // + this.rb_moum2.AutoSize = true; + this.rb_moum2.Location = new System.Drawing.Point(272, 9); + this.rb_moum2.Name = "rb_moum2"; + this.rb_moum2.Size = new System.Drawing.Size(95, 16); + this.rb_moum2.TabIndex = 8; + this.rb_moum2.TabStop = true; + this.rb_moum2.Text = "모음기호표시"; + this.rb_moum2.UseVisualStyleBackColor = true; + // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.rb_book1); + this.panel2.Controls.Add(this.label5); + this.panel2.Controls.Add(this.rb_book2); + this.panel2.Location = new System.Drawing.Point(-1, 143); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(400, 37); + this.panel2.TabIndex = 9; + // + // rb_book1 + // + this.rb_book1.AutoSize = true; + this.rb_book1.Location = new System.Drawing.Point(133, 9); + this.rb_book1.Name = "rb_book1"; + this.rb_book1.Size = new System.Drawing.Size(95, 16); + this.rb_book1.TabIndex = 8; + this.rb_book1.TabStop = true; + this.rb_book1.Text = "서명음절표시"; + this.rb_book1.UseVisualStyleBackColor = true; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(16, 11); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(107, 12); + this.label5.TabIndex = 5; + this.label5.Text = "서명초성/음절적용"; + // + // rb_book2 + // + this.rb_book2.AutoSize = true; + this.rb_book2.Location = new System.Drawing.Point(272, 3); + this.rb_book2.Name = "rb_book2"; + this.rb_book2.Size = new System.Drawing.Size(129, 28); + this.rb_book2.TabIndex = 8; + this.rb_book2.TabStop = true; + this.rb_book2.Text = "서명초성표시\r\n(한글이 아닐경우X)"; + this.rb_book2.UseVisualStyleBackColor = true; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(285, 271); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 11; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(84, 271); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 11; + this.button2.Text = "button1"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); // // Symbol_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.label1); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.panel1); this.Name = "Symbol_Add"; - this.Text = "Symbol_Add"; + this.Text = "저자기호 생성"; + this.Load += new System.EventHandler(this.Symbol_Add_Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel7.ResumeLayout(false); + this.panel7.PerformLayout(); + this.panel6.ResumeLayout(false); + this.panel6.PerformLayout(); + this.panel5.ResumeLayout(false); + this.panel5.PerformLayout(); + this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } #endregion private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox cb_symbol; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox tb_book; + private System.Windows.Forms.Panel panel7; + private System.Windows.Forms.Panel panel6; + private System.Windows.Forms.TextBox tb_author; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.RadioButton rb_author1; + private System.Windows.Forms.RadioButton rb_author2; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.RadioButton rb_moum1; + private System.Windows.Forms.RadioButton rb_moum2; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.RadioButton rb_book1; + private System.Windows.Forms.RadioButton rb_book2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox tb_result; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button button2; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Symbol_Add.cs b/unimarc/unimarc/마크/Symbol_Add.cs index ceb11d6..2a2aaf0 100644 --- a/unimarc/unimarc/마크/Symbol_Add.cs +++ b/unimarc/unimarc/마크/Symbol_Add.cs @@ -18,5 +18,1237 @@ namespace WindowsFormsApp1.Mac InitializeComponent(); main = _main; } + + private void Symbol_Add_Load(object sender, EventArgs e) + { + string[] com_list = { "이재철 1표", "이재철 2표", + "이재철 3표(실용형 가표)", "이재철 4표(실용형 까표)", + "이재철 5표(완전형 가표)", "이재철 6표(완전형 가표)", + "이재철 7표(실용형 하표)", "이재철 8표(완전형 하표)" }; + RadioButton[] rb = { rb_author1, rb_book1, rb_moum1 }; + + for (int a = 0; a < rb.Length; a++) + { + rb[a].Checked = true; + } + cb_symbol.Items.AddRange(com_list); + } + + private void button2_Click(object sender, EventArgs e) + { + RadioButton[] rb = { rb_author1, rb_book1, rb_moum1 }; + Symbol sb = new Symbol(); + + switch (cb_symbol.SelectedIndex) { + case 0: // 1표 + tb_result.Text = sb.Symbol_1(tb_author.Text, tb_book.Text, rb); + break; + case 1: // 2표 + tb_result.Text = sb.Symbol_2(tb_author.Text, tb_book.Text, rb); + break; + case 2: // 3표 + tb_result.Text = sb.Symbol_3(tb_author.Text, tb_book.Text, rb); + break; + case 3: // 4표 + tb_result.Text = sb.Symbol_4(tb_author.Text, tb_book.Text, rb); + break; + case 4: // 5표 + tb_result.Text = sb.Symbol_5(tb_author.Text, tb_book.Text, rb); + break; + case 5: // 6표 + tb_result.Text = sb.Symbol_6(tb_author.Text, tb_book.Text, rb); + break; + case 6: // 7표 + tb_result.Text = sb.Symbol_7(tb_author.Text, tb_book.Text, rb); + break; + case 7: // 8표 + tb_result.Text = sb.Symbol_8(tb_author.Text, tb_book.Text, rb); + break; + default: + break; + } + } + } + + /// + /// 저자기호 클래스 이재철 저자 표 포함 + /// + public class Symbol + { + /// + /// 이재철 1표 + /// + /// 대표저자 + /// 도서명 + /// 사용된 라디오박스 (3개) + /// 완성된 저자기호 + public string Symbol_1(string author, string book, RadioButton[] rb) + { + char[] Jaum = { + 'ㄱ', 'ㄲ', 'ㅋ', + 'ㄴ', 'ㄹ', + 'ㄷ', 'ㄸ', + 'ㅁ', + 'ㅂ', 'ㅃ', 'ㅍ', + 'ㅅ', 'ㅆ', + 'ㅇ', + 'ㅈ', 'ㅉ', 'ㅊ', + 'ㅎ' + }; + string[] Jaum_code = { + "1", "1", "1", + "2", "2", + "3", "3", + "4", + "5", "5", "5", + "6", "6", + "7", + "8", "8", "8", + "9" + }; + + char[] Moum = { + 'ㅏ', + 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', + 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', + 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moum_code = { + "1", + "2", "2", "2", + "3", "3", + "4", "4", + "5", "5", "5", "5", + "6", + "7", "7", "7", "7", "7", + "8" + }; + + + string res1, res3; + string res2 = string.Empty; + HANGUL_INFO info0 = HangulJaso.DevideJaso(author[0]); + if (info0.isHangul == "NH") { return info0.isHangul; } + if (rb[0].Checked) + res1 = info0.oriChar.ToString(); + else + res1 = info0.chars[0].ToString(); + + HANGUL_INFO info1 = HangulJaso.DevideJaso(author[1]); + if (info1.isHangul == "NH") { return info1.isHangul; } + for(int a = 0; a < Jaum.Length; a++) + { + if (info1.chars[0] == Jaum[a]) { + res2 = Jaum_code[a]; + break; + } + } + for(int a = 0; a < Moum.Length; a++) + { + if (info1.chars[1] == Moum[a]) { + res2 += Moum_code[a]; + break; + } + } + if (rb[2].Checked) { + if (res2.Length > 2) { res2 = res1[0].ToString() + res2[1].ToString(); } + } + + HANGUL_INFO info2 = HangulJaso.DevideJaso(book[0]); + if (info2.isHangul == "NH") { return info2.isHangul; } + if (rb[1].Checked) + res3 = info2.oriChar.ToString(); + else + res3 = info2.chars[0].ToString(); + + res1 = res1 + res2 + res3; + + return res1; + } + + /// + /// 이재철 2표 + /// + /// 대표저자 + /// 도서명 + /// 사용된 라디오박스 (3개) + /// 완성된 저자기호 + public string Symbol_2(string author, string book, RadioButton[] rb) + { + char[] Jaum = { + 'ㄱ', 'ㄲ', + 'ㄴ', + 'ㄷ', 'ㄸ', + 'ㄹ', + 'ㅁ', + 'ㅂ', 'ㅃ', + 'ㅅ', 'ㅆ', + 'ㅇ', + 'ㅈ', 'ㅉ', + 'ㅊ', + 'ㅋ', + 'ㅌ', + 'ㅍ', + 'ㅎ' + }; + string[] Jaum_code = + { + "1", "1", + "21", + "22", "22", + "23", + "3", + "4", "4", + "5", "5", + "6", + "7", "7", + "81", + "82", + "83", + "84", + "9" + }; + + char[] Moum = + { + 'ㅏ', + 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', + 'ㅕ', 'ㅖ', + 'ㅗ', + 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moum_code = { + "1", + "2", "2", "2", + "3", "3", + "4", "4", + "5", + "6", "6", "6", "6", + "7", "7", "7", "7", "7", + "8", "8", + "9" + }; + string res1 = string.Empty; + string res2 = string.Empty; + string res3 = string.Empty; + + HANGUL_INFO info0 = HangulJaso.DevideJaso(author[0]); + if (info0.isHangul == "NH") { return info0.isHangul; } + if (rb[0].Checked) + res1 = info0.oriChar.ToString(); + else + res1 = info0.chars[0].ToString(); + + HANGUL_INFO info1 = HangulJaso.DevideJaso(author[1]); + if (info1.isHangul == "NH") { return info1.isHangul; } + for (int a = 0; a < Jaum.Length; a++) + { + if (info1.chars[0] == Jaum[a]) + { + res2 = Jaum_code[a]; + break; + } + } + for (int a = 0; a < Moum.Length; a++) + { + if (info1.chars[1] == Moum[a]) + { + res2 += Moum_code[a]; + break; + } + } + if (rb[2].Checked) + { + if (res2.Length > 2) { res2 = res2[0].ToString() + res2[1].ToString(); } + } + + HANGUL_INFO info2 = HangulJaso.DevideJaso(book[0]); + if (info2.isHangul == "NH") { return info2.isHangul; } + if (rb[1].Checked) + res3 = info2.oriChar.ToString(); + else + res3 = info2.chars[0].ToString(); + + res1 = res1 + res2 + res3; + + return res1; + } + + /// + /// 이재철 3표 + /// + /// 대표저자 + /// 도서명 + /// 사용된 라디오박스 (3개) + /// 완성된 저자기호 + public string Symbol_3(string author, string book, RadioButton[] rb) + { + char[] Jaum = { + 'ㄱ', 'ㄲ', + 'ㄴ', + 'ㄷ', 'ㄸ', + 'ㄹ', + 'ㅁ', + 'ㅂ', 'ㅃ', + 'ㅅ', 'ㅆ', + 'ㅇ', + 'ㅈ', 'ㅉ', + 'ㅊ', + 'ㅋ', + 'ㅌ', + 'ㅍ', + 'ㅎ' + }; + string[] Jaum_code = { + "1", "1", + "19", + "2", "2", + "29", + "3", + "4", "4", + "5", "5", + "6", + "7", "7", + "8", + "87", + "88", + "89", + "9" + }; + + char[] Moum = { + 'ㅏ', + 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', + 'ㅕ', 'ㅖ', + 'ㅗ', + 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moum_code = { + "1", + "2", "2", "2", + "3", "3", + "4", "4", + "5", + "6", "6", "6", "6", + "7", "7", "7", "7", "7", + "8", "8", + "9" + }; + + char[] Moumㄱㄷ = { + 'ㅏ', + 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', + 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moumㄱㄷ_code = { + "1", + "2", "2", "2", + "3", "3", + "4", "4", + "5", "5", "5", "5", "5", + "6", "6", "6", "6", "6", + "7", "7", + "8" + }; + + char[] Moumㅊ = { + 'ㅏ', 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moumㅊ_code = { + "1", "1", "1", "1", + "2", "2", "2", "2", + "3", "3", "3", "3", "3", + "4", "4", "4", "4", "4", + "5", "5", + "6" + }; + + string res1 = string.Empty; + string res2 = string.Empty; + string res3 = string.Empty; + bool[] isㄱㄷㅊ = { false, false }; + + HANGUL_INFO info1 = HangulJaso.DevideJaso(author[0]); + if (info1.isHangul == "NH") return info1.isHangul; + if (rb[0].Checked) res1 = info1.oriChar.ToString(); + else res1 = info1.chars[0].ToString(); + + HANGUL_INFO info2 = HangulJaso.DevideJaso(author[1]); + if (info2.isHangul == "NH") return info2.isHangul; + for(int a = 0; a < Jaum.Length; a++) + { + if (info2.chars[0] == Jaum[a]) { + res2 += Jaum_code[a]; + if (res2 == "1" || res2 == "2") isㄱㄷㅊ[0] = true; + else if (res2 == "8") isㄱㄷㅊ[1] = true; + break; + } + } + + if (isㄱㄷㅊ[0]) { + for(int a = 0; a < Moumㄱㄷ.Length; a++) + { + if (info2.chars[1] == Moumㄱㄷ[a]) { + res2 += Moumㄱㄷ_code[a]; + break; + } + } + } + else if (isㄱㄷㅊ[1]) { + for(int a = 0; a < Moumㅊ.Length; a++) + { + if (info2.chars[1] == Moumㅊ[a]) { + res2 += Moumㅊ_code[a]; + break; + } + } + } + else { + for (int a = 0; a < Moum.Length; a++) + { + if (info2.chars[1] == Moum[a]) { + res2 += Moum_code[a]; + break; + } + } + } + if (rb[2].Checked) + if (res2.Length > 2) + res2 = res2[0].ToString() + res2[1].ToString(); + + HANGUL_INFO info3 = HangulJaso.DevideJaso(book[0]); + if (info3.isHangul == "NH") return info3.isHangul; + if (rb[1].Checked) + res3 = info3.oriChar.ToString(); + else + res3 = info3.chars[0].ToString(); + + res1 = res1 + res2 + res3; + return res1; + } + + /// + /// 이재철 4표 + /// + /// 대표저자 + /// 도서명 + /// 사용된 라디오박스 (3개) + /// 완성된 저자기호 + public string Symbol_4(string author, string book, RadioButton[] rb) + { + char[] Jaum = { + 'ㄱ', + 'ㄲ', + 'ㄴ', + 'ㄷ', + 'ㄸ', + 'ㄹ', + 'ㅁ', + 'ㅂ', + 'ㅃ', + 'ㅅ', + 'ㅆ', + 'ㅇ', + 'ㅈ', + 'ㅉ', + 'ㅊ', + 'ㅋ', + 'ㅌ', + 'ㅍ', + 'ㅎ' + }; + string[] Jaum_code = { + "1", + "18", + "19", + "2", + "28", + "29", + "3", + "4", + "49", + "5", + "59", + "6", + "7", + "79", + "8", + "87", + "88", + "89", + "9" + }; + + char[] Moum = { + 'ㅏ', + 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', + 'ㅕ', 'ㅖ', + 'ㅗ', + 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moum_code = { + "1", + "2", "2", "2", + "3", "3", + "4", "4", + "5", + "6", "6", "6", "6", + "7", "7", "7", "7", "7", + "8", "8", + "9" + }; + + char[] Moumㄱㄷ = { + 'ㅏ', + 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moumㄱㄷ_code = { + "1", + "2", "2", "2", + "3", "3", "3", "3", + "4", "4", "4", "4", "4", + "5", "5", "5", "5", "5", + "6", "6", + "7" + }; + + char[] Moumㅊ = { + 'ㅏ', 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moumㅊ_code = { + "1", "1", "1", "1", + "2", "2", "2", "2", + "3", "3", "3", "3", "3", + "4", "4", "4", "4", "4", + "5", "5", + "6" + }; + + string res1 = string.Empty; + string res2 = string.Empty; + string res3 = string.Empty; + bool[] isㄱㄷㅊ = { false, false }; + + HANGUL_INFO info1 = HangulJaso.DevideJaso(author[0]); + if (info1.isHangul == "NH") { return info1.isHangul; } + if (rb[0].Checked) + res1 = info1.oriChar.ToString(); + else + res1 = info1.chars[0].ToString(); + + HANGUL_INFO info2 = HangulJaso.DevideJaso(author[1]); + if (info2.isHangul == "NH") return info2.isHangul; + for(int a = 0; a < Jaum.Length; a++) + { + if (info2.chars[0] == Jaum[a]) { + res2 += Jaum_code[a]; + if (res2 == "1" || res2 == "2") isㄱㄷㅊ[0] = true; + else if (res2 == "8") isㄱㄷㅊ[1] = true; + break; + } + } + + if (isㄱㄷㅊ[0]) { + for(int a = 0; a < Moumㄱㄷ.Length; a++) + { + if (info2.chars[1] == Moumㄱㄷ[a]) { + res2 += Moumㄱㄷ_code[a]; + break; + } + } + } + else if (isㄱㄷㅊ[1]) { + for(int a = 0; a < Moumㅊ.Length; a++) + { + if (info2.chars[1] == Moumㅊ[a]) { + res2 += Moumㅊ_code[a]; + break; + } + } + } + else { + for(int a = 0; a < Moum.Length; a++) + { + if (info2.chars[1] == Moum[a]) { + res2 += Moum_code[a]; + break; + } + } + } + if (rb[2].Checked) + if (res2.Length > 2) + res2 = res2[0].ToString() + res2[1].ToString(); + + + HANGUL_INFO info3 = HangulJaso.DevideJaso(book[0]); + if (info3.isHangul == "NH") return info3.isHangul; + if (rb[1].Checked) + res3 = info3.oriChar.ToString(); + else + res3 = info3.chars[0].ToString(); + + res1 = res1 + res2 + res3; + return res1; + } + + /// + /// 이재철 5표 + /// + /// 대표저자 + /// 도서명 + /// 사용된 라디오박스 (3개) + /// 완성된 저자기호 + public string Symbol_5(string author, string book, RadioButton[] rb) + { + char[] Jaum = { + 'ㄱ', 'ㄲ', + 'ㄴ', + 'ㄷ', 'ㄸ', + 'ㄹ', + 'ㅁ', + 'ㅂ', 'ㅃ', + 'ㅅ', 'ㅆ', + 'ㅇ', + 'ㅈ', 'ㅉ', + 'ㅊ', + 'ㅋ', + 'ㅌ', + 'ㅍ', + 'ㅎ' }; + string[] Jaum_code = { + "1", "1", + "19", + "2", "2", + "29", + "3", + "4", "4", + "5", "5", + "6", + "7", "7", + "8", + "87", + "88", + "89", + "9" }; + + char[] Moum = { + 'ㅏ', + 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' }; + string[] Moum_code = { + "2", + "3", "3", "3", + "4", "4", "4", "4", + "5", "5", "5", "5", "5", + "6", "6", "6", "6", "6", + "7", "7", + "8" }; + + char[] Moumㅊ = { + 'ㅏ', 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅣ' }; + string[] Moumㅊ_code = { + "2", "2", "2", "2", + "3", "3", "3", "3", + "4", "4", "4", "4", "4", + "5", "5", "5", "5", "5", + "6" }; + + string res = string.Empty; + string res1 = string.Empty; + string res2 = string.Empty; + bool isㅊ = false; + HANGUL_INFO info0 = HangulJaso.DevideJaso(author[0]); + if (info0.isHangul == "NH") { return info0.isHangul; } + if (rb[0].Checked) + res = info0.oriChar.ToString(); + else + res = info0.chars[0].ToString(); + + HANGUL_INFO info1 = HangulJaso.DevideJaso(author[1]); + if (info1.isHangul == "NH") { return info1.isHangul; } + for(int a= 0; a < Jaum.Length; a++) + { + if (info1.chars[0] == Jaum[a]) { + res1 += Jaum_code[a]; + if (res1 == "8") isㅊ = true; + break; + } + } + + if (isㅊ) { + for(int a = 0; a < Moumㅊ.Length; a++) + { + if(info1.chars[1] == Moumㅊ[a]) { + res1 += Moumㅊ_code[a]; + break; + } + } + } + else { + for(int a = 0; a < Moum.Length; a++) + { + if (info1.chars[1] == Moum[a]) { + res1 += Moum_code[a]; + break; + } + } + } + if (rb[2].Checked) + { + if (res1.Length > 2) { res1 = res1[0].ToString() + res1[1].ToString(); } + } + + HANGUL_INFO info2 = HangulJaso.DevideJaso(book[0]); + if (info2.isHangul == "NH") { return info2.isHangul; } + if (rb[1].Checked) + res2 = info2.oriChar.ToString(); + else + res2 = info2.chars[0].ToString(); + + res = res + res1 + res2; + return res; + } + + /// + /// 이재철 6표 + /// + /// 대표저자 + /// 도서명 + /// 사용된 라디오박스 (3개) + /// 완성된 저자기호 + public string Symbol_6(string author, string book, RadioButton[] rb) + { + char[] Jaum = { + 'ㄱ', + 'ㄲ', + 'ㄴ', + 'ㄷ', + 'ㄸ', + 'ㄹ', + 'ㅁ', + 'ㅂ', + 'ㅃ', + 'ㅅ', + 'ㅆ', + 'ㅇ', + 'ㅈ', + 'ㅉ', + 'ㅊ', + 'ㅋ', + 'ㅌ', + 'ㅍ', + 'ㅎ' + }; + string[] Jaum_code = { + "1", + "18", + "19", + "2", + "28", + "29", + "3", + "4", + "49", + "5", + "59", + "6", + "7", + "79", + "8", + "87", + "88", + "89", + "9" + }; + + char[] Moum = { + 'ㅏ', + 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moum_code = { + "2", + "3", "3", "3", + "4", "4", "4", "4", + "5", "5", "5", "5", "5", + "6", "6", "6", "6", "6", + "7", "7", + "8" + }; + + char[] Moumㄱㄷ = { + 'ㅏ', 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', + 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moumㄱㄷ_code = { + "2", "2", "2", "2", + "3", "3", "3", "3", + "4", "4", "4", "4", "4", + "5", "5", "5", "5", "5", + "6", "6", + "7" + }; + + char[] Moumㅊ = { + 'ㅏ', 'ㅐ', 'ㅑ', 'ㅒ', + 'ㅓ', 'ㅔ', 'ㅕ', 'ㅖ', + 'ㅗ', 'ㅘ', 'ㅙ', 'ㅚ', 'ㅛ', + 'ㅜ', 'ㅝ', 'ㅞ', 'ㅟ', 'ㅠ', 'ㅡ', 'ㅢ', + 'ㅣ' + }; + string[] Moumㅊ_code = { + "2", "2", "2", "2", + "3", "3", "3", "3", + "4", "4", "4", "4", "4", + "5", "5", "5", "5", "5", "5", "5", + "6" + }; + + string res1 = string.Empty; + string res2 = string.Empty; + string res3 = string.Empty; + bool[] isㄱㄷㅊ = { false, false }; + + HANGUL_INFO info1 = HangulJaso.DevideJaso(author[0]); + if (info1.isHangul == "NH") { return info1.isHangul; } + if (rb[0].Checked) + res1 = info1.oriChar.ToString(); + else + res1 = info1.chars[0].ToString(); + + HANGUL_INFO info2 = HangulJaso.DevideJaso(author[1]); + if (info2.isHangul == "NH") return info2.isHangul; + for (int a = 0; a < Jaum.Length; a++) + { + if (info2.chars[0] == Jaum[a]) + { + res2 += Jaum_code[a]; + if (res2 == "1" || res2 == "2") isㄱㄷㅊ[0] = true; + else if (res2 == "8") isㄱㄷㅊ[1] = true; + break; + } + } + + if (isㄱㄷㅊ[0]) + { + for (int a = 0; a < Moumㄱㄷ.Length; a++) + { + if (info2.chars[1] == Moumㄱㄷ[a]) + { + res2 += Moumㄱㄷ_code[a]; + break; + } + } + } + else if (isㄱㄷㅊ[1]) + { + for (int a = 0; a < Moumㅊ.Length; a++) + { + if (info2.chars[1] == Moumㅊ[a]) + { + res2 += Moumㅊ_code[a]; + break; + } + } + } + else + { + for (int a = 0; a < Moum.Length; a++) + { + if (info2.chars[1] == Moum[a]) + { + res2 += Moum_code[a]; + break; + } + } + } + if (rb[2].Checked) + if (res2.Length > 2) + res2 = res2[0].ToString() + res2[1].ToString(); + + + HANGUL_INFO info3 = HangulJaso.DevideJaso(book[0]); + if (info3.isHangul == "NH") return info3.isHangul; + if (rb[1].Checked) + res3 = info3.oriChar.ToString(); + else + res3 = info3.chars[0].ToString(); + + res1 = res1 + res2 + res3; + return res1; + } + + /// + /// 이재철 7표 + /// + /// 대표저자 + /// 도서명 + /// 사용된 라디오박스 (3개) + /// 완성된 저자기호 + public string Symbol_7(string author, string book, RadioButton[] rb) + { + char[] Jaum = { + 'ㄱ', + 'ㄴ', + 'ㄷ', + 'ㄹ', + 'ㅁ', + 'ㅂ', + 'ㅅ', + 'ㅈ', + 'ㅊ', + 'ㅋ', + 'ㅌ', + 'ㅍ', + 'ㅎ', + 'ㄲ', + 'ㄸ', + 'ㅃ', + 'ㅆ', + 'ㅉ', + 'ㅇ' + }; + string[] Jaum_code = { + "1", + "19", + "2", + "29", + "3", + "4", + "5", + "6", + "66", + "67", + "68", + "69", + "7", + "8", + "86", + "87", + "88", + "89", + "9" + }; + + char[] Moum = { + 'ㅏ', 'ㅑ', + 'ㅓ', + 'ㅕ', + 'ㅗ', 'ㅛ', + 'ㅜ', + 'ㅠ', 'ㅡ', + 'ㅣ', + 'ㅐ', 'ㅒ', 'ㅔ', 'ㅖ', + 'ㅚ', 'ㅟ', 'ㅢ', 'ㅘ', 'ㅝ', 'ㅙ', 'ㅞ' + }; + string[] Moum_code = { + "1", "1", + "2", + "3", + "4", "4", + "5", + "6", "6", + "7", + "8", "8", "8", "8", + "9", "9", "9", "9", "9", "9", "9" + }; + + char[] Moumㄱㄷ = { + 'ㅏ', 'ㅑ', + 'ㅓ', + 'ㅕ', + 'ㅗ', 'ㅛ', + 'ㅜ', + 'ㅠ', 'ㅡ', + 'ㅣ', + 'ㅐ', 'ㅒ', 'ㅔ', 'ㅖ', 'ㅚ', 'ㅟ', 'ㅢ', 'ㅙ', 'ㅞ' + }; + string[] Moumㄱㄷ_code = { + "1", "1", + "2", + "3", + "4", "4", + "5", + "6", "6", + "7", + "8", "8", "8", "8", "8", "8", "8", "8", "8" + }; + + char[] Moumㅈㄲ = { + 'ㅏ', 'ㅑ', + 'ㅓ', 'ㅕ', + 'ㅗ', 'ㅛ', + 'ㅜ', 'ㅠ', 'ㅡ', + 'ㅣ', 'ㅐ', 'ㅒ', 'ㅔ', 'ㅖ', 'ㅚ', 'ㅟ', 'ㅢ', 'ㅘ', 'ㅙ', 'ㅝ', 'ㅞ' + }; + string[] Moumㅈㄲ_code = { + "1", "1", + "2", "2", + "3", "3", + "4", "4", "4", + "5", "5", "5", "5", "5", "5", "5", "5", "5", "5", "5", "5" + }; + + string res1 = string.Empty; + string res2 = string.Empty; + string res3 = string.Empty; + bool[] isㄱㄷㅈㄲ = { false, false }; + + HANGUL_INFO info1 = HangulJaso.DevideJaso(author[0]); + if (info1.isHangul == "NH") { return info1.isHangul; } + if (rb[0].Checked) + res1 = info1.oriChar.ToString(); + else + res1 = info1.chars[0].ToString(); + + HANGUL_INFO info2 = HangulJaso.DevideJaso(author[1]); + if (info2.isHangul == "NH") return info2.isHangul; + for (int a = 0; a < Jaum.Length; a++) + { + if (info2.chars[0] == Jaum[a]) { + res2 += Jaum_code[a]; + if (res2 == "1" || res2 == "2") isㄱㄷㅈㄲ[0] = true; + else if (res2 == "6" || res2 == "8") isㄱㄷㅈㄲ[1] = true; + break; + } + } + + if (isㄱㄷㅈㄲ[0]) { + for (int a = 0; a < Moumㄱㄷ.Length; a++) + { + if (info2.chars[1] == Moumㄱㄷ[a]) { + res2 += Moumㄱㄷ_code[a]; + break; + } + } + } + else if (isㄱㄷㅈㄲ[1]) { + for (int a = 0; a < Moumㅈㄲ.Length; a++) + { + if (info2.chars[1] == Moumㅈㄲ[a]) { + res2 += Moumㅈㄲ_code[a]; + break; + } + } + } + else { + for (int a = 0; a < Moum.Length; a++) + { + if (info2.chars[1] == Moum[a]) { + res2 += Moum_code[a]; + break; + } + } + } + if (rb[2].Checked) + if (res2.Length > 2) + res2 = res2[0].ToString() + res2[1].ToString(); + + + HANGUL_INFO info3 = HangulJaso.DevideJaso(book[0]); + if (info3.isHangul == "NH") return info3.isHangul; + if (rb[1].Checked) + res3 = info3.oriChar.ToString(); + else + res3 = info3.chars[0].ToString(); + + res1 = res1 + res2 + res3; + return res1; + } + + /// + /// 이재철 8표 + /// + /// 대표저자 + /// 도서명 + /// 사용된 라디오박스 (3개) + /// 완성된 저자기호 + public string Symbol_8(string author, string book, RadioButton[] rb) + { + char[] Jaum = { + 'ㄱ', + 'ㄴ', + 'ㄷ', + 'ㄹ', + 'ㅁ', + 'ㅂ', + 'ㅅ', + 'ㅈ', + 'ㅊ', + 'ㅋ', + 'ㅌ', + 'ㅍ', + 'ㅎ', + 'ㄲ', + 'ㄸ', + 'ㅃ', + 'ㅆ', + 'ㅉ', + 'ㅇ' + }; + string[] Jaum_code = { + "1", + "19", + "2", + "29", + "3", + "4", + "5", + "6", + "66", + "67", + "68", + "69", + "7", + "8", + "86", + "87", + "88", + "89", + "9" + }; + + char[] Moum = { + 'ㅏ', 'ㅑ', + 'ㅓ', + 'ㅕ', + 'ㅗ', 'ㅛ', + 'ㅜ', 'ㅠ', 'ㅡ', + 'ㅣ', + 'ㅐ', 'ㅒ', 'ㅔ', 'ㅖ', 'ㅚ', 'ㅟ', 'ㅢ', 'ㅙ', 'ㅞ' + }; + string[] Moum_code = { + "2", "2", + "3", + "4", + "5", "5", + "6", "6", "6", + "7", + "8", "8", "8", "8", "8", "8", "8", "8", "8" + }; + + char[] Moumㅈㄲ = { + 'ㅏ', 'ㅑ', 'ㅓ', 'ㅕ', + 'ㅗ', 'ㅛ', + 'ㅜ', 'ㅠ', 'ㅡ', + 'ㅣ', 'ㅐ', 'ㅒ', 'ㅔ', 'ㅖ', 'ㅚ', 'ㅟ', 'ㅢ', 'ㅙ', 'ㅞ' + }; + string[] Moumㅈㄲ_code = { + "2", "2", "2", "2", + "3", "3", + "4", "4", "4", + "5", "5", "5", "5", "5", "5", "5", "5", "5", "5" + }; + + string res1 = string.Empty; + string res2 = string.Empty; + string res3 = string.Empty; + bool isㅈㄲ = false; + + HANGUL_INFO info1 = HangulJaso.DevideJaso(author[0]); + if (info1.isHangul == "NH") { return info1.isHangul; } + if (rb[0].Checked) + res1 = info1.oriChar.ToString(); + else + res1 = info1.chars[0].ToString(); + + HANGUL_INFO info2 = HangulJaso.DevideJaso(author[1]); + if (info2.isHangul == "NH") return info2.isHangul; + for (int a = 0; a < Jaum.Length; a++) + { + if (info2.chars[0] == Jaum[a]) + { + res2 += Jaum_code[a]; + if (res2 == "6" || res2 == "8") isㅈㄲ = true; + break; + } + } + + if (isㅈㄲ) { + for (int a = 0; a < Moumㅈㄲ.Length; a++) + { + if (info2.chars[1] == Moumㅈㄲ[a]) { + res2 += Moumㅈㄲ_code[a]; + break; + } + } + } + else { + for (int a = 0; a < Moum.Length; a++) + { + if (info2.chars[1] == Moum[a]) { + res2 += Moum_code[a]; + break; + } + } + } + if (rb[2].Checked) + if (res2.Length > 2) + res2 = res2[0].ToString() + res2[1].ToString(); + + + HANGUL_INFO info3 = HangulJaso.DevideJaso(book[0]); + if (info3.isHangul == "NH") return info3.isHangul; + if (rb[1].Checked) + res3 = info3.oriChar.ToString(); + else + res3 = info3.chars[0].ToString(); + + res1 = res1 + res2 + res3; + return res1; + } } } diff --git a/unimarc/unimarc/편의기능/Calendar.cs b/unimarc/unimarc/편의기능/Calendar.cs index 7793277..753f86e 100644 --- a/unimarc/unimarc/편의기능/Calendar.cs +++ b/unimarc/unimarc/편의기능/Calendar.cs @@ -124,6 +124,7 @@ namespace WindowsFormsApp1.Convenience if (day < 1) { months--; + if (months < 1) { year--; months = 12; } day = DateTime.DaysInMonth(year, months); ago = true; } diff --git a/unimarc/unimarc/회계/Remit_reg.cs b/unimarc/unimarc/회계/Remit_reg.cs index d9ffb3d..490f782 100644 --- a/unimarc/unimarc/회계/Remit_reg.cs +++ b/unimarc/unimarc/회계/Remit_reg.cs @@ -136,7 +136,7 @@ namespace WindowsFormsApp1.Account private void btn_Excel_Click(object sender, EventArgs e) { Excel_text et = new Excel_text(); - // 은행코드 계좌번호 빈칸 금액 예금주 + string[] Excel_title = { "은행코드", "계좌번호", "", "금액", "예금주" }; string[,] inputExcel = new string[dataGridView1.RowCount, 5]; for (int a = 0; a < dataGridView1.RowCount; a++) { @@ -145,7 +145,7 @@ namespace WindowsFormsApp1.Account inputExcel[a, 3] = dataGridView1.Rows[a].Cells["send_money"].Value.ToString(); inputExcel[a, 4] = dataGridView1.Rows[a].Cells["bank_name"].Value.ToString(); } - et.Mk_Excel(inputExcel); + et.Mk_Excel(Excel_title, inputExcel); } private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) { diff --git a/unimarc/unimarc/회계/Remit_reg2.cs b/unimarc/unimarc/회계/Remit_reg2.cs index 4f6d6a2..3f021e9 100644 --- a/unimarc/unimarc/회계/Remit_reg2.cs +++ b/unimarc/unimarc/회계/Remit_reg2.cs @@ -197,7 +197,7 @@ namespace WindowsFormsApp1.Account private void btn_excel_Click(object sender, EventArgs e) { Excel_text et = new Excel_text(); - // 은행코드 계좌번호 빈칸 금액 예금주 + string[] Excel_title = { "은행코드", "계좌번호", "", "금액", "예금주" }; string[,] inputExcel = new string[dataGridView1.RowCount, 5]; for (int a = 0; a < dataGridView1.RowCount; a++) { @@ -206,7 +206,7 @@ namespace WindowsFormsApp1.Account inputExcel[a, 3] = dataGridView1.Rows[a].Cells["send_money"].Value.ToString(); inputExcel[a, 4] = dataGridView1.Rows[a].Cells["bank_name"].Value.ToString(); } - et.Mk_Excel(inputExcel); + et.Mk_Excel(Excel_title, inputExcel); } private void btn_close_Click(object sender, EventArgs e)