diff --git a/.gitignore b/.gitignore index 87fd836..0e4a9e9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ Skill.cs *.config *.exe *.xlsx +*.zip ## 폴더 무시 unimarc/Factory_Client/ diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index 9fa010c..1319ddf 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/ISBN_Check_test/Form1.cs b/ISBN_Check_test/Form1.cs index 048fd4e..5487daa 100644 --- a/ISBN_Check_test/Form1.cs +++ b/ISBN_Check_test/Form1.cs @@ -120,10 +120,11 @@ namespace ISBN_Check_test else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray) gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty; - insert_By_Aladin(api.Aladin(query, "ISBN13", param), a); + string aladin = api.Aladin(query, "ISBN13", param); + insert_By_Aladin(aladin, a); try { - richTextBox1.Text = api.Aladin(query, "ISBN13", param); + richTextBox1.Text = aladin; } catch { } } diff --git a/ISBN_Check_test/Yes24.cs b/ISBN_Check_test/Yes24.cs index b2a699f..0bf9356 100644 --- a/ISBN_Check_test/Yes24.cs +++ b/ISBN_Check_test/Yes24.cs @@ -10,6 +10,7 @@ using System.Windows.Forms; using Excel = Microsoft.Office.Interop.Excel; using WindowsFormsApp1; using System.Reflection; +using System.Text.RegularExpressions; namespace ISBN_Check_test { @@ -116,14 +117,16 @@ namespace ISBN_Check_test private void btn_change_Click(object sender, EventArgs e) { - string[,] grid = new string[dataGridView1.Rows.Count, 5]; + string[,] grid = new string[dataGridView1.Rows.Count, 6]; for (int a = 0; a < dataGridView1.Rows.Count; a++) { + string price = dataGridView1.Rows[a].Cells["price"].Value.ToString(); int count = a + 1; grid[a, 0] = count.ToString(); grid[a, 1] = dataGridView1.Rows[a].Cells["after_book_name"].Value.ToString(); grid[a, 3] = dataGridView1.Rows[a].Cells["after_book_comp"].Value.ToString(); - grid[a, 4] = dataGridView1.Rows[a].Cells["price"].Value.ToString(); + grid[a, 4] = Regex.Replace(price, @"[^0-9]", ""); + grid[a, 5] = "1"; } Excel_change(grid); } @@ -149,10 +152,10 @@ namespace ISBN_Check_test ws.Columns[5].ColumnWidth = 12.57; // E #endregion - string[] title = { "번호", "도서명", "ISBN", "출판사", "정가" }; + string[] title = { "번호", "도서명", "ISBN", "출판사", "정가", "수량" }; #region 제목 셀 - rng = ws.Range["A1", "E1"]; + rng = ws.Range["A1", "F1"]; rng.Value2 = title; rng.HorizontalAlignment = Excel.XlHAlign.xlHAlignCenter; rng.Font.Bold = true; @@ -160,7 +163,7 @@ namespace ISBN_Check_test // 기본 정보 입력칸 int count = dataGridView1.Rows.Count + 1; - rng = ws.Range["A2", "E"+count.ToString()]; + rng = ws.Range["A2", "F"+count.ToString()]; rng.Value2 = grid; rng.HorizontalAlignment = Excel.XlHAlign.xlHAlignCenter; diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.application b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application index 6e07c87..d482e3e 100644 --- a/ISBN_Check_test/bin/Debug/ISBN_Check_test.application +++ b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application @@ -21,7 +21,7 @@ - KfNy3DAiJLEh3tRQ2ZQcK5Keg1upaJsdza4YBq+Y4bs= + +MrCwwIqdW5a7byy/y9gxOk+aEXFqsgtK5j+CUByFTI= diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe index a89adda..12b442c 100644 Binary files a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe and b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe differ diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest index f1738a9..80f6a86 100644 --- a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest +++ b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest @@ -3,7 +3,7 @@ - + @@ -66,14 +66,14 @@ - - + + - 1jQjMNp8jzDP+pP5SPnsAv651qNqU9GEpBC5IKMbD/Q= + ++pv0LHaDa8ziJMfnyICIlKOnuotJHtIQcdR8OfA+uQ= @@ -236,7 +236,7 @@ - 5wxJhVMbghywvrKT0y8SppZWKsk+i4zv+rv4zZRY8Gw= + LHCHPQZvhBXwS5g0pB0KViIDcPqgteLoLW03r6PxZSI= \ No newline at end of file diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb b/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb index 2741c16..7dee2c6 100644 Binary files a/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb and b/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb differ diff --git a/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe index 0606d3d..16b0913 100644 Binary files a/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe and b/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe differ diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.application b/ISBN_Check_test/obj/Debug/ISBN_Check_test.application index 6e07c87..d482e3e 100644 --- a/ISBN_Check_test/obj/Debug/ISBN_Check_test.application +++ b/ISBN_Check_test/obj/Debug/ISBN_Check_test.application @@ -21,7 +21,7 @@ - KfNy3DAiJLEh3tRQ2ZQcK5Keg1upaJsdza4YBq+Y4bs= + +MrCwwIqdW5a7byy/y9gxOk+aEXFqsgtK5j+CUByFTI= diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe index a89adda..12b442c 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe differ diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest index f1738a9..80f6a86 100644 --- a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest +++ b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest @@ -3,7 +3,7 @@ - + @@ -66,14 +66,14 @@ - - + + - 1jQjMNp8jzDP+pP5SPnsAv651qNqU9GEpBC5IKMbD/Q= + ++pv0LHaDa8ziJMfnyICIlKOnuotJHtIQcdR8OfA+uQ= @@ -236,7 +236,7 @@ - 5wxJhVMbghywvrKT0y8SppZWKsk+i4zv+rv4zZRY8Gw= + LHCHPQZvhBXwS5g0pB0KViIDcPqgteLoLW03r6PxZSI= \ No newline at end of file diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb b/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb index 2741c16..7dee2c6 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb differ diff --git a/Test_Project/.vs/Test_Project/v16/.suo b/Test_Project/.vs/Test_Project/v16/.suo index 5a6c0f2..d73eed6 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/Program.cs b/Test_Project/Program.cs index 8fe002c..a243649 100644 --- a/Test_Project/Program.cs +++ b/Test_Project/Program.cs @@ -16,7 +16,7 @@ namespace Test_Project { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Test()); + Application.Run(new Form1()); } } } diff --git a/Test_Project/bin/Debug/Test_Project.pdb b/Test_Project/bin/Debug/Test_Project.pdb index cd55e00..ee10ac6 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/DesignTimeResolveAssemblyReferencesInput.cache b/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index bd24273..15b9b51 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.CoreCompileInputs.cache b/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache index 3a0a90c..282b345 100644 --- a/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache +++ b/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -aed5a697ba539078456cd1085bbdd23ab52c0666 +6aefef5cdcf843f26c61154cb636b4f360be5390 diff --git a/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt b/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt index 39bd345..5f3a1f3 100644 --- a/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt +++ b/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt @@ -7,4 +7,4 @@ C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.cspro C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.csproj.CoreCompileInputs.cache 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.Test.resources +C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.Form1.resources diff --git a/Test_Project/obj/Debug/Test_Project.csproj.GenerateResource.cache b/Test_Project/obj/Debug/Test_Project.csproj.GenerateResource.cache index a7bf308..9a2fb27 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 cd55e00..ee10ac6 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 28b66ae..1261ac1 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/Email.cs b/unimarc/unimarc/Email.cs index 2d52969..a1a71f1 100644 --- a/unimarc/unimarc/Email.cs +++ b/unimarc/unimarc/Email.cs @@ -6,6 +6,7 @@ using System.Net; using System.Net.Mail; using System.Text; using System.Threading.Tasks; +using System.Web.Mail; using System.Windows.Forms; namespace WindowsFormsApp1 @@ -13,177 +14,182 @@ namespace WindowsFormsApp1 class Email { Helper_DB db = new Helper_DB(); - public bool Send_mail(string compidx, string pur, string filePath, string sender) + public bool cross_mail(string compidx, string filePath, string sender) { - db.DBcon(); - #region Setup + db.DBcon(); + // 보내는 이 : 메일ID, 메일PW, smtp주소, 포트번호 string sender_Area = "`comp_name`, `email_ID`, `email_PW`, `smtp`, `port`"; string tmp_db = db.DB_Select_Search(sender_Area, "Comp", "idx", compidx); string[] arr_db = tmp_db.Split('|'); + bool res = false; + bool daum = false; + + if (arr_db[1].Contains("@daum.net") || arr_db[1].Contains("@hanmail.net")) + { + daum = true; + } + #endregion - MailMessage mail = new MailMessage(); - MailMessage mail_by_self = new MailMessage(); + if (daum) + { + res = Daum_Send_Mail(arr_db, filePath, sender); + } + else { res = Send_mail(arr_db, filePath, sender); } - // 보내는 사람 이메일 - mail.From = new MailAddress(arr_db[1]); - mail_by_self.From = new MailAddress(arr_db[1]); + if (res) + { + Resend_Mail(arr_db, filePath, sender, daum); + } - // 받는 사람 이메일 - mail.To.Add(sender); - mail_by_self.To.Add(arr_db[3]); + return res; + } - // 메일 제목 - mail.Subject = arr_db[0] + "주문분입니다."; - mail_by_self.Subject = "Send_" + arr_db[0] + "주문분입니다."; + bool Daum_Send_Mail(string[] arr_db, string filePath, string sender) + { + System.Web.Mail.MailMessage msg = new System.Web.Mail.MailMessage(); + msg.From = arr_db[1]; + msg.To = sender; + msg.Subject = string.Format("{0} 주문분입니다.", arr_db[0]); + msg.Body = string.Format("{0} 주문분입니다.", arr_db[0]); + msg.Attachments.Add(new MailAttachment(filePath)); - // 메일 내용 - mail.Body = arr_db[0] + "주문분입니다."; - mail_by_self.Body = "Send_" + arr_db[0] + "주문분입니다."; + int cdoBasic = 1; + string smtp_server = arr_db[3]; + int port = Convert.ToInt32(arr_db[4]); - // 첨부파일 붙이기 - Attachment attachment = new Attachment(filePath); - mail.Attachments.Add(attachment); - mail_by_self.Attachments.Add(attachment); - - // SMTP 및 포트 설정 - SmtpClient smtp = new SmtpClient(arr_db[3], Convert.ToInt32(arr_db[4])); - SmtpClient smtp_by_self = new SmtpClient(arr_db[3], Convert.ToInt32(arr_db[4])); - smtp.EnableSsl = true; - smtp_by_self.EnableSsl = true; - - // 계정 설정 - smtp.Credentials = new NetworkCredential(arr_db[1], arr_db[2]); - smtp_by_self.Credentials = new NetworkCredential(arr_db[1], arr_db[2]); + string field = "http://schemas.microsoft.com/cdo/configuration/"; + msg.Fields.Add(field + "smtpusessl", true); + msg.Fields.Add(field + "smtpserverport", port); + msg.Fields.Add(field + "smtpauthenticate", cdoBasic); + msg.Fields.Add(field + "sendusername", arr_db[1]); + msg.Fields.Add(field + "sendpassword", arr_db[2]); try { - smtp.Send(mail); - smtp_by_self.Send(mail_by_self); - MessageBox.Show("메일 전송 완료"); + SmtpMail.SmtpServer = smtp_server; + SmtpMail.Send(msg); + MessageBox.Show("다음 메일 전송 성공"); return true; } - catch(SmtpException e) + catch (Exception e) { MessageBox.Show(e.ToString()); return false; } } - /// - /// 테스트 메일 보낼때 사용. (추후 함수가 기반이 되어야함.) - /// ex. email.Send_Test_mail("관리", "jhk132765@gmail.com"); - /// - /// DB에 저장된 회사명. - /// 받는 업체의 메일주소. - public void Send_Test_mail(string compidx, string taker, string title, string content) - { - db.DBcon(); - string tmpdata = db.DB_Select_Search("`email_ID`, `email_PW`, `smtp`, `port`", - "Comp", "idx", compidx); - string[] data = tmpdata.Split('|'); - int port = Convert.ToInt32(data[3]); - if(port == 465) { port = 587; } // 465포트는 기술적으로 사용되지않음. 587로 대체. - MailMessage mail = new MailMessage(); + bool Send_mail(string[] arr_db, string filePath, string sender) + { + + System.Net.Mail.MailMessage mail = new System.Net.Mail.MailMessage(); // 보내는 사람 이메일 - mail.From = new MailAddress(data[0]); + mail.From = new MailAddress(arr_db[1]); // 받는 사람 이메일 - mail.To.Add(taker); + mail.To.Add(sender); // 메일 제목 - mail.Subject = title; + mail.Subject = string.Format("{0} 주문분입니다.", arr_db[0]); // 메일 내용 - mail.Body = content; + mail.Body = string.Format("{0} 주문분입니다.", arr_db[0]); + + // 첨부파일 붙이기 + Attachment attachment = new Attachment(filePath); + mail.Attachments.Add(attachment); + + string smtp_server = arr_db[3]; + int port = Convert.ToInt32(arr_db[4]); // SMTP 및 포트 설정 - SmtpClient smtp = new SmtpClient(data[2], port); + SmtpClient smtp = new SmtpClient(smtp_server, port); smtp.EnableSsl = true; // 계정 설정 - smtp.Credentials = new NetworkCredential(data[0], data[1]); + smtp.Credentials = new NetworkCredential(arr_db[1], arr_db[2]); try { smtp.Send(mail); MessageBox.Show("메일 전송 완료"); + return true; } catch (SmtpException e) { MessageBox.Show(e.ToString()); + return false; } } - } - class TestMail - { - Helper_DB db = new Helper_DB(); - /// - /// 메일을 보내기 위한 함수 - /// - /// 보내는 사람 메일 - /// 받는 사람 메일 - /// 메일의 제목 - /// 메일의 내용 - /// 첨부파일의 경로 - public void Send_Mail(string sender, string taker, string title, string body, string link = "") + void Resend_Mail(string[] arr_db, string filePath, string sender, bool daum) { - db.DBcon(); - - string Area = "`smtp`, `port`, `email_ID`, `email_PW`"; - string db_tmp = db.DB_Select_Search(Area, "Comp", "email_ID", sender); - string[] db_data = db_tmp.Split('|'); // smtp, port, email_ID, email_PW - string smtp = db_data[0]; - int port = Convert.ToInt32(db_data[1]); - string id = db_data[2]; - string pw = db_data[3]; - - MailMessage mail = new MailMessage(); - - // 보내는 사람 이메일 주소 - mail.From = new MailAddress(sender); - - // 받는 사람 이메일 주소 - mail.To.Add(taker); - - // 메일 제목 - mail.Subject = title; - - // 메일 내용 - mail.Body = body; - - if(link != "") { Attach_File(mail, link); } - - // 포트 설정 - SmtpClient tp = new SmtpClient(smtp, port); - - // SSL 설정 - tp.EnableSsl = true; - - // 메일 인증을 위한 id/pw (Sender 정보) - tp.Credentials = new NetworkCredential(id, pw); - try + if (daum) { - tp.Send(mail); - MessageBox.Show("메일이 전송되었습니다."); - } - catch(SmtpException e) - { - MessageBox.Show(e.ToString()); - } - } - public void Attach_File(MailMessage mail, string link) - { - System.Net.Mail.Attachment attachment; - attachment = new System.Net.Mail.Attachment(link); + System.Web.Mail.MailMessage msg = new System.Web.Mail.MailMessage(); + msg.From = arr_db[1]; + msg.To = arr_db[1]; + msg.Subject = string.Format("(확인메일) {0} 주문분입니다.",arr_db[0]); + msg.Body = string.Format("(확인메일) {0} 주문분입니다.", arr_db[0]); + msg.Attachments.Add(new MailAttachment(filePath)); - mail.Attachments.Add(attachment); + int cdoBasic = 1; + string smtp_server = arr_db[3]; + int port = Convert.ToInt32(arr_db[4]); + + string field = "http://schemas.microsoft.com/cdo/configuration/"; + msg.Fields.Add(field + "smtpusessl", true); + msg.Fields.Add(field + "smtpserverport", port); + msg.Fields.Add(field + "smtpauthenticate", cdoBasic); + msg.Fields.Add(field + "sendusername", arr_db[1]); + msg.Fields.Add(field + "sendpassword", arr_db[2]); + + try + { + SmtpMail.SmtpServer = smtp_server; + SmtpMail.Send(msg); + } + catch (Exception e) + { + MessageBox.Show(e.ToString()); + } + } + else + { + System.Net.Mail.MailMessage mail = new System.Net.Mail.MailMessage(); + mail.From = new MailAddress(arr_db[1]); + mail.To.Add(arr_db[1]); + mail.Subject = string.Format("(확인메일) {0} 주문분입니다.", arr_db[0]); + mail.Body = string.Format("(확인메일) {0} 주문분입니다.", arr_db[0]); + + // 첨부파일 붙이기 + Attachment attachment = new Attachment(filePath); + mail.Attachments.Add(attachment); + + string smtp_server = arr_db[3]; + int port = Convert.ToInt32(arr_db[4]); + + // SMTP 및 포트 설정 + SmtpClient smtp = new SmtpClient(smtp_server, port); + smtp.EnableSsl = true; + + // 계정 설정 + smtp.Credentials = new NetworkCredential(arr_db[1], arr_db[2]); + + try + { + smtp.Send(mail); + } + catch (SmtpException e) + { + MessageBox.Show(e.ToString()); + } + } } } } diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs index c7df075..e1ad0f4 100644 --- a/unimarc/unimarc/Main.Designer.cs +++ b/unimarc/unimarc/Main.Designer.cs @@ -57,6 +57,7 @@ this.매출입금toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.매출조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.매출집계ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.파트타임관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.마크ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.단축키설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -122,7 +123,6 @@ this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.파트타임관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -161,28 +161,28 @@ // 사용자정보ToolStripMenuItem // this.사용자정보ToolStripMenuItem.Name = "사용자정보ToolStripMenuItem"; - this.사용자정보ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.사용자정보ToolStripMenuItem.Size = new System.Drawing.Size(175, 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(180, 22); + this.사용자관리ToolStripMenuItem.Size = new System.Drawing.Size(175, 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(180, 22); + this.납품거래처관리ToolStripMenuItem.Size = new System.Drawing.Size(175, 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(180, 22); + this.주문처관리ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.주문처관리ToolStripMenuItem.Text = "주문처 관리"; this.주문처관리ToolStripMenuItem.Click += new System.EventHandler(this.주문처관리ToolStripMenuItem_Click); // @@ -190,14 +190,14 @@ // this.비밀번호변경ToolStripMenuItem.Enabled = false; this.비밀번호변경ToolStripMenuItem.Name = "비밀번호변경ToolStripMenuItem"; - this.비밀번호변경ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.비밀번호변경ToolStripMenuItem.Size = new System.Drawing.Size(175, 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(180, 22); + this.도서정보관리ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.도서정보관리ToolStripMenuItem.Text = "도서정보 관리"; this.도서정보관리ToolStripMenuItem.Click += new System.EventHandler(this.도서정보관리ToolStripMenuItem_Click); // @@ -205,7 +205,7 @@ // this.사용대장ToolStripMenuItem.Enabled = false; this.사용대장ToolStripMenuItem.Name = "사용대장ToolStripMenuItem"; - this.사용대장ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.사용대장ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.사용대장ToolStripMenuItem.Text = "사용대장"; this.사용대장ToolStripMenuItem.Click += new System.EventHandler(this.사용대장ToolStripMenuItem_Click); // @@ -226,49 +226,49 @@ // 물품등록ToolStripMenuItem // this.물품등록ToolStripMenuItem.Name = "물품등록ToolStripMenuItem"; - this.물품등록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.물품등록ToolStripMenuItem.Size = new System.Drawing.Size(166, 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(180, 22); + this.목록등록편의ToolStripMenuItem.Size = new System.Drawing.Size(166, 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(180, 22); + this.목록집계ToolStripMenuItem.Size = new System.Drawing.Size(166, 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(180, 22); + this.주문입력ToolStripMenuItem.Size = new System.Drawing.Size(166, 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(180, 22); + this.매입ToolStripMenuItem.Size = new System.Drawing.Size(166, 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(180, 22); + this.재고입력및조회ToolStripMenuItem.Size = new System.Drawing.Size(166, 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(180, 22); + this.반품처리ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.반품처리ToolStripMenuItem.Text = "반품처리"; this.반품처리ToolStripMenuItem.Click += new System.EventHandler(this.반품처리ToolStripMenuItem_Click); // @@ -287,14 +287,14 @@ // 송금내역조회ToolStripMenuItem // this.송금내역조회ToolStripMenuItem.Name = "송금내역조회ToolStripMenuItem"; - this.송금내역조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.송금내역조회ToolStripMenuItem.Size = new System.Drawing.Size(154, 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(180, 22); + this.송금등록ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.송금등록ToolStripMenuItem.Text = "송금 등록"; this.송금등록ToolStripMenuItem.Click += new System.EventHandler(this.송금등록ToolStripMenuItem_Click); // @@ -305,7 +305,7 @@ this.매입장부ToolStripMenuItem1, this.매입미결제ToolStripMenuItem}); this.매입장부ToolStripMenuItem.Name = "매입장부ToolStripMenuItem"; - this.매입장부ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.매입장부ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.매입장부ToolStripMenuItem.Text = "매입"; // // 매입집계ToolStripMenuItem @@ -338,7 +338,7 @@ this.매출조회ToolStripMenuItem, this.매출집계ToolStripMenuItem1}); this.매출입력ToolStripMenuItem.Name = "매출입력ToolStripMenuItem"; - this.매출입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.매출입력ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.매출입력ToolStripMenuItem.Text = "매출"; // // 매출입력ToolStripMenuItem1 @@ -369,6 +369,13 @@ this.매출집계ToolStripMenuItem1.Text = "매출 집계"; this.매출집계ToolStripMenuItem1.Click += new System.EventHandler(this.매출입금ToolStripMenuItem1_Click); // + // 파트타임관리ToolStripMenuItem + // + this.파트타임관리ToolStripMenuItem.Name = "파트타임관리ToolStripMenuItem"; + this.파트타임관리ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.파트타임관리ToolStripMenuItem.Text = "파트타임 관리"; + this.파트타임관리ToolStripMenuItem.Click += new System.EventHandler(this.파트타임관리ToolStripMenuItem_Click); + // // 마크ToolStripMenuItem // this.마크ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -391,34 +398,34 @@ this.불용어ToolStripMenuItem, this.작업지시서ToolStripMenuItem}); this.설정ToolStripMenuItem.Name = "설정ToolStripMenuItem"; - this.설정ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.설정ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.설정ToolStripMenuItem.Text = "설정"; // // 단축키설정ToolStripMenuItem // this.단축키설정ToolStripMenuItem.Name = "단축키설정ToolStripMenuItem"; - this.단축키설정ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.단축키설정ToolStripMenuItem.Size = new System.Drawing.Size(138, 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(180, 22); + this.매크로문구설정ToolStripMenuItem.Size = new System.Drawing.Size(138, 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(180, 22); + this.불용어ToolStripMenuItem.Size = new System.Drawing.Size(138, 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(180, 22); + this.작업지시서ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.작업지시서ToolStripMenuItem.Text = "작업지시서"; this.작업지시서ToolStripMenuItem.Click += new System.EventHandler(this.작업지시서ToolStripMenuItem_Click); // @@ -430,34 +437,34 @@ this.엑셀작성ToolStripMenuItem, this.iSBN조회ToolStripMenuItem}); this.마크작업ToolStripMenuItem.Name = "마크작업ToolStripMenuItem"; - this.마크작업ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.마크작업ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.마크작업ToolStripMenuItem.Text = "마크 작업"; // // 마크목록ToolStripMenuItem // this.마크목록ToolStripMenuItem.Name = "마크목록ToolStripMenuItem"; - this.마크목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.마크목록ToolStripMenuItem.Size = new System.Drawing.Size(146, 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(180, 22); + this.소장자료검색ToolStripMenuItem.Size = new System.Drawing.Size(146, 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(180, 22); + this.엑셀작성ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.엑셀작성ToolStripMenuItem.Text = "엑셀 작성"; this.엑셀작성ToolStripMenuItem.Click += new System.EventHandler(this.엑셀작성ToolStripMenuItem_Click); // // iSBN조회ToolStripMenuItem // this.iSBN조회ToolStripMenuItem.Name = "iSBN조회ToolStripMenuItem"; - this.iSBN조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.iSBN조회ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.iSBN조회ToolStripMenuItem.Text = "ISBN 조회"; this.iSBN조회ToolStripMenuItem.Click += new System.EventHandler(this.iSBN조회ToolStripMenuItem_Click); // @@ -467,20 +474,20 @@ this.반입ToolStripMenuItem, this.반출ToolStripMenuItem}); this.반입및반출ToolStripMenuItem.Name = "반입및반출ToolStripMenuItem"; - this.반입및반출ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.반입및반출ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.반입및반출ToolStripMenuItem.Text = "반입 및 반출"; // // 반입ToolStripMenuItem // this.반입ToolStripMenuItem.Name = "반입ToolStripMenuItem"; - this.반입ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.반입ToolStripMenuItem.Size = new System.Drawing.Size(98, 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(180, 22); + this.반출ToolStripMenuItem.Size = new System.Drawing.Size(98, 22); this.반출ToolStripMenuItem.Text = "반출"; this.반출ToolStripMenuItem.Click += new System.EventHandler(this.반출ToolStripMenuItem_Click); // @@ -490,20 +497,20 @@ this.복본조사ToolStripMenuItem1, this.dLS복본조사ToolStripMenuItem}); this.복본조사ToolStripMenuItem.Name = "복본조사ToolStripMenuItem"; - this.복본조사ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.복본조사ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.복본조사ToolStripMenuItem.Text = "복본 조사"; // // 복본조사ToolStripMenuItem1 // this.복본조사ToolStripMenuItem1.Name = "복본조사ToolStripMenuItem1"; - this.복본조사ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.복본조사ToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); this.복본조사ToolStripMenuItem1.Text = "복본조사"; this.복본조사ToolStripMenuItem1.Click += new System.EventHandler(this.복본조사ToolStripMenuItem1_Click); // // dLS복본조사ToolStripMenuItem // this.dLS복본조사ToolStripMenuItem.Name = "dLS복본조사ToolStripMenuItem"; - this.dLS복본조사ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.dLS복본조사ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.dLS복본조사ToolStripMenuItem.Text = "DLS 복본조사"; this.dLS복본조사ToolStripMenuItem.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click); // @@ -515,34 +522,34 @@ this.검수ToolStripMenuItem, this.저자기호ToolStripMenuItem}); this.부가기능ToolStripMenuItem.Name = "부가기능ToolStripMenuItem"; - this.부가기능ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.부가기능ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.부가기능ToolStripMenuItem.Text = "부가기능"; // // 마크수집ToolStripMenuItem // this.마크수집ToolStripMenuItem.Name = "마크수집ToolStripMenuItem"; - this.마크수집ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.마크수집ToolStripMenuItem.Size = new System.Drawing.Size(122, 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(180, 22); + this.전집관리ToolStripMenuItem1.Size = new System.Drawing.Size(122, 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(180, 22); + this.검수ToolStripMenuItem.Size = new System.Drawing.Size(122, 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(180, 22); + this.저자기호ToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.저자기호ToolStripMenuItem.Text = "저자기호"; this.저자기호ToolStripMenuItem.Click += new System.EventHandler(this.저자기호ToolStripMenuItem_Click); // @@ -552,7 +559,7 @@ this.dLS조회ToolStripMenuItem, this.dLS입력ToolStripMenuItem}); this.dLSToolStripMenuItem.Name = "dLSToolStripMenuItem"; - this.dLSToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.dLSToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.dLSToolStripMenuItem.Text = "DLS"; // // dLS조회ToolStripMenuItem @@ -576,7 +583,7 @@ this.마크통계ToolStripMenuItem, this.장비관리ToolStripMenuItem1}); this.기타ToolStripMenuItem.Name = "기타ToolStripMenuItem"; - this.기타ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.기타ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.기타ToolStripMenuItem.Text = "기타"; // // 서류작성ToolStripMenuItem @@ -904,13 +911,6 @@ this.toolStripLabel1.Size = new System.Drawing.Size(43, 22); this.toolStripLabel1.Text = "이용자"; // - // 파트타임관리ToolStripMenuItem - // - this.파트타임관리ToolStripMenuItem.Name = "파트타임관리ToolStripMenuItem"; - this.파트타임관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.파트타임관리ToolStripMenuItem.Text = "파트타임 관리"; - this.파트타임관리ToolStripMenuItem.Click += new System.EventHandler(this.파트타임관리ToolStripMenuItem_Click); - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1000,7 +1000,6 @@ private System.Windows.Forms.Button button7; private System.Windows.Forms.Button button4; private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripLabel toolStripLabel1; private System.Windows.Forms.ToolStripMenuItem 사용자정보ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 작업지시서ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 마크작업ToolStripMenuItem; @@ -1032,5 +1031,6 @@ private System.Windows.Forms.ToolStripMenuItem 반품처리ToolStripMenuItem; public System.Windows.Forms.ToolStripLabel toolStripLabel2; private System.Windows.Forms.ToolStripMenuItem 파트타임관리ToolStripMenuItem; + public System.Windows.Forms.ToolStripLabel toolStripLabel1; } } \ No newline at end of file diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs index 1410856..290e389 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -61,7 +61,7 @@ namespace WindowsFormsApp1 if (result[3] == null) { } else { toolStripLabel2.Text = result[5]; - toolStripLabel1.Text = "이용자 : " + result[3]; + toolStripLabel1.Text = result[3]; User = result[3]; } diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index b93dd8f..5ee465c 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 08a111c..4bf5572 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 4c25906..d6c4141 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/bin/Debug/temp/temp.txt b/unimarc/unimarc/bin/Debug/temp/temp.txt new file mode 100644 index 0000000..7cdffe8 --- /dev/null +++ b/unimarc/unimarc/bin/Debug/temp/temp.txt @@ -0,0 +1,4 @@ +9788969524102 1 간호사를 간호하는 간호사 경향BP 오성훈 13500 60 8100 [(주)글로리아북]납품 2021-07-14 오후 1:44 머리 10 +9791195010073 1 감정조절자(희망) : 나를 힘겹게 하는 나와 작별하기 프로젝트 헥소미아 김인자 16000 60 9600 [(주)글로리아북]납품 2021-07-14 오후 1:44 머리 11 +9788932320625 1 개는 우리를 어떻게 사랑하는가 : 개의 특별한 애정에 대한 과학적 탐구 현암사 클라이브 D. L. 윈 ; 전행선 17000 60 10200 [(주)글로리아북]납품 2021-07-14 오후 1:44 머리 12 +9791158491307 1 걷다 느끼다 쓰다 : 전문성과 대중성을 겸비한 글쓰기 수업 모아북스 이해사 15000 60 9000 [(주)글로리아북]납품 2021-07-14 오후 1:44 머리 13 diff --git a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1ed5731..080c262 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache index 48fc6ee..f5e894a 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index 648d34a..2c9f6a4 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 b93dd8f..5ee465c 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 08a111c..4bf5572 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index 4c25906..d6c4141 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 aa3e3a6..262ff0b 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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = 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(); @@ -79,6 +79,7 @@ this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_unstock = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); @@ -128,7 +129,6 @@ this.lbl_idx.Size = new System.Drawing.Size(62, 12); this.lbl_idx.TabIndex = 2; this.lbl_idx.Text = "idx 들어감"; - this.lbl_idx.Visible = false; // // tb_isbn // @@ -348,7 +348,7 @@ // this.tb_author.Location = new System.Drawing.Point(69, 60); this.tb_author.Name = "tb_author"; - this.tb_author.Size = new System.Drawing.Size(560, 21); + this.tb_author.Size = new System.Drawing.Size(345, 21); this.tb_author.TabIndex = 1; this.tb_author.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Book_Lookup_KeyDown); // @@ -401,7 +401,7 @@ // // btn_stock // - this.btn_stock.Location = new System.Drawing.Point(27, 6); + this.btn_stock.Location = new System.Drawing.Point(90, 6); this.btn_stock.Name = "btn_stock"; this.btn_stock.Size = new System.Drawing.Size(75, 23); this.btn_stock.TabIndex = 3; @@ -411,7 +411,7 @@ // // btn_order_ccl // - this.btn_order_ccl.Location = new System.Drawing.Point(116, 6); + this.btn_order_ccl.Location = new System.Drawing.Point(171, 6); this.btn_order_ccl.Name = "btn_order_ccl"; this.btn_order_ccl.Size = new System.Drawing.Size(75, 23); this.btn_order_ccl.TabIndex = 3; @@ -421,7 +421,7 @@ // // btn_order // - this.btn_order.Location = new System.Drawing.Point(205, 6); + this.btn_order.Location = new System.Drawing.Point(252, 6); this.btn_order.Name = "btn_order"; this.btn_order.Size = new System.Drawing.Size(75, 23); this.btn_order.TabIndex = 3; @@ -453,7 +453,7 @@ // // btn_printLine // - this.btn_printLine.Location = new System.Drawing.Point(293, 6); + this.btn_printLine.Location = new System.Drawing.Point(333, 6); this.btn_printLine.Name = "btn_printLine"; this.btn_printLine.Size = new System.Drawing.Size(75, 23); this.btn_printLine.TabIndex = 3; @@ -519,14 +519,14 @@ this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.AllowUserToResizeColumns = false; this.dataGridView1.AllowUserToResizeRows = false; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + 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; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column1, this.Column2, @@ -534,14 +534,14 @@ this.Column4, this.Column5, this.Column6}); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle4; + 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; this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridView1.Location = new System.Drawing.Point(9, 311); this.dataGridView1.Name = "dataGridView1"; @@ -584,11 +584,22 @@ this.Column6.Name = "Column6"; this.Column6.Width = 40; // + // btn_unstock + // + this.btn_unstock.Location = new System.Drawing.Point(9, 6); + this.btn_unstock.Name = "btn_unstock"; + this.btn_unstock.Size = new System.Drawing.Size(75, 23); + this.btn_unstock.TabIndex = 6; + this.btn_unstock.Text = "미입고처리"; + this.btn_unstock.UseVisualStyleBackColor = true; + this.btn_unstock.Click += new System.EventHandler(this.btn_unstock_Click); + // // Book_Lookup // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(667, 510); + this.Controls.Add(this.btn_unstock); this.Controls.Add(this.dataGridView1); this.Controls.Add(this.panel2); this.Controls.Add(this.btn_save); @@ -662,5 +673,6 @@ private System.Windows.Forms.TextBox tb_stock; private System.Windows.Forms.Label label13; private System.Windows.Forms.Label lbl_idx; + private System.Windows.Forms.Button btn_unstock; } } \ No newline at end of file diff --git a/unimarc/unimarc/납품관리/Book_Lookup.cs b/unimarc/unimarc/납품관리/Book_Lookup.cs index 1b683a6..21b5308 100644 --- a/unimarc/unimarc/납품관리/Book_Lookup.cs +++ b/unimarc/unimarc/납품관리/Book_Lookup.cs @@ -208,19 +208,30 @@ namespace WindowsFormsApp1.Delivery } private void btn_stock_Click(object sender, EventArgs e) { - int stock = Convert.ToInt32(tb_stock.Text); - stock += 1; - tb_stock.Text = stock.ToString(); - /* // 저장버튼 클릭시 일괄저장되는걸로 변경 (소스는 혹시 몰라 주석처리) + tb_stock.Text = tb_count.Text; + string[] edit_tbl = { "input_count", "import", "import_date" }; - string[] edit_col = { stock.ToString(), "입고", DateTime.Today.ToString("G").Substring(0,10) }; + string[] edit_col = { tb_stock.Text, "입고", DateTime.Today.ToString("yyyy-MM-dd") }; string[] search_tbl = { "compidx", "list_name", "book_name", "author", "book_comp", "isbn" }; string[] search_col = { compidx, tb_List_name.Text, tb_book_name.Text, tb_author.Text, tb_book_comp.Text, tb_isbn.Text }; db.More_Update("Obj_List_Book", edit_tbl, edit_col, search_tbl, search_col); MessageBox.Show(tb_book_name.Text + "가 입고처리되었습니다."); mk_Grid(); - */ + } + + private void btn_unstock_Click(object sender, EventArgs e) + { + tb_stock.Text = "0"; + + string[] edit_tbl = { "input_count", "import", "import_date" }; + string[] edit_col = { tb_stock.Text, "미입고", "" }; + string[] search_tbl = { "compidx", "list_name", "book_name", "author", "book_comp", "isbn" }; + string[] search_col = { compidx, + tb_List_name.Text, tb_book_name.Text, tb_author.Text, tb_book_comp.Text, tb_isbn.Text }; + db.More_Update("Obj_List_Book", edit_tbl, edit_col, search_tbl, search_col); + MessageBox.Show(tb_book_name.Text + "가 미입고처리되었습니다."); + mk_Grid(); } private void btn_order_ccl_Click(object sender, EventArgs e) { diff --git a/unimarc/unimarc/납품관리/Commodity_Search.cs b/unimarc/unimarc/납품관리/Commodity_Search.cs index 75eace3..a6f7345 100644 --- a/unimarc/unimarc/납품관리/Commodity_Search.cs +++ b/unimarc/unimarc/납품관리/Commodity_Search.cs @@ -149,7 +149,7 @@ namespace WindowsFormsApp1.Delivery if (edit != null) { edit.New_Clit.Text = value; } if (com != null) { com.tb_clt1.Text = value; } if (pur != null) { pur.tb_clt.Text = value; } - if (la != null) { la.tb_clt.Text = value; } + if (la != null) { la.tb_clt.Text = value; la.btn_lookup_Click(null, null); } if (si != null) { si.tb_clt.Text = value; si.lbl_tel.Text = dataGridView1.Rows[idx].Cells[2].Value.ToString(); } if (sb != null) { sb.tb_clt.Text = value; sb.btn_Lookup_Click(null, null); } if (sip != null) { sip.tb_clt.Text = value; } diff --git a/unimarc/unimarc/납품관리/Input_Lookup_Stock.cs b/unimarc/unimarc/납품관리/Input_Lookup_Stock.cs index 71cf081..e7859f6 100644 --- a/unimarc/unimarc/납품관리/Input_Lookup_Stock.cs +++ b/unimarc/unimarc/납품관리/Input_Lookup_Stock.cs @@ -93,7 +93,7 @@ namespace WindowsFormsApp1.Delivery dataGridView1.Rows[row].Cells["book_name"].Value.ToString(), dataGridView1.Rows[row].Cells["author"].Value.ToString(), dataGridView1.Rows[row].Cells["book_comp"].Value.ToString(), - dataGridView1.Rows[row].Cells["pay"].Value.ToString(), + dataGridView1.Rows[row].Cells["pay"].Value.ToString().Replace(",",""), dataGridView1.Rows[row].Cells["count"].Value.ToString(), dataGridView1.Rows[row].Cells["order"].Value.ToString(), dataGridView1.Rows[row].Cells["Order_date"].Value.ToString() }; diff --git a/unimarc/unimarc/납품관리/List_aggregation.Designer.cs b/unimarc/unimarc/납품관리/List_aggregation.Designer.cs index c8261a3..306f969 100644 --- a/unimarc/unimarc/납품관리/List_aggregation.Designer.cs +++ b/unimarc/unimarc/납품관리/List_aggregation.Designer.cs @@ -55,6 +55,7 @@ this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column20 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.chk_label = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clt = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Chk_Column = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.label5 = new System.Windows.Forms.Label(); this.combo_user = new System.Windows.Forms.ComboBox(); @@ -66,50 +67,52 @@ this.combo_year = new System.Windows.Forms.ComboBox(); this.btn_close = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); - this.label20 = new System.Windows.Forms.Label(); + this.panel3 = new System.Windows.Forms.Panel(); + this.rtb_etc = new System.Windows.Forms.RichTextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.tb_work_way = new System.Windows.Forms.RichTextBox(); this.label21 = new System.Windows.Forms.Label(); this.lbl_send_n = new System.Windows.Forms.Label(); this.lbl_l_n = new System.Windows.Forms.Label(); - this.lbl_unstock_count = new System.Windows.Forms.Label(); - this.lbl_stock_count = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.lbl_send_y = new System.Windows.Forms.Label(); this.lbl_l_y = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); - this.tb_stock_per = new System.Windows.Forms.TextBox(); - this.tb_total = new System.Windows.Forms.TextBox(); - this.tb_list_num = new System.Windows.Forms.TextBox(); - this.tb_date_res = new System.Windows.Forms.TextBox(); - this.tb_charge = new System.Windows.Forms.TextBox(); - this.tb_count = new System.Windows.Forms.TextBox(); - this.tb_stock = new System.Windows.Forms.TextBox(); - this.tb_date = new System.Windows.Forms.TextBox(); this.tb_send_way = new System.Windows.Forms.TextBox(); - this.tb_work_name = new System.Windows.Forms.TextBox(); - this.tb_list_name = new System.Windows.Forms.TextBox(); - this.label18 = new System.Windows.Forms.Label(); - this.lbl_stock_n = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.lbl_stock_y = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); + this.tb_email = new System.Windows.Forms.TextBox(); + this.tb_fax = new System.Windows.Forms.TextBox(); + this.tb_tel = new System.Windows.Forms.TextBox(); + this.tb_boss = new System.Windows.Forms.TextBox(); this.label13 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); + this.tb_gu = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); + this.tb_addr = new System.Windows.Forms.TextBox(); + this.tb_client = new System.Windows.Forms.TextBox(); this.label8 = new System.Windows.Forms.Label(); + this.tb_work_name = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); this.btn_apply = new System.Windows.Forms.Button(); this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog(); this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog(); this.printDocument1 = new System.Drawing.Printing.PrintDocument(); - this.tb_work_way = new System.Windows.Forms.RichTextBox(); - this.panel2 = new System.Windows.Forms.Panel(); + 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(); this.panel1.SuspendLayout(); + this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); + this.panel4.SuspendLayout(); this.SuspendLayout(); // // btn_lookup @@ -216,13 +219,14 @@ this.Column18, this.Column20, this.chk_label, + this.clt, this.Chk_Column}); this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; this.dataGridView1.Location = new System.Drawing.Point(12, 40); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersWidth = 20; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(984, 618); + this.dataGridView1.Size = new System.Drawing.Size(984, 567); this.dataGridView1.TabIndex = 0; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); @@ -325,6 +329,12 @@ this.chk_label.Name = "chk_label"; this.chk_label.Visible = false; // + // clt + // + this.clt.HeaderText = "거래처명"; + this.clt.Name = "clt"; + this.clt.Visible = false; + // // Chk_Column // this.Chk_Column.HeaderText = "체크"; @@ -424,42 +434,36 @@ // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.panel3); this.panel1.Controls.Add(this.panel2); - this.panel1.Controls.Add(this.label20); this.panel1.Controls.Add(this.label21); this.panel1.Controls.Add(this.lbl_send_n); this.panel1.Controls.Add(this.lbl_l_n); - this.panel1.Controls.Add(this.lbl_unstock_count); - this.panel1.Controls.Add(this.lbl_stock_count); this.panel1.Controls.Add(this.label27); this.panel1.Controls.Add(this.label23); this.panel1.Controls.Add(this.lbl_send_y); this.panel1.Controls.Add(this.lbl_l_y); this.panel1.Controls.Add(this.label19); - this.panel1.Controls.Add(this.tb_stock_per); - this.panel1.Controls.Add(this.tb_total); - this.panel1.Controls.Add(this.tb_list_num); - this.panel1.Controls.Add(this.tb_date_res); - this.panel1.Controls.Add(this.tb_charge); - this.panel1.Controls.Add(this.tb_count); - this.panel1.Controls.Add(this.tb_stock); - this.panel1.Controls.Add(this.tb_date); this.panel1.Controls.Add(this.tb_send_way); - this.panel1.Controls.Add(this.tb_work_name); - this.panel1.Controls.Add(this.tb_list_name); - this.panel1.Controls.Add(this.label18); - this.panel1.Controls.Add(this.lbl_stock_n); - this.panel1.Controls.Add(this.label16); - this.panel1.Controls.Add(this.lbl_stock_y); - this.panel1.Controls.Add(this.label14); + this.panel1.Controls.Add(this.tb_email); + this.panel1.Controls.Add(this.tb_fax); + this.panel1.Controls.Add(this.tb_tel); + this.panel1.Controls.Add(this.tb_boss); this.panel1.Controls.Add(this.label13); - this.panel1.Controls.Add(this.label12); - this.panel1.Controls.Add(this.label11); - this.panel1.Controls.Add(this.label10); + this.panel1.Controls.Add(this.tb_gu); this.panel1.Controls.Add(this.label9); + this.panel1.Controls.Add(this.tb_addr); + this.panel1.Controls.Add(this.tb_client); this.panel1.Controls.Add(this.label8); + this.panel1.Controls.Add(this.tb_work_name); this.panel1.Controls.Add(this.label7); + this.panel1.Controls.Add(this.label12); + this.panel1.Controls.Add(this.label6); + this.panel1.Controls.Add(this.label15); + this.panel1.Controls.Add(this.label14); + this.panel1.Controls.Add(this.label11); this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.label10); this.panel1.Controls.Add(this.btn_ISBN); this.panel1.Controls.Add(this.btn_date); this.panel1.Controls.Add(this.btn_apply); @@ -467,24 +471,52 @@ this.panel1.Controls.Add(this.btn_process); this.panel1.Location = new System.Drawing.Point(1002, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(381, 653); + this.panel1.Size = new System.Drawing.Size(381, 634); this.panel1.TabIndex = 14; // - // label20 + // panel3 // - this.label20.AutoSize = true; - this.label20.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label20.Location = new System.Drawing.Point(201, 111); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(59, 13); - this.label20.TabIndex = 16; - this.label20.Text = "목록번호"; + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.rtb_etc); + this.panel3.Location = new System.Drawing.Point(74, 176); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(299, 74); + this.panel3.TabIndex = 18; + // + // rtb_etc + // + this.rtb_etc.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.rtb_etc.Dock = System.Windows.Forms.DockStyle.Fill; + this.rtb_etc.Location = new System.Drawing.Point(0, 0); + this.rtb_etc.Name = "rtb_etc"; + this.rtb_etc.Size = new System.Drawing.Size(297, 72); + this.rtb_etc.TabIndex = 17; + this.rtb_etc.Text = ""; + // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.tb_work_way); + this.panel2.Location = new System.Drawing.Point(74, 342); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(299, 74); + this.panel2.TabIndex = 18; + // + // tb_work_way + // + this.tb_work_way.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.tb_work_way.Dock = System.Windows.Forms.DockStyle.Fill; + this.tb_work_way.Location = new System.Drawing.Point(0, 0); + this.tb_work_way.Name = "tb_work_way"; + this.tb_work_way.Size = new System.Drawing.Size(297, 72); + this.tb_work_way.TabIndex = 17; + this.tb_work_way.Text = ""; // // label21 // this.label21.AutoSize = true; this.label21.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label21.Location = new System.Drawing.Point(10, 167); + this.label21.Location = new System.Drawing.Point(10, 291); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(59, 13); this.label21.TabIndex = 16; @@ -494,7 +526,7 @@ // this.lbl_send_n.AutoSize = true; this.lbl_send_n.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_send_n.Location = new System.Drawing.Point(338, 167); + this.lbl_send_n.Location = new System.Drawing.Point(327, 360); this.lbl_send_n.Name = "lbl_send_n"; this.lbl_send_n.Size = new System.Drawing.Size(24, 13); this.lbl_send_n.TabIndex = 16; @@ -505,38 +537,18 @@ // this.lbl_l_n.AutoSize = true; this.lbl_l_n.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_l_n.Location = new System.Drawing.Point(148, 167); + this.lbl_l_n.Location = new System.Drawing.Point(148, 291); this.lbl_l_n.Name = "lbl_l_n"; this.lbl_l_n.Size = new System.Drawing.Size(24, 13); this.lbl_l_n.TabIndex = 16; this.lbl_l_n.Text = "No"; this.lbl_l_n.Click += new System.EventHandler(this.lbl_l_y_Click); // - // lbl_unstock_count - // - this.lbl_unstock_count.AutoSize = true; - this.lbl_unstock_count.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_unstock_count.Location = new System.Drawing.Point(185, 193); - this.lbl_unstock_count.Name = "lbl_unstock_count"; - this.lbl_unstock_count.Size = new System.Drawing.Size(14, 13); - this.lbl_unstock_count.TabIndex = 16; - this.lbl_unstock_count.Text = "0"; - // - // lbl_stock_count - // - this.lbl_stock_count.AutoSize = true; - this.lbl_stock_count.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_stock_count.Location = new System.Drawing.Point(74, 193); - this.lbl_stock_count.Name = "lbl_stock_count"; - this.lbl_stock_count.Size = new System.Drawing.Size(14, 13); - this.lbl_stock_count.TabIndex = 16; - this.lbl_stock_count.Text = "0"; - // // label27 // this.label27.AutoSize = true; this.label27.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label27.Location = new System.Drawing.Point(317, 167); + this.label27.Location = new System.Drawing.Point(306, 360); this.label27.Name = "label27"; this.label27.Size = new System.Drawing.Size(13, 13); this.label27.TabIndex = 16; @@ -546,7 +558,7 @@ // this.label23.AutoSize = true; this.label23.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label23.Location = new System.Drawing.Point(127, 167); + this.label23.Location = new System.Drawing.Point(127, 291); this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(13, 13); this.label23.TabIndex = 16; @@ -556,7 +568,7 @@ // this.lbl_send_y.AutoSize = true; this.lbl_send_y.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_send_y.Location = new System.Drawing.Point(278, 167); + this.lbl_send_y.Location = new System.Drawing.Point(268, 291); this.lbl_send_y.Name = "lbl_send_y"; this.lbl_send_y.Size = new System.Drawing.Size(31, 13); this.lbl_send_y.TabIndex = 16; @@ -567,7 +579,7 @@ // this.lbl_l_y.AutoSize = true; this.lbl_l_y.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_l_y.Location = new System.Drawing.Point(88, 167); + this.lbl_l_y.Location = new System.Drawing.Point(88, 291); this.lbl_l_y.Name = "lbl_l_y"; this.lbl_l_y.Size = new System.Drawing.Size(31, 13); this.lbl_l_y.TabIndex = 16; @@ -578,230 +590,193 @@ // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label19.Location = new System.Drawing.Point(227, 167); + this.label19.Location = new System.Drawing.Point(219, 291); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(33, 13); this.label19.TabIndex = 16; this.label19.Text = "택배"; // - // tb_stock_per - // - this.tb_stock_per.BackColor = System.Drawing.SystemColors.Window; - this.tb_stock_per.Location = new System.Drawing.Point(262, 245); - this.tb_stock_per.Name = "tb_stock_per"; - this.tb_stock_per.Size = new System.Drawing.Size(111, 21); - this.tb_stock_per.TabIndex = 16; - // - // tb_total - // - this.tb_total.BackColor = System.Drawing.SystemColors.Window; - this.tb_total.Location = new System.Drawing.Point(262, 216); - this.tb_total.Name = "tb_total"; - this.tb_total.Size = new System.Drawing.Size(111, 21); - this.tb_total.TabIndex = 14; - // - // tb_list_num - // - this.tb_list_num.BackColor = System.Drawing.SystemColors.Window; - this.tb_list_num.Location = new System.Drawing.Point(262, 107); - this.tb_list_num.Name = "tb_list_num"; - this.tb_list_num.Size = new System.Drawing.Size(111, 21); - this.tb_list_num.TabIndex = 9; - // - // tb_date_res - // - this.tb_date_res.BackColor = System.Drawing.SystemColors.Window; - this.tb_date_res.Location = new System.Drawing.Point(262, 78); - this.tb_date_res.Name = "tb_date_res"; - this.tb_date_res.Size = new System.Drawing.Size(111, 21); - this.tb_date_res.TabIndex = 7; - // - // tb_charge - // - this.tb_charge.BackColor = System.Drawing.SystemColors.Window; - this.tb_charge.Enabled = false; - this.tb_charge.Location = new System.Drawing.Point(74, 107); - this.tb_charge.Name = "tb_charge"; - this.tb_charge.Size = new System.Drawing.Size(111, 21); - this.tb_charge.TabIndex = 8; - // - // tb_count - // - this.tb_count.BackColor = System.Drawing.SystemColors.Window; - this.tb_count.Location = new System.Drawing.Point(74, 245); - this.tb_count.Name = "tb_count"; - this.tb_count.Size = new System.Drawing.Size(111, 21); - this.tb_count.TabIndex = 15; - // - // tb_stock - // - this.tb_stock.BackColor = System.Drawing.SystemColors.Window; - this.tb_stock.Location = new System.Drawing.Point(74, 216); - this.tb_stock.Name = "tb_stock"; - this.tb_stock.Size = new System.Drawing.Size(111, 21); - this.tb_stock.TabIndex = 13; - // - // tb_date - // - this.tb_date.BackColor = System.Drawing.SystemColors.Window; - this.tb_date.Location = new System.Drawing.Point(74, 78); - this.tb_date.Name = "tb_date"; - this.tb_date.Size = new System.Drawing.Size(111, 21); - this.tb_date.TabIndex = 6; - // // tb_send_way // this.tb_send_way.BackColor = System.Drawing.SystemColors.Window; - this.tb_send_way.Location = new System.Drawing.Point(74, 272); + this.tb_send_way.Location = new System.Drawing.Point(74, 313); this.tb_send_way.Name = "tb_send_way"; this.tb_send_way.Size = new System.Drawing.Size(299, 21); this.tb_send_way.TabIndex = 12; // - // tb_work_name + // tb_email // - this.tb_work_name.BackColor = System.Drawing.SystemColors.Window; - this.tb_work_name.Location = new System.Drawing.Point(74, 136); - this.tb_work_name.Name = "tb_work_name"; - this.tb_work_name.Size = new System.Drawing.Size(299, 21); - this.tb_work_name.TabIndex = 10; + this.tb_email.BackColor = System.Drawing.SystemColors.Window; + this.tb_email.Location = new System.Drawing.Point(74, 122); + this.tb_email.Name = "tb_email"; + this.tb_email.Size = new System.Drawing.Size(298, 21); + this.tb_email.TabIndex = 10; // - // tb_list_name + // tb_fax // - this.tb_list_name.BackColor = System.Drawing.SystemColors.Window; - this.tb_list_name.Location = new System.Drawing.Point(74, 49); - this.tb_list_name.Name = "tb_list_name"; - this.tb_list_name.Size = new System.Drawing.Size(299, 21); - this.tb_list_name.TabIndex = 5; + this.tb_fax.BackColor = System.Drawing.SystemColors.Window; + this.tb_fax.Location = new System.Drawing.Point(254, 95); + this.tb_fax.Name = "tb_fax"; + this.tb_fax.Size = new System.Drawing.Size(119, 21); + this.tb_fax.TabIndex = 10; // - // label18 + // tb_tel // - this.label18.AutoSize = true; - this.label18.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label18.Location = new System.Drawing.Point(214, 249); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(46, 13); - this.label18.TabIndex = 16; - this.label18.Text = "입고율"; + this.tb_tel.BackColor = System.Drawing.SystemColors.Window; + this.tb_tel.Location = new System.Drawing.Point(74, 95); + this.tb_tel.Name = "tb_tel"; + this.tb_tel.Size = new System.Drawing.Size(119, 21); + this.tb_tel.TabIndex = 10; // - // lbl_stock_n + // tb_boss // - this.lbl_stock_n.AutoSize = true; - this.lbl_stock_n.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_stock_n.Location = new System.Drawing.Point(134, 193); - this.lbl_stock_n.Name = "lbl_stock_n"; - this.lbl_stock_n.Size = new System.Drawing.Size(46, 13); - this.lbl_stock_n.TabIndex = 16; - this.lbl_stock_n.Text = "미입고"; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label16.Location = new System.Drawing.Point(36, 249); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(33, 13); - this.label16.TabIndex = 16; - this.label16.Text = "수량"; - // - // lbl_stock_y - // - this.lbl_stock_y.AutoSize = true; - this.lbl_stock_y.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_stock_y.Location = new System.Drawing.Point(36, 193); - this.lbl_stock_y.Name = "lbl_stock_y"; - this.lbl_stock_y.Size = new System.Drawing.Size(33, 13); - this.lbl_stock_y.TabIndex = 16; - this.lbl_stock_y.Text = "입고"; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label14.Location = new System.Drawing.Point(201, 220); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(59, 13); - this.label14.TabIndex = 16; - this.label14.Text = "합계금액"; + this.tb_boss.BackColor = System.Drawing.SystemColors.Window; + this.tb_boss.Location = new System.Drawing.Point(254, 68); + this.tb_boss.Name = "tb_boss"; + this.tb_boss.Size = new System.Drawing.Size(119, 21); + this.tb_boss.TabIndex = 10; // // label13 // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label13.Location = new System.Drawing.Point(10, 220); + this.label13.Location = new System.Drawing.Point(36, 126); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(59, 13); + this.label13.Size = new System.Drawing.Size(33, 13); this.label13.TabIndex = 16; - this.label13.Text = "입고금액"; + this.label13.Text = "메일"; // - // label12 + // tb_gu // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label12.Location = new System.Drawing.Point(10, 274); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(59, 13); - this.label12.TabIndex = 16; - this.label12.Text = "배송방법"; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label11.Location = new System.Drawing.Point(10, 301); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(59, 13); - this.label11.TabIndex = 16; - this.label11.Text = "작업방법"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label10.Location = new System.Drawing.Point(23, 140); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(46, 13); - this.label10.TabIndex = 16; - this.label10.Text = "작업명"; + this.tb_gu.BackColor = System.Drawing.SystemColors.Window; + this.tb_gu.Location = new System.Drawing.Point(74, 68); + this.tb_gu.Name = "tb_gu"; + this.tb_gu.Size = new System.Drawing.Size(119, 21); + this.tb_gu.TabIndex = 10; // // label9 // this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label9.Location = new System.Drawing.Point(23, 111); + this.label9.Location = new System.Drawing.Point(219, 99); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(46, 13); + this.label9.Size = new System.Drawing.Size(33, 13); this.label9.TabIndex = 16; - this.label9.Text = "담당자"; + this.label9.Text = "팩스"; + // + // tb_addr + // + this.tb_addr.BackColor = System.Drawing.SystemColors.Window; + this.tb_addr.Location = new System.Drawing.Point(74, 149); + this.tb_addr.Name = "tb_addr"; + this.tb_addr.Size = new System.Drawing.Size(299, 21); + this.tb_addr.TabIndex = 10; + // + // tb_client + // + this.tb_client.BackColor = System.Drawing.SystemColors.Window; + this.tb_client.Location = new System.Drawing.Point(74, 41); + this.tb_client.Name = "tb_client"; + this.tb_client.Size = new System.Drawing.Size(299, 21); + this.tb_client.TabIndex = 10; // // label8 // this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label8.Location = new System.Drawing.Point(201, 82); + this.label8.Location = new System.Drawing.Point(10, 99); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(59, 13); this.label8.TabIndex = 16; - this.label8.Text = "완료일자"; + this.label8.Text = "전화번호"; + // + // tb_work_name + // + this.tb_work_name.BackColor = System.Drawing.SystemColors.Window; + this.tb_work_name.Location = new System.Drawing.Point(74, 262); + this.tb_work_name.Name = "tb_work_name"; + this.tb_work_name.Size = new System.Drawing.Size(299, 21); + this.tb_work_name.TabIndex = 10; // // label7 // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label7.Location = new System.Drawing.Point(10, 82); + this.label7.Location = new System.Drawing.Point(206, 72); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(59, 13); + this.label7.Size = new System.Drawing.Size(46, 13); this.label7.TabIndex = 16; - this.label7.Text = "목록일자"; + this.label7.Text = "대표자"; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label12.Location = new System.Drawing.Point(10, 315); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(59, 13); + this.label12.TabIndex = 16; + this.label12.Text = "배송방법"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label6.Location = new System.Drawing.Point(36, 72); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(33, 13); + this.label6.TabIndex = 16; + this.label6.Text = "구분"; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label15.Location = new System.Drawing.Point(36, 180); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(33, 13); + this.label15.TabIndex = 16; + this.label15.Text = "비고"; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label14.Location = new System.Drawing.Point(36, 153); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(33, 13); + this.label14.TabIndex = 16; + this.label14.Text = "주소"; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label11.Location = new System.Drawing.Point(10, 342); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(59, 13); + this.label11.TabIndex = 16; + this.label11.Text = "작업방법"; // // label4 // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label4.Location = new System.Drawing.Point(23, 53); + this.label4.Location = new System.Drawing.Point(23, 45); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(46, 13); this.label4.TabIndex = 16; - this.label4.Text = "목록명"; + this.label4.Text = "업체명"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label10.Location = new System.Drawing.Point(23, 266); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(46, 13); + this.label10.TabIndex = 16; + this.label10.Text = "작업명"; // // btn_apply // @@ -827,30 +802,64 @@ // this.printDocument1.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printDocument1_PrintPage); // - // tb_work_way + // panel4 // - this.tb_work_way.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.tb_work_way.Dock = System.Windows.Forms.DockStyle.Fill; - this.tb_work_way.Location = new System.Drawing.Point(0, 0); - this.tb_work_way.Name = "tb_work_way"; - this.tb_work_way.Size = new System.Drawing.Size(297, 345); - this.tb_work_way.TabIndex = 17; - this.tb_work_way.Text = ""; + 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); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(984, 26); + this.panel4.TabIndex = 15; // - // panel2 + // lbl_total // - this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel2.Controls.Add(this.tb_work_way); - this.panel2.Location = new System.Drawing.Point(74, 301); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(299, 347); - this.panel2.TabIndex = 18; + this.lbl_total.AutoSize = true; + this.lbl_total.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbl_total.Location = new System.Drawing.Point(683, 5); + this.lbl_total.Name = "lbl_total"; + this.lbl_total.Size = new System.Drawing.Size(50, 13); + 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.Name = "lbl_count"; + this.lbl_count.Size = new System.Drawing.Size(50, 13); + this.lbl_count.TabIndex = 0; + this.lbl_count.Text = "수량 : "; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label16.Location = new System.Drawing.Point(21, 5); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(87, 13); + this.label16.TabIndex = 0; + this.label16.Text = "목록 총 합계"; // // List_aggregation // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1395, 670); + this.ClientSize = new System.Drawing.Size(1395, 651); + this.Controls.Add(this.panel4); this.Controls.Add(this.panel1); this.Controls.Add(this.btn_close); this.Controls.Add(this.dataGridView1); @@ -872,15 +881,16 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.panel3.ResumeLayout(false); this.panel2.ResumeLayout(false); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); } #endregion - - private System.Windows.Forms.Button btn_lookup; private System.Windows.Forms.Button btn_save; private System.Windows.Forms.Label label1; private System.Windows.Forms.ComboBox combo_state; @@ -901,46 +911,42 @@ private System.Windows.Forms.PrintPreviewDialog printPreviewDialog1; private System.Windows.Forms.PageSetupDialog pageSetupDialog1; private System.Drawing.Printing.PrintDocument printDocument1; - private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label21; private System.Windows.Forms.Label label19; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label lbl_stock_n; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label lbl_stock_y; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label13; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox tb_date_res; - private System.Windows.Forms.TextBox tb_date; - private System.Windows.Forms.TextBox tb_list_name; - private System.Windows.Forms.TextBox tb_charge; private System.Windows.Forms.Label lbl_l_n; private System.Windows.Forms.Label label23; private System.Windows.Forms.Label lbl_l_y; - private System.Windows.Forms.TextBox tb_total; - private System.Windows.Forms.TextBox tb_count; - private System.Windows.Forms.TextBox tb_stock; private System.Windows.Forms.TextBox tb_send_way; private System.Windows.Forms.TextBox tb_work_name; - private System.Windows.Forms.Label lbl_stock_count; - private System.Windows.Forms.TextBox tb_stock_per; - private System.Windows.Forms.TextBox tb_list_num; private System.Windows.Forms.Label lbl_send_n; private System.Windows.Forms.Label label27; private System.Windows.Forms.Label lbl_send_y; - private System.Windows.Forms.Label lbl_unstock_count; private System.Windows.Forms.Button btn_apply; private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column4; private System.Windows.Forms.DataGridViewTextBoxColumn Column8; private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + public System.Windows.Forms.TextBox tb_clt; + private System.Windows.Forms.RichTextBox tb_work_way; + private System.Windows.Forms.Panel panel2; + public System.Windows.Forms.Button btn_lookup; + private System.Windows.Forms.TextBox tb_gu; + private System.Windows.Forms.TextBox tb_client; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox tb_boss; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.TextBox tb_fax; + private System.Windows.Forms.TextBox tb_tel; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.TextBox tb_email; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.TextBox tb_addr; + private System.Windows.Forms.Label label14; private System.Windows.Forms.DataGridViewTextBoxColumn list_name; private System.Windows.Forms.DataGridViewTextBoxColumn list_date; private System.Windows.Forms.DataGridViewTextBoxColumn date_res; @@ -957,9 +963,15 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column18; private System.Windows.Forms.DataGridViewTextBoxColumn Column20; private System.Windows.Forms.DataGridViewTextBoxColumn chk_label; + private System.Windows.Forms.DataGridViewTextBoxColumn clt; private System.Windows.Forms.DataGridViewCheckBoxColumn Chk_Column; - public System.Windows.Forms.TextBox tb_clt; - private System.Windows.Forms.RichTextBox tb_work_way; - private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.RichTextBox rtb_etc; + 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; } } \ No newline at end of file diff --git a/unimarc/unimarc/납품관리/List_aggregation.cs b/unimarc/unimarc/납품관리/List_aggregation.cs index 697b861..78c0190 100644 --- a/unimarc/unimarc/납품관리/List_aggregation.cs +++ b/unimarc/unimarc/납품관리/List_aggregation.cs @@ -60,16 +60,16 @@ namespace WindowsFormsApp1.Delivery if (a == user_name.Length - 1) { break; } combo_user.Items.Add(user_name[a]); } - combo_user.SelectedIndex = 0; + combo_user.SelectedItem = main.toolStripLabel1.Text; } - private void btn_lookup_Click(object sender, EventArgs e) // 조회 + public void btn_lookup_Click(object sender, EventArgs e) // 조회 { /// 목록명 / 목록일자 / 완료일자 / 담당자 / 작업명 /// 작업방법 / 배송방법 / 합계금액 / 입고금액 / 수량 /// 입고 / 미입고 / 목록번호 / 마크여부 string searchdb = "`list_name`, `date`, `date_res`, `charge`, `work_name`, " + "`work_way`, `send_way`, `total`, `stock_money`, `vol`, " + - "`stock`, `unstock`, `list_num`, `chk_marc`"; + "`stock`, `unstock`, `list_num`, `chk_marc`, `clt`"; List search_L_tbl = new List(); List search_L_col = new List(); @@ -100,11 +100,13 @@ namespace WindowsFormsApp1.Delivery string[] grid = { "", "", "", "", "", "", "", "", "", "", - "", "", "", "", "", "" }; + "", "", "", "", "", + "", "" }; + int count = 15; for (int a = 0; a < db_data.Length; a++) { - if (a % 14 == 0) { grid[0] = db_data[a]; } - if (a % 14 == 1) + if (a % count == 0) { grid[0] = db_data[a]; } + if (a % count == 1) { if (db_data[a].Length < 3) { @@ -113,25 +115,25 @@ namespace WindowsFormsApp1.Delivery else { grid[1] = db_data[a].Substring(0, 10); } grid[1] = db_data[a]; } - if (a % 14 == 2) { + if (a % count == 2) { if (db_data[a].Length < 3) { grid[2] = db_data[a]; } else { grid[2] = db_data[a].Substring(0, 10); } } - if (a % 14 == 3) { grid[3] = db_data[a]; } - if (a % 14 == 4) { grid[4] = db_data[a]; } - if (a % 14 == 5) { grid[5] = db_data[a]; } - if (a % 14 == 6) { grid[6] = db_data[a]; } - if (a % 14 == 7) { grid[7] = db_data[a]; } - if (a % 14 == 8) { grid[8] = db_data[a]; } - if (a % 14 == 9) { grid[9] = db_data[a]; } - if (a % 14 == 10) { grid[10] = db_data[a]; } - if (a % 14 == 11) { grid[11] = db_data[a]; } - if (a % 14 == 12) { grid[14] = db_data[a]; } - if (a % 14 == 13) - { - grid[15] = db_data[a]; + if (a % count == 3) { grid[3] = db_data[a]; } + if (a % count == 4) { grid[4] = db_data[a]; } + if (a % count == 5) { grid[5] = db_data[a]; } + if (a % count == 6) { grid[6] = db_data[a]; } + if (a % count == 7) { grid[7] = db_data[a]; } + if (a % count == 8) { grid[8] = db_data[a]; } + if (a % count == 9) { grid[9] = db_data[a]; } + if (a % count == 10) { grid[10] = db_data[a]; } + if (a % count == 11) { grid[11] = db_data[a]; } + 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]; if (Grid_filter(grid)) { dataGridView1.Rows.Add(grid); @@ -210,8 +212,10 @@ namespace WindowsFormsApp1.Delivery else { edit3 = dataGridView1.Rows[a].Cells["send_way"].Value.ToString(); } string[] Edit_Data = { edit1, edit2, edit3 }; - string[] Search_Data = {dataGridView1.Rows[a].Cells["list_name"].Value.ToString(), - dataGridView1.Rows[a].Cells["total"].Value.ToString()}; + string[] Search_Data = { + dataGridView1.Rows[a].Cells["list_name"].Value.ToString(), + dataGridView1.Rows[a].Cells["total"].Value.ToString() + }; db.More_Update(table, Edit_col, Edit_Data, Search_col, Search_Data); } } @@ -228,7 +232,11 @@ namespace WindowsFormsApp1.Delivery string[] Edit_col = { "state" }; string[] Edit_data = { "완료" }; string[] Search_col = { "compidx", "list_name", "date" }; - string[] Search_data = { compidx, tb_list_name.Text, tb_date.Text }; + string[] Search_data = { + compidx, + dataGridView1.Rows[row].Cells["list_name"].Value.ToString(), + dataGridView1.Rows[row].Cells["list_date"].Value.ToString() + }; string Area = "`isbn`, `isbn_import`, `book_name`, `author`, `book_comp`, `price`, `input_count`, `persent`"; string book_list = db.More_DB_Search("Obj_List_Book", Search_col, Search_data, Area); @@ -268,17 +276,18 @@ namespace WindowsFormsApp1.Delivery String_Text st = new String_Text(); DateTime date_tmp = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day); string date = date_tmp.ToString().Substring(0, 10); - string clt = st.GetMiddelString(tb_list_name.Text, "[", "]"); - string dly = tb_list_name.Text.Substring(tb_list_name.Text.IndexOf(']') + 1); + string clt = st.GetMiddelString(dataGridView1.Rows[row].Cells["list_name"].Value.ToString(), "[", "]"); + string dly = dataGridView1.Rows[row].Cells["list_name"].Value.ToString().Substring(dataGridView1.Rows[row].Cells["list_name"].Value.ToString().IndexOf(']') + 1); // 목록일자 + " " + 납품처 - string etc = tb_date.Text + " " + dly; + string etc = dataGridView1.Rows[row].Cells["list_date"].Value.ToString() + " " + dly; string[] total = Cal_out_price(book[4], book[5], out_per, book[6]); string[] col_name = { "compidx", "date", "list_date", "list_name", "client", "isbn", "book_name", "author", "book_comp", "price", "count", "out_per", "total", "in_price", "out_price", "in_per", "etc" }; - string[] insert_data = { compidx, date, tb_date.Text, tb_list_name.Text, clt, + 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 }; @@ -405,33 +414,22 @@ namespace WindowsFormsApp1.Delivery } private void btn_apply_Click(object sender, EventArgs e) { - dataGridView1.Rows[row].Cells["list_name"].Value = tb_list_name.Text; - dataGridView1.Rows[row].Cells["list_date"].Value = tb_date.Text; - dataGridView1.Rows[row].Cells["date_res"].Value = tb_date_res.Text; - dataGridView1.Rows[row].Cells["charge"].Value = tb_charge.Text; dataGridView1.Rows[row].Cells["work_name"].Value = tb_work_name.Text; dataGridView1.Rows[row].Cells["work_way"].Value = tb_work_way.Text; dataGridView1.Rows[row].Cells["send_way"].Value = tb_send_way.Text; - dataGridView1.Rows[row].Cells["total"].Value = tb_total.Text; - dataGridView1.Rows[row].Cells["stock_money"].Value = tb_stock.Text; - dataGridView1.Rows[row].Cells["count"].Value = tb_count.Text; - dataGridView1.Rows[row].Cells["Column13"].Value = tb_stock_per.Text; - dataGridView1.Rows[row].Cells["Column11"].Value = lbl_stock_count.Text; - dataGridView1.Rows[row].Cells["Column12"].Value = lbl_unstock_count.Text; - dataGridView1.Rows[row].Cells["Column20"].Value = tb_list_num.Text; } private void btn_checkup_Click(object sender, EventArgs e) // 검수작업 (내부 작업필요) { List_Chk_Work chk_work = new List_Chk_Work(this); chk_work.TopMost = true; - chk_work.data[0] = tb_list_name.Text; + chk_work.data[0] = dataGridView1.Rows[row].Cells["list_name"].Value.ToString(); chk_work.data[1] = compidx; chk_work.Show(); } private void btn_ISBN_Click(object sender, EventArgs e) // ISBN조회 { Check_ISBN isbn = new Check_ISBN(this); - isbn.list_name = tb_list_name.Text; + isbn.list_name = dataGridView1.Rows[row].Cells["list_name"].Value.ToString(); isbn.Show(); } private void btn_date_Click(object sender, EventArgs e) // 일정 @@ -500,64 +498,30 @@ namespace WindowsFormsApp1.Delivery } private void infor_reset() { - tb_list_name.Text = ""; - tb_date.Text = ""; - tb_date_res.Text = ""; - tb_charge.Text = ""; tb_work_name.Text = ""; tb_work_way.Text = ""; tb_send_way.Text = ""; - tb_total.Text = ""; - tb_stock.Text = ""; - tb_count.Text = ""; - tb_stock_per.Text = ""; - lbl_stock_count.Text = ""; - lbl_unstock_count.Text = ""; - tb_list_num.Text = ""; } private void infor_Update(int rowidx) { if (rowidx < 0) { return; } row = rowidx; infor_reset(); - // 목록명 - tb_list_name.Text = dataGridView1.Rows[rowidx].Cells["list_name"].Value.ToString(); - // 목록일자 - tb_date.Text = dataGridView1.Rows[rowidx].Cells["list_date"].Value.ToString().Substring(0,10); - // 완료일자 - if (dataGridView1.Rows[rowidx].Cells["date_res"].Value.ToString().Length < 3) { - tb_date_res.Text = ""; - } - else { - tb_date_res.Text = dataGridView1.Rows[rowidx].Cells["date_res"].Value.ToString().Substring(0, 10); - } - // 담당자 - tb_charge.Text = dataGridView1.Rows[rowidx].Cells["charge"].Value.ToString(); + string client = dataGridView1.Rows[rowidx].Cells["clt"].Value.ToString(); + client_Setting(client); // 작업명 tb_work_name.Text = dataGridView1.Rows[rowidx].Cells["work_name"].Value.ToString(); // 작업방법 tb_work_way.Text = dataGridView1.Rows[rowidx].Cells["work_way"].Value.ToString(); // 배송방법 tb_send_way.Text = dataGridView1.Rows[rowidx].Cells["send_way"].Value.ToString(); - // 합계금액 - tb_total.Text = dataGridView1.Rows[rowidx].Cells["total"].Value.ToString(); - // 입고금액 - tb_stock.Text = dataGridView1.Rows[rowidx].Cells["stock_money"].Value.ToString(); - // 수량 - tb_count.Text = dataGridView1.Rows[rowidx].Cells["count"].Value.ToString(); - // 입고 / 미입고 - lbl_stock_count.Text = dataGridView1.Rows[rowidx].Cells["Column11"].Value.ToString(); - lbl_unstock_count.Text = dataGridView1.Rows[rowidx].Cells["Column12"].Value.ToString(); - // 입고율 - tb_stock_per.Text = dataGridView1.Rows[rowidx].Cells["Column13"].Value.ToString(); - // 목록번호 - tb_list_num.Text = dataGridView1.Rows[rowidx].Cells["Column20"].Value.ToString(); // 택배여부 - if(dataGridView1.Rows[rowidx].Cells["Column18"].Value.ToString() == "") { + if (dataGridView1.Rows[rowidx].Cells["Column18"].Value.ToString() == "") { lbl_send_n.Font = new Font(this.Font, FontStyle.Bold); lbl_send_y.Font = new Font(this.Font, FontStyle.Regular); } - else { lbl_send_y.Font = new Font(this.Font, FontStyle.Bold); + else { + lbl_send_y.Font = new Font(this.Font, FontStyle.Bold); lbl_send_n.Font = new Font(this.Font, FontStyle.Regular); } // 라벨여부 @@ -565,10 +529,27 @@ namespace WindowsFormsApp1.Delivery lbl_l_y.Font = new Font(this.Font, FontStyle.Bold); lbl_l_n.Font = new Font(this.Font, FontStyle.Regular); } - else { lbl_l_n.Font = new Font(this.Font, FontStyle.Bold); + else { + lbl_l_n.Font = new Font(this.Font, FontStyle.Bold); lbl_l_y.Font = new Font(this.Font, FontStyle.Regular); } } + private void client_Setting(string client) + { + TextBox[] box = { tb_client, tb_gu, tb_boss, tb_tel, tb_fax, tb_email, tb_addr }; + string Area = "`c_sangho`, `c_gu`, `c_boss`, `c_tel`, `c_fax`, `c_email`, `c_addr`, `c_etc`"; + string data = db.DB_Select_Search(Area, "Client", "campanyidx", compidx, "c_sangho", client); + string[] arr = data.Split('|'); + + for (int a = 0; a < box.Length + 1; a++) + { + if (a == box.Length) { + rtb_etc.Text = arr[a]; + return; + } + box[a].Text = arr[a]; + } + } private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { if (e.ColumnIndex != 2 || e.ColumnIndex != 4 || e.ColumnIndex != 5 || @@ -608,6 +589,5 @@ namespace WindowsFormsApp1.Delivery lbl_send_n.Font = new Font(this.Font, FontStyle.Bold); } } - } } diff --git a/unimarc/unimarc/납품관리/List_aggregation.resx b/unimarc/unimarc/납품관리/List_aggregation.resx index c77df33..58c6dc5 100644 --- a/unimarc/unimarc/납품관리/List_aggregation.resx +++ b/unimarc/unimarc/납품관리/List_aggregation.resx @@ -165,6 +165,9 @@ True + + True + True diff --git a/unimarc/unimarc/납품관리/Order_Send_Chk.Designer.cs b/unimarc/unimarc/납품관리/Order_Send_Chk.Designer.cs index 7799583..70b9d5c 100644 --- a/unimarc/unimarc/납품관리/Order_Send_Chk.Designer.cs +++ b/unimarc/unimarc/납품관리/Order_Send_Chk.Designer.cs @@ -30,8 +30,8 @@ namespace WindowsFormsApp1.납품관리 private void InitializeComponent() { System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.tb_pur = new System.Windows.Forms.TextBox(); this.Start_DatePicker = new System.Windows.Forms.DateTimePicker(); @@ -42,14 +42,6 @@ namespace WindowsFormsApp1.납품관리 this.btn_Lookup = new System.Windows.Forms.Button(); this.btn_Close = new System.Windows.Forms.Button(); this.dataGrid_Fax = new System.Windows.Forms.DataGridView(); - this.dataGrid_Email = new System.Windows.Forms.DataGridView(); - this.m_clt = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.m_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.m_time = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.m_sender = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.m_taker = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.m_filename = new System.Windows.Forms.DataGridViewButtonColumn(); - this.m_sendres = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.FaxKey = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.f_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.f_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -59,6 +51,14 @@ namespace WindowsFormsApp1.납품관리 this.f_page2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.f_filename = new System.Windows.Forms.DataGridViewButtonColumn(); this.f_res = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGrid_Email = new System.Windows.Forms.DataGridView(); + this.m_clt = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.m_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.m_time = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.m_sender = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.m_taker = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.m_filename = new System.Windows.Forms.DataGridViewButtonColumn(); + this.m_sendres = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGrid_Fax)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGrid_Email)).BeginInit(); @@ -182,6 +182,60 @@ namespace WindowsFormsApp1.납품관리 this.dataGrid_Fax.TabIndex = 2; this.dataGrid_Fax.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_Email_CellContentClick); // + // FaxKey + // + this.FaxKey.HeaderText = "FaxKey"; + this.FaxKey.Name = "FaxKey"; + this.FaxKey.Visible = false; + // + // f_comp + // + this.f_comp.HeaderText = "수신자회사명"; + this.f_comp.Name = "f_comp"; + this.f_comp.Width = 150; + // + // f_num + // + this.f_num.HeaderText = "수신번호"; + this.f_num.Name = "f_num"; + // + // f_date + // + this.f_date.HeaderText = "전송일시"; + this.f_date.Name = "f_date"; + // + // f_state + // + this.f_state.HeaderText = "전송상태"; + this.f_state.Name = "f_state"; + // + // f_page1 + // + this.f_page1.HeaderText = "Page"; + this.f_page1.Name = "f_page1"; + this.f_page1.Width = 80; + // + // f_page2 + // + this.f_page2.HeaderText = "Page"; + this.f_page2.Name = "f_page2"; + this.f_page2.Width = 80; + // + // f_filename + // + this.f_filename.HeaderText = "전송파일명"; + this.f_filename.Name = "f_filename"; + this.f_filename.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.f_filename.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.f_filename.Width = 150; + // + // f_res + // + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.f_res.DefaultCellStyle = dataGridViewCellStyle2; + this.f_res.HeaderText = "전송결과"; + this.f_res.Name = "f_res"; + // // dataGrid_Email // this.dataGrid_Email.AllowUserToAddRows = false; @@ -253,60 +307,6 @@ namespace WindowsFormsApp1.납품관리 this.m_sendres.HeaderText = "전송결과"; this.m_sendres.Name = "m_sendres"; // - // FaxKey - // - this.FaxKey.HeaderText = "FaxKey"; - this.FaxKey.Name = "FaxKey"; - this.FaxKey.Visible = false; - // - // f_comp - // - this.f_comp.HeaderText = "수신자회사명"; - this.f_comp.Name = "f_comp"; - this.f_comp.Width = 150; - // - // f_num - // - this.f_num.HeaderText = "수신번호"; - this.f_num.Name = "f_num"; - // - // f_date - // - this.f_date.HeaderText = "전송일시"; - this.f_date.Name = "f_date"; - // - // f_state - // - this.f_state.HeaderText = "전송상태"; - this.f_state.Name = "f_state"; - // - // f_page1 - // - this.f_page1.HeaderText = "Page"; - this.f_page1.Name = "f_page1"; - this.f_page1.Width = 80; - // - // f_page2 - // - this.f_page2.HeaderText = "Page"; - this.f_page2.Name = "f_page2"; - this.f_page2.Width = 80; - // - // f_filename - // - this.f_filename.HeaderText = "전송파일명"; - this.f_filename.Name = "f_filename"; - this.f_filename.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.f_filename.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.f_filename.Width = 150; - // - // f_res - // - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.f_res.DefaultCellStyle = dataGridViewCellStyle2; - this.f_res.HeaderText = "전송결과"; - this.f_res.Name = "f_res"; - // // Order_Send_Chk // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -318,7 +318,6 @@ namespace WindowsFormsApp1.납품관리 this.Controls.Add(this.panel1); this.Controls.Add(this.dataGrid_Fax); this.Name = "Order_Send_Chk"; - this.Text = "Order_Send_Chk"; this.Load += new System.EventHandler(this.Order_Send_Chk_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); diff --git a/unimarc/unimarc/납품관리/Order_Send_Chk.cs b/unimarc/unimarc/납품관리/Order_Send_Chk.cs index d4f4f18..5be58a2 100644 --- a/unimarc/unimarc/납품관리/Order_Send_Chk.cs +++ b/unimarc/unimarc/납품관리/Order_Send_Chk.cs @@ -65,12 +65,14 @@ namespace WindowsFormsApp1.납품관리 switch(oi.cb_ordersend.SelectedIndex) { case 0: + this.Text = "팩스 전송현황"; dataGrid_Email.Enabled = false; dataGrid_Email.Visible = false; Fax_Grid(data); break; case 1: + this.Text = "메일 전송현황"; dataGrid_Fax.Enabled = false; dataGrid_Fax.Visible = false; Email_Grid(data); diff --git a/unimarc/unimarc/납품관리/Order_input.Designer.cs b/unimarc/unimarc/납품관리/Order_input.Designer.cs index 9cc18e2..064fe05 100644 --- a/unimarc/unimarc/납품관리/Order_input.Designer.cs +++ b/unimarc/unimarc/납품관리/Order_input.Designer.cs @@ -66,17 +66,6 @@ this.btn_order_list_change = new System.Windows.Forms.Button(); this.btn_order_chk = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.panel1 = new System.Windows.Forms.Panel(); - this.label14 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.tb_search_book_comp = new System.Windows.Forms.TextBox(); - this.tb_search_book_name = new System.Windows.Forms.TextBox(); - this.panel2 = new System.Windows.Forms.Panel(); - this.tb_search_book_list = new System.Windows.Forms.TextBox(); - this.btn_order_empty = new System.Windows.Forms.Button(); - this.btn_close = new System.Windows.Forms.Button(); - this.btn_Excel = new System.Windows.Forms.Button(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.chk = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.order = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.M = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -94,6 +83,17 @@ this.send_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label14 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.tb_search_book_comp = new System.Windows.Forms.TextBox(); + this.tb_search_book_name = new System.Windows.Forms.TextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.tb_search_book_list = new System.Windows.Forms.TextBox(); + this.btn_order_empty = new System.Windows.Forms.Button(); + this.btn_close = new System.Windows.Forms.Button(); + this.btn_Excel = new System.Windows.Forms.Button(); + this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -473,6 +473,106 @@ this.dataGridView1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridView1_DataError); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // + // chk + // + this.chk.HeaderText = "주문선택"; + this.chk.Name = "chk"; + this.chk.Width = 60; + // + // order + // + this.order.HeaderText = "주문처"; + this.order.Name = "order"; + this.order.Width = 80; + // + // M + // + this.M.HeaderText = "M"; + this.M.Name = "M"; + this.M.Width = 25; + // + // isbn + // + this.isbn.HeaderText = "ISBN13"; + this.isbn.Name = "isbn"; + // + // book_name + // + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + this.book_name.Width = 200; + // + // author + // + this.author.HeaderText = "저자"; + this.author.Name = "author"; + this.author.Width = 80; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + // + // order_count + // + this.order_count.HeaderText = "주문\n수"; + this.order_count.Name = "order_count"; + this.order_count.Width = 50; + // + // count + // + this.count.HeaderText = "원주\n문"; + this.count.Name = "count"; + this.count.Width = 50; + // + // pay + // + this.pay.HeaderText = "정가"; + this.pay.Name = "pay"; + this.pay.Width = 80; + // + // total + // + this.total.HeaderText = "합계"; + this.total.Name = "total"; + this.total.Width = 75; + // + // etc + // + this.etc.HeaderText = "비 고"; + this.etc.Name = "etc"; + // + // list_name + // + this.list_name.HeaderText = "구분"; + this.list_name.Name = "list_name"; + this.list_name.Width = 80; + // + // order_date + // + this.order_date.HeaderText = "주문일자"; + this.order_date.Name = "order_date"; + this.order_date.Width = 80; + // + // send_date + // + this.send_date.HeaderText = "송금일자"; + this.send_date.Name = "send_date"; + this.send_date.Visible = false; + this.send_date.Width = 80; + // + // num + // + this.num.HeaderText = "번호"; + this.num.Name = "num"; + this.num.Width = 50; + // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; + // // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -585,106 +685,6 @@ this.btn_Excel.UseVisualStyleBackColor = true; this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click); // - // chk - // - this.chk.HeaderText = "주문선택"; - this.chk.Name = "chk"; - this.chk.Width = 60; - // - // order - // - this.order.HeaderText = "주문처"; - this.order.Name = "order"; - this.order.Width = 80; - // - // M - // - this.M.HeaderText = "M"; - this.M.Name = "M"; - this.M.Width = 25; - // - // isbn - // - this.isbn.HeaderText = "ISBN13"; - this.isbn.Name = "isbn"; - // - // book_name - // - this.book_name.HeaderText = "도서명"; - this.book_name.Name = "book_name"; - this.book_name.Width = 200; - // - // author - // - this.author.HeaderText = "저자"; - this.author.Name = "author"; - this.author.Width = 80; - // - // book_comp - // - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - // - // order_count - // - this.order_count.HeaderText = "주문\n수"; - this.order_count.Name = "order_count"; - this.order_count.Width = 50; - // - // count - // - this.count.HeaderText = "원주\n문"; - this.count.Name = "count"; - this.count.Width = 50; - // - // pay - // - this.pay.HeaderText = "정가"; - this.pay.Name = "pay"; - this.pay.Width = 80; - // - // total - // - this.total.HeaderText = "합계"; - this.total.Name = "total"; - this.total.Width = 75; - // - // etc - // - this.etc.HeaderText = "비 고"; - this.etc.Name = "etc"; - // - // list_name - // - this.list_name.HeaderText = "구분"; - this.list_name.Name = "list_name"; - this.list_name.Width = 80; - // - // order_date - // - this.order_date.HeaderText = "주문일자"; - this.order_date.Name = "order_date"; - this.order_date.Width = 80; - // - // send_date - // - this.send_date.HeaderText = "송금일자"; - this.send_date.Name = "send_date"; - this.send_date.Visible = false; - this.send_date.Width = 80; - // - // num - // - this.num.HeaderText = "번호"; - this.num.Name = "num"; - this.num.Width = 50; - // - // idx - // - this.idx.HeaderText = "idx"; - this.idx.Name = "idx"; - this.idx.Visible = false; - // // Order_input // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/unimarc/unimarc/납품관리/Order_input.cs b/unimarc/unimarc/납품관리/Order_input.cs index d779905..a507114 100644 --- a/unimarc/unimarc/납품관리/Order_input.cs +++ b/unimarc/unimarc/납품관리/Order_input.cs @@ -55,7 +55,7 @@ namespace WindowsFormsApp1.Delivery if (a == user_name.Length - 1) { break; } cb_user.Items.Add(user_name[a]); } - cb_user.SelectedIndex = 0; + cb_user.SelectedItem = main.toolStripLabel1.Text; // 상태 구분 string[] state = { "미입고", "입고", "전체" }; @@ -558,6 +558,7 @@ namespace WindowsFormsApp1.Delivery string tmp_db = db.DB_Select_Search(sender_Area, "Comp", "idx", compidx); string[] arr_db = tmp_db.Split('|'); + string sender = arr_db[0]; // 받는 이 : 메일 string taker_Area = "`email`"; @@ -586,8 +587,10 @@ namespace WindowsFormsApp1.Delivery string Date = DateTime.Now.ToString("yyyy-MM-dd"); string Time = DateTime.Now.ToString("HH:mm"); + filePath += string.Format("\\{0}", filename); + Email email = new Email(); - if (email.Send_mail(compidx, pur, filePath, m_send)) + if (email.cross_mail(compidx, filePath, m_send)) { string[] col_Name = { "compidx", "구분", "거래처명", "날짜", "시간", "보낸이", "받는이", "전송파일명", "전송결과" }; string[] set_Data = { compidx, "메일", pur, Date, Time, arr_db[0], m_send, filename, "성공" }; diff --git a/unimarc/unimarc/납품관리/Purchase.Designer.cs b/unimarc/unimarc/납품관리/Purchase.Designer.cs index 099808e..09aa2ec 100644 --- a/unimarc/unimarc/납품관리/Purchase.Designer.cs +++ b/unimarc/unimarc/납품관리/Purchase.Designer.cs @@ -103,7 +103,7 @@ this.isbn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Date = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridView3 = new System.Windows.Forms.DataGridView(); - this.num3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.isbn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.count3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_comp3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -115,14 +115,14 @@ this.list_name3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Order3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Date3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.isbn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.num3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel3 = new System.Windows.Forms.Panel(); + this.load_tmplist = new System.Windows.Forms.Button(); this.lbl_pay = new System.Windows.Forms.Label(); this.lbl_total3 = new System.Windows.Forms.Label(); this.lbl_grid3 = new System.Windows.Forms.Label(); this.lbl_inven_count = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); - this.load_tmplist = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -770,7 +770,7 @@ dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridView3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.dataGridView3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.num3, + this.isbn3, this.count3, this.book_name3, this.book_comp3, @@ -782,7 +782,7 @@ this.list_name3, this.Order3, this.Date3, - this.isbn3}); + this.num3}); this.dataGridView3.Location = new System.Drawing.Point(9, 455); this.dataGridView3.MultiSelect = false; this.dataGridView3.Name = "dataGridView3"; @@ -797,17 +797,14 @@ this.dataGridView3.RowHeadersWidth = 21; this.dataGridView3.RowTemplate.Height = 23; this.dataGridView3.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.dataGridView3.Size = new System.Drawing.Size(924, 117); + this.dataGridView3.Size = new System.Drawing.Size(961, 117); this.dataGridView3.TabIndex = 0; - this.dataGridView3.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView3_CellClick); this.dataGridView3.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView3_CellValueChanged); - this.dataGridView3.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView3_KeyDown); // - // num3 + // isbn3 // - this.num3.HeaderText = "번호"; - this.num3.Name = "num3"; - this.num3.Width = 60; + this.isbn3.HeaderText = "isbn"; + this.isbn3.Name = "isbn3"; // // count3 // @@ -872,24 +869,36 @@ this.Date3.Name = "Date3"; this.Date3.Visible = false; // - // isbn3 + // num3 // - this.isbn3.HeaderText = "isbn"; - this.isbn3.Name = "isbn3"; - this.isbn3.Visible = false; + this.num3.HeaderText = "번호"; + this.num3.Name = "num3"; + this.num3.Visible = false; + this.num3.Width = 60; // // panel3 // + this.panel3.BackColor = System.Drawing.SystemColors.Info; this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel3.Controls.Add(this.load_tmplist); this.panel3.Controls.Add(this.lbl_pay); this.panel3.Controls.Add(this.lbl_total3); this.panel3.Controls.Add(this.lbl_grid3); - this.panel3.Location = new System.Drawing.Point(939, 455); + this.panel3.Location = new System.Drawing.Point(976, 455); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(156, 117); + this.panel3.Size = new System.Drawing.Size(164, 117); this.panel3.TabIndex = 32; // + // load_tmplist + // + this.load_tmplist.Location = new System.Drawing.Point(11, 81); + this.load_tmplist.Name = "load_tmplist"; + this.load_tmplist.Size = new System.Drawing.Size(75, 23); + this.load_tmplist.TabIndex = 35; + this.load_tmplist.Text = "목록읽기"; + this.load_tmplist.UseVisualStyleBackColor = true; + this.load_tmplist.Click += new System.EventHandler(this.load_tmplist_Click); + // // lbl_pay // this.lbl_pay.AutoSize = true; @@ -943,21 +952,11 @@ this.label14.TabIndex = 34; this.label14.Text = "책 재고 수"; // - // load_tmplist - // - this.load_tmplist.Location = new System.Drawing.Point(11, 81); - this.load_tmplist.Name = "load_tmplist"; - this.load_tmplist.Size = new System.Drawing.Size(75, 23); - this.load_tmplist.TabIndex = 35; - this.load_tmplist.Text = "목록읽기"; - this.load_tmplist.UseVisualStyleBackColor = true; - this.load_tmplist.Click += new System.EventHandler(this.load_tmplist_Click); - // // Purchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1210, 580); + this.ClientSize = new System.Drawing.Size(1213, 580); this.Controls.Add(this.label14); this.Controls.Add(this.lbl_inven_count); this.Controls.Add(this.panel3); @@ -1060,19 +1059,6 @@ private System.Windows.Forms.DataGridViewButtonColumn Column13; private System.Windows.Forms.DataGridViewTextBoxColumn isbn2; private System.Windows.Forms.DataGridViewTextBoxColumn Date; - private System.Windows.Forms.DataGridViewTextBoxColumn num3; - private System.Windows.Forms.DataGridViewTextBoxColumn count3; - private System.Windows.Forms.DataGridViewTextBoxColumn book_name3; - private System.Windows.Forms.DataGridViewTextBoxColumn book_comp3; - private System.Windows.Forms.DataGridViewTextBoxColumn author3; - private System.Windows.Forms.DataGridViewTextBoxColumn pay3; - private System.Windows.Forms.DataGridViewTextBoxColumn persent; - private System.Windows.Forms.DataGridViewTextBoxColumn total3; - private System.Windows.Forms.DataGridViewTextBoxColumn etc3; - private System.Windows.Forms.DataGridViewTextBoxColumn list_name3; - private System.Windows.Forms.DataGridViewTextBoxColumn Order3; - private System.Windows.Forms.DataGridViewTextBoxColumn Date3; - private System.Windows.Forms.DataGridViewTextBoxColumn isbn3; private System.Windows.Forms.Label lbl_inven_count; private System.Windows.Forms.DataGridViewTextBoxColumn num; private System.Windows.Forms.DataGridViewTextBoxColumn count; @@ -1089,5 +1075,18 @@ private System.Windows.Forms.DataGridViewTextBoxColumn order_date; private System.Windows.Forms.Label label14; private System.Windows.Forms.Button load_tmplist; + private System.Windows.Forms.DataGridViewTextBoxColumn isbn3; + private System.Windows.Forms.DataGridViewTextBoxColumn count3; + private System.Windows.Forms.DataGridViewTextBoxColumn book_name3; + private System.Windows.Forms.DataGridViewTextBoxColumn book_comp3; + private System.Windows.Forms.DataGridViewTextBoxColumn author3; + private System.Windows.Forms.DataGridViewTextBoxColumn pay3; + private System.Windows.Forms.DataGridViewTextBoxColumn persent; + private System.Windows.Forms.DataGridViewTextBoxColumn total3; + private System.Windows.Forms.DataGridViewTextBoxColumn etc3; + private System.Windows.Forms.DataGridViewTextBoxColumn list_name3; + private System.Windows.Forms.DataGridViewTextBoxColumn Order3; + private System.Windows.Forms.DataGridViewTextBoxColumn Date3; + private System.Windows.Forms.DataGridViewTextBoxColumn num3; } } \ No newline at end of file diff --git a/unimarc/unimarc/납품관리/Purchase.cs b/unimarc/unimarc/납품관리/Purchase.cs index bc27db7..acf7957 100644 --- a/unimarc/unimarc/납품관리/Purchase.cs +++ b/unimarc/unimarc/납품관리/Purchase.cs @@ -21,7 +21,6 @@ namespace WindowsFormsApp1.Delivery public string compidx; public int grididx; bool chk_inven = false; - int grid3Row = 0; public Purchase(Main _main) { InitializeComponent(); @@ -50,8 +49,10 @@ namespace WindowsFormsApp1.Delivery { if (e.KeyCode == Keys.Enter) { if (((TextBox)sender).Name == "tb_clt") { - Commodity_Search sea = new Commodity_Search(this); - sea.Clinet_name = tb_clt.Text; + Commodity_Search sea = new Commodity_Search(this) + { + Clinet_name = tb_clt.Text + }; sea.Show(); } else { @@ -103,6 +104,9 @@ namespace WindowsFormsApp1.Delivery if (dataGridView1.Rows.Count == 1) { dataGridView1_CellDoubleClick(null, null); } + else { + dataGridView1.Focus(); + } } else if (Name == "tb_book_name") { string tmp_db = db.DB_Contains("Obj_List_Book", compidx, "book_name", Text, Area, "import", "미입고"); @@ -170,11 +174,14 @@ namespace WindowsFormsApp1.Delivery private void Grid3_Book_Count() { double result = 0; - for(int a= 0; a < dataGridView3.Rows.Count-1; a++) + for (int a = 0; a < dataGridView3.Rows.Count - 1; a++) { if (dataGridView3.Rows[a].IsNewRow == true) { return; } - if (dataGridView3.Rows[a].Cells["total3"].Value != null || - dataGridView3.Rows[a].Cells["total3"].Value.ToString() != "") { + if (dataGridView3.Rows[a].Cells["total3"].Value == null || + dataGridView3.Rows[a].Cells["total3"].Value.ToString() == "") { + return; + } + else { result += Convert.ToDouble(dataGridView3.Rows[a].Cells["total3"].Value.ToString()); } } @@ -228,18 +235,15 @@ namespace WindowsFormsApp1.Delivery bl.Lookup_Load(book_name, author, book_comp, list_name); bl.Show(); } - // 로컬파일 생성. (C:\) - create_TempTxt(); } private void create_TempTxt() { - //FileInfo file = new FileInfo(Application.StartupPath + "\\temp\\temp.txt"); - DirectoryInfo di = new DirectoryInfo("C:\\unimarc"); - if (di.Exists == false) + DirectoryInfo di = new DirectoryInfo(Application.StartupPath+"\\temp"); + if (!di.Exists) { di.Create(); } - FileInfo file = new FileInfo("C:\\unimarc\\temp.txt"); + FileInfo file = new FileInfo(Application.StartupPath + "\\temp\\temp.txt"); FileStream fs; if (!file.Exists) { // 해당 파일이 없을 경우 생성하고 파일 닫기 fs = file.Create(); @@ -279,7 +283,7 @@ namespace WindowsFormsApp1.Delivery open.Filter = "텍스트 파일 (*.txt)|*.txt|모든 파일(*.*)|*.*"; string file_con = null; - string file_path = "C:\\unimarc\\temp.txt"; + string file_path = Application.StartupPath + "\\unimarc\\temp.txt"; if (File.Exists(file_path)) { @@ -398,15 +402,15 @@ namespace WindowsFormsApp1.Delivery Grid2Count(grid2, row, col); // 책 중복시 Grid3_Pay_Count(grid2[9]); - grid3[0] = dataGridView1.Rows[row].Cells[0].Value.ToString(); + grid3[0] = dataGridView1.Rows[row].Cells["isbn"].Value.ToString(); grid3[1] = "1"; - grid3[2] = dataGridView1.Rows[row].Cells[2].Value.ToString(); - grid3[3] = dataGridView1.Rows[row].Cells[3].Value.ToString(); - grid3[4] = dataGridView1.Rows[row].Cells[4].Value.ToString(); + grid3[2] = dataGridView1.Rows[row].Cells["book_name"].Value.ToString(); + grid3[3] = dataGridView1.Rows[row].Cells["book_comp"].Value.ToString(); + grid3[4] = dataGridView1.Rows[row].Cells["author"].Value.ToString(); - string isbn_chk = dataGridView1.Rows[row].Cells[11].Value.ToString().Replace("\r", string.Empty); - grid3[5] = dataGridView1.Rows[row].Cells[5].Value.ToString(); - grid3[8] = dataGridView1.Rows[row].Cells[8].Value.ToString(); + string isbn_chk = dataGridView1.Rows[row].Cells["isbn"].Value.ToString().Replace("\r", string.Empty); + grid3[5] = dataGridView1.Rows[row].Cells["pay"].Value.ToString(); + grid3[8] = dataGridView1.Rows[row].Cells["etc"].Value.ToString(); if (chk_stock.Checked == true) { if (stock_chk(isbn_chk) == true) { @@ -415,7 +419,7 @@ namespace WindowsFormsApp1.Delivery if (lbl_inven_count.Text == "0") { lbl_inven_count.Text = "0"; inven_count = 0; - grid3[5] = dataGridView1.Rows[row].Cells[5].Value.ToString(); + grid3[5] = dataGridView1.Rows[row].Cells["pay"].Value.ToString(); } if (inven_count > 0) { if (lbl_inven_count.Text != "-1") { inven_count = Convert.ToInt32(lbl_inven_count.Text); } @@ -434,9 +438,9 @@ namespace WindowsFormsApp1.Delivery double total = pay * persent * 0.01 * count; grid3[7] = total.ToString(); - grid3[9] = dataGridView1.Rows[row].Cells[7].Value.ToString(); - grid3[10] = dataGridView1.Rows[row].Cells[9].Value.ToString(); - grid3[12] = dataGridView1.Rows[row].Cells[11].Value.ToString(); + grid3[9] = dataGridView1.Rows[row].Cells["list_name"].Value.ToString(); + grid3[10] = dataGridView1.Rows[row].Cells["order"].Value.ToString(); + grid3[12] = dataGridView1.Rows[row].Cells["num"].Value.ToString(); Grid3Count(grid3, row, col); @@ -494,13 +498,13 @@ namespace WindowsFormsApp1.Delivery Grid2_Book_Count(); return; } - for(int a = 0; a < rowCount; a++) + for (int a = 0; a < rowCount; a++) { // 2: 도서명 / 3: 출판사 / 4: 저자 / 7: 구분 - if (mkgrid[2] == dataGridView2.Rows[a].Cells[2].Value.ToString() && - mkgrid[3] == dataGridView2.Rows[a].Cells[3].Value.ToString() && - mkgrid[4] == dataGridView2.Rows[a].Cells[4].Value.ToString() && - mkgrid[7] == dataGridView2.Rows[a].Cells[7].Value.ToString()) { + if (mkgrid[2] == dataGridView2.Rows[a].Cells["Book_name2"].Value.ToString() && + mkgrid[3] == dataGridView2.Rows[a].Cells["Book_comp2"].Value.ToString() && + mkgrid[4] == dataGridView2.Rows[a].Cells["author2"].Value.ToString() && + mkgrid[7] == dataGridView2.Rows[a].Cells["list_name2"].Value.ToString()) { string invenCount_tmp = dataGridView2.Rows[a].Cells[1].Value.ToString(); int invenCount = Convert.ToInt32(invenCount_tmp); @@ -509,8 +513,8 @@ namespace WindowsFormsApp1.Delivery int money = Convert.ToInt32(mkgrid[5]); int totaltmp = invenCount * money; mkgrid[6] = totaltmp.ToString(); - dataGridView2.Rows[a].Cells[1].Value = invenCount.ToString(); - dataGridView2.Rows[a].Cells[6].Value = mkgrid[6]; + dataGridView2.Rows[a].Cells["count2"].Value = invenCount.ToString(); + dataGridView2.Rows[a].Cells["total2"].Value = mkgrid[6]; break; } } @@ -531,13 +535,13 @@ namespace WindowsFormsApp1.Delivery for(int a = 0; a < rowCount; a++) { // 0:번호 / 2:도서명 / 3:출판사 / 4:저자 / 5:정가 / 6:매입율 - if (grid[2] == dataGridView3.Rows[a].Cells[2].Value.ToString() && - grid[3] == dataGridView3.Rows[a].Cells[3].Value.ToString() && - grid[4] == dataGridView3.Rows[a].Cells[4].Value.ToString() && - grid[5] == dataGridView3.Rows[a].Cells[5].Value.ToString() && - grid[6] == dataGridView3.Rows[a].Cells[6].Value.ToString()) { + if (grid[2] == dataGridView3.Rows[a].Cells["book_name3"].Value.ToString() && + grid[3] == dataGridView3.Rows[a].Cells["book_comp3"].Value.ToString() && + grid[4] == dataGridView3.Rows[a].Cells["author3"].Value.ToString() && + grid[5] == dataGridView3.Rows[a].Cells["pay3"].Value.ToString() && + grid[6] == dataGridView3.Rows[a].Cells["persent"].Value.ToString()) { - string invenCount_tmp = dataGridView3.Rows[a].Cells[1].Value.ToString(); + string invenCount_tmp = dataGridView3.Rows[a].Cells["count3"].Value.ToString(); int invenCount = Convert.ToInt32(invenCount_tmp); invenCount++; chk = true; @@ -545,8 +549,8 @@ namespace WindowsFormsApp1.Delivery int persent = Convert.ToInt32(grid[6]); double total = pay * persent * 0.01 * invenCount; grid[7] = total.ToString(); - dataGridView3.Rows[a].Cells[1].Value = invenCount.ToString(); - dataGridView3.Rows[a].Cells[7].Value = grid[7]; + dataGridView3.Rows[a].Cells["count3"].Value = invenCount.ToString(); + dataGridView3.Rows[a].Cells["total3"].Value = grid[7]; break; } @@ -588,12 +592,12 @@ namespace WindowsFormsApp1.Delivery { input_data[a] = db_data[a]; - if (a == 3) input_data[a] = data.ToString(); + if (a == 7) input_data[a] = data.ToString(); } // Inven테이블내 데이터중복체크 - string[] chk_Table = { "book_name", "author", "book_comp", "isbn" }; - string[] chk_Data = { db_data[4], db_data[5], db_data[6], db_data[12] }; + string[] chk_Table = { "compidx", "isbn" }; + string[] chk_Data = { compidx, db_data[12] }; string chk = db.More_DB_Search("Inven", chk_Table, chk_Data); // 중복데이터가 검색되지않음. @@ -603,9 +607,9 @@ namespace WindowsFormsApp1.Delivery return; } else { - string count_tmp = db.More_DB_Search("Inven", Where_Table, Search_Data, "`count`, `idx`"); + string count_tmp = db.More_DB_Search("Inven", chk_Table, chk_Data, "`count`, `idx`"); string[] cout = count_tmp.Split('|'); - int count = Convert.ToInt32(cout[1]); + int count = Convert.ToInt32(cout[0]); count += data; MessageBox.Show("DB 수정"); db.DB_Update("Inven", "count", count.ToString(), "idx", cout[0]); @@ -670,7 +674,7 @@ namespace WindowsFormsApp1.Delivery * (재고1, 입고필요수량3 일 경우 재고는 사라지고, 매입원장에 2권분량의 값이 들어가야함.) */ save_grid2(); - save_grid3(); + //save_grid3(); input_ledger(); } /// @@ -678,10 +682,10 @@ namespace WindowsFormsApp1.Delivery /// private void input_ledger() // 무조건 INSERT문이 들어가게 됨. { - // 회사인덱스번호 거래처명 매입일자 내용(도서명) 수량 - string[] Area = {"compidx", "purchase", "buy_date", "book_name", "count", - // 입고율 매입금액 결제금액 현잔액 비고 - "persent", "buy_money", "payment", "remain", "etc" }; + // 회사인덱스번호 거래처명 매입일자 내용(도서명) 수량 + string[] Area = { "compidx", "purchase", "buy_date", "book_name", "count", + // 입고율 매입금액 결제금액 현잔액 비고 + "persent", "buy_money", "payment", "remain", "etc" }; for (int a = 0; a < dataGridView3.Rows.Count - 1; a++) { @@ -802,88 +806,76 @@ namespace WindowsFormsApp1.Delivery string result = change; int i_ori = Convert.ToInt32(ori); int i_change = Convert.ToInt32(change); - if(i_ori < i_change) { + if (i_ori < i_change) { int i_result = i_change - i_ori; input_Inven(i_result, count); return ori; } - return result; - } - /// - /// 재고 입력함수 - /// - private void save_grid3() - { - for(int a = 0; a < dataGridView3.Rows.Count - 1; a++) - { - string[] Search_Col = { "list_name", "book_name", "author", "book_comp" }; - string[] Search_Data = { dataGridView3.Rows[a].Cells["list_name3"].Value.ToString(), - dataGridView3.Rows[a].Cells["book_name3"].Value.ToString(), - dataGridView3.Rows[a].Cells["author3"].Value.ToString(), - dataGridView3.Rows[a].Cells["book_comp3"].Value.ToString() }; - string copy_chk = db.More_DB_Search("Inven", Search_Col, Search_Data); - - // insert용 배열 - string[] insert_Col = { "list_name", "book_name", "author", "book_comp", "count", - "pay", "total", "etc" }; - string[] insert_Data = { dataGridView3.Rows[a].Cells["list_name3"].Value.ToString(), - dataGridView3.Rows[a].Cells["book_name3"].Value.ToString(), - dataGridView3.Rows[a].Cells["author3"].Value.ToString(), - dataGridView3.Rows[a].Cells["book_comp3"].Value.ToString(), - // dataGridView3.Rows[a].Cells["count3"].Value.ToString(), - 1.ToString(), - dataGridView3.Rows[a].Cells["pay3"].Value.ToString(), - dataGridView3.Rows[a].Cells["total3"].Value.ToString(), - dataGridView3.Rows[a].Cells["etc3"].Value.ToString() }; - - if(copy_chk.Length < 3) { // 중복없음 INSERT - db.DB_INSERT("Inven", insert_Col, insert_Data); - } - else { // 중복 UPDATE - db.More_Update("Inven", insert_Col, insert_Data, Search_Col, Search_Data); - } + else if (i_ori > i_change) { + // 비고로 부족한 수량이 들어가야함 } - } - private void dataGridView3_CellClick(object sender, DataGridViewCellEventArgs e) - { - grid3Row = e.RowIndex; - } - private void dataGridView3_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Up) { grid3Row--; } - if (e.KeyCode == Keys.Down) { grid3Row++; } + return result; } private void dataGridView3_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - if(dataGridView3.CurrentCell != null) + if (dataGridView3.CurrentCell != null) { - if (((DataGridView)sender).CurrentCell.ColumnIndex == 6) + string current = ((DataGridView)sender).Columns[e.ColumnIndex].Name; + if (current == "count3" || current == "pay3" || current == "persent") { int count = 0; int pay = 0; int persent = 0; - if(((DataGridView)sender).Rows[grid3Row].Cells[1].Value != null) { - count = Convert.ToInt32(((DataGridView)sender).Rows[e.RowIndex].Cells[1].Value.ToString()); + if (((DataGridView)sender).Rows[e.RowIndex].Cells["count3"].Value != null) { + count = Convert.ToInt32(((DataGridView)sender).Rows[e.RowIndex].Cells["count3"].Value.ToString()); } - if(((DataGridView)sender).Rows[grid3Row].Cells[5].Value != null) { - pay = Convert.ToInt32(((DataGridView)sender).Rows[e.RowIndex].Cells[5].Value.ToString()); + if (((DataGridView)sender).Rows[e.RowIndex].Cells["pay3"].Value != null) { + pay = Convert.ToInt32(((DataGridView)sender).Rows[e.RowIndex].Cells["pay3"].Value.ToString()); } - if(((DataGridView)sender).Rows[grid3Row].Cells[6].Value != null) { - persent = Convert.ToInt32(((DataGridView)sender).Rows[e.RowIndex].Cells[6].Value.ToString()); + if (((DataGridView)sender).Rows[e.RowIndex].Cells["persent"].Value != null) { + persent = Convert.ToInt32(((DataGridView)sender).Rows[e.RowIndex].Cells["persent"].Value.ToString()); } double result = pay * persent * 0.01 * count; - ((DataGridView)sender).Rows[grid3Row].Cells[7].Value = Math.Round(result); + ((DataGridView)sender).Rows[e.RowIndex].Cells["total3"].Value = Math.Round(result); } - //Grid3_Book_Count(); + if (current == "isbn3") { + // ISBN 찍으면 도서명 출판사 저자 정가가 출력되어야 함. (수량은 1고정) + string isbn_str = ((DataGridView)sender).Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString(); + if (isbn_str.Length == 13 || isbn_str.Length == 10) + ISBN_LookUp_By_Aladin(isbn_str, e.RowIndex, (DataGridView)sender); + else { return; } + } + Grid3_Book_Count(); } } + #region Sub + private void ISBN_LookUp_By_Aladin(string isbn, int row, DataGridView datagrid) + { + string[] param = { "title", "publisher", "author", "priceStandard" }; + API api = new API(); + string aladin = api.Aladin(isbn, "ISBN13", param); + + string[] insert = aladin.Split('|'); + if (insert.Length < 2) { return; }; + + datagrid.Rows[row].Cells["book_name3"].Value = insert[0]; + datagrid.Rows[row].Cells["book_comp3"].Value = insert[1]; + datagrid.Rows[row].Cells["author3"].Value = insert[2]; + datagrid.Rows[row].Cells["pay3"].Value = insert[3]; + datagrid.Rows[row].Cells["count3"].Value = "1"; + datagrid.Rows[row].Cells["persent"].Value = tb_persent.Text; + } + #endregion private void dataGridView1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) { dataGridView1.CurrentCell.Style.SelectionBackColor = Color.Orange; } private void Purchase_FormClosing(object sender, FormClosingEventArgs e) { - if(MessageBox.Show("이대로 닫으시겠습니까?", "경고", MessageBoxButtons.YesNo) == DialogResult.No) { + if (MessageBox.Show("이대로 닫으시겠습니까?", "경고", MessageBoxButtons.YesNo) == DialogResult.No) + { + // 로컬파일 생성. (C:\) + create_TempTxt(); e.Cancel = true; } } diff --git a/unimarc/unimarc/납품관리/Purchase.resx b/unimarc/unimarc/납품관리/Purchase.resx index a9c5ad1..f59655f 100644 --- a/unimarc/unimarc/납품관리/Purchase.resx +++ b/unimarc/unimarc/납품관리/Purchase.resx @@ -195,7 +195,7 @@ True - + True @@ -231,7 +231,7 @@ True - + True \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_ISBN_Yes24.cs b/unimarc/unimarc/마크/Check_ISBN_Yes24.cs index bde56f2..7e6f5b5 100644 --- a/unimarc/unimarc/마크/Check_ISBN_Yes24.cs +++ b/unimarc/unimarc/마크/Check_ISBN_Yes24.cs @@ -13,6 +13,7 @@ using WindowsFormsApp1; using WindowsFormsApp1.Mac; using Excel = Microsoft.Office.Interop.Excel; using System.Reflection; +using System.Text.RegularExpressions; namespace UniMarc.마크 { @@ -115,14 +116,16 @@ namespace UniMarc.마크 private void btn_change_Click(object sender, EventArgs e) { - string[,] grid = new string[dataGridView1.Rows.Count, 5]; + string[,] grid = new string[dataGridView1.Rows.Count, 6]; for(int a= 0; a < dataGridView1.Rows.Count; a++) { int count = a + 1; + string price = dataGridView1.Rows[a].Cells["price"].Value.ToString(); grid[a, 0] = count.ToString(); grid[a, 1] = dataGridView1.Rows[a].Cells["after_book_name"].Value.ToString(); grid[a, 3] = dataGridView1.Rows[a].Cells["after_book_comp"].Value.ToString(); - grid[a, 4] = dataGridView1.Rows[a].Cells["price"].Value.ToString(); + grid[a, 4] = Regex.Replace(price, @"[^0-9]", ""); + grid[a, 5] = "1"; } Excel_change(grid); } @@ -148,16 +151,16 @@ namespace UniMarc.마크 ws.Columns[5].ColumnWidth = 12.57; #endregion - string[] title = { "번호", "도서명", "ISBN", "출판사", "정가" }; + string[] title = { "번호", "도서명", "ISBN", "출판사", "정가", "수량" }; #region 내용 삽입 - rng = ws.Range["A1", "E1"]; + rng = ws.Range["A1", "F1"]; rng.Value2 = title; rng.HorizontalAlignment = Excel.XlHAlign.xlHAlignCenter; rng.Font.Bold = true; int count = dataGridView1.Rows.Count + 1; - rng = ws.Range["A2", "E" + count.ToString()]; + rng = ws.Range["A2", "F" + count.ToString()]; rng.Value2 = grid; rng.HorizontalAlignment = Excel.XlHAlign.xlHAlignCenter; #endregion diff --git a/unimarc/unimarc/홈/Order_manage.cs b/unimarc/unimarc/홈/Order_manage.cs index 0596ce8..d149623 100644 --- a/unimarc/unimarc/홈/Order_manage.cs +++ b/unimarc/unimarc/홈/Order_manage.cs @@ -55,6 +55,8 @@ namespace WindowsFormsApp1.Home string tmpdata = db.DB_Contains("Purchase", main.com_idx, Search_col[0], tb_search.Text, Search_Table, Search_col[1], main.com_idx); Made_Grid(tmpdata); } + grididx = 0; + Fill_textBox(); } private void Made_Grid(string strValue) { @@ -101,6 +103,7 @@ namespace WindowsFormsApp1.Home } void Fill_textBox() { + if (dataGridView1.RowCount <= 0) { return; } btn_Add_Click(null, null); tb_sangho.Text = dataGridView1.Rows[grididx].Cells["sangho"].Value.ToString(); tb_boss.Text = dataGridView1.Rows[grididx].Cells["boss"].Value.ToString(); diff --git a/unimarc/unimarc/홈/Transaction_manage.cs b/unimarc/unimarc/홈/Transaction_manage.cs index 5ffb40c..c94f46d 100644 --- a/unimarc/unimarc/홈/Transaction_manage.cs +++ b/unimarc/unimarc/홈/Transaction_manage.cs @@ -181,6 +181,7 @@ namespace WindowsFormsApp1.Home } } else if(e != null) { grididx = e.RowIndex; } + if (e.RowIndex < 0) { return; } string[] tmp_man = dataGridView1.Rows[grididx].Cells["man"].Value.ToString().Split('|'); tb_boss.Text = dataGridView1.Rows[grididx].Cells["boss"].Value.ToString(); tb_bubin.Text = dataGridView1.Rows[grididx].Cells["bubin"].Value.ToString(); diff --git a/unimarc/unimarc/홈/User_Infor.cs b/unimarc/unimarc/홈/User_Infor.cs index 0e8c4f7..eae1af3 100644 --- a/unimarc/unimarc/홈/User_Infor.cs +++ b/unimarc/unimarc/홈/User_Infor.cs @@ -100,7 +100,7 @@ namespace WindowsFormsApp1.Home private void btn_mailtest_Click(object sender, EventArgs e) { Email mail = new Email(); - mail.Send_Test_mail("글로리아북", tb_email.Text, "테스트 메일입니다", "테스트 메일입니다"); + // mail.Send_Test_mail("글로리아북", tb_email.Text, "테스트 메일입니다", "테스트 메일입니다"); } private void tb_sangho_KeyDown(object sender, KeyEventArgs e) diff --git a/unimarc/unimarc/회계/Remit_reg.Designer.cs b/unimarc/unimarc/회계/Remit_reg.Designer.cs index 258497d..04b523e 100644 --- a/unimarc/unimarc/회계/Remit_reg.Designer.cs +++ b/unimarc/unimarc/회계/Remit_reg.Designer.cs @@ -28,9 +28,21 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.chkbox = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.date_pay = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.purchase = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bank_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bank_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bank_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bank_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.send_money = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label9 = new System.Windows.Forms.Label(); this.start_Date = new System.Windows.Forms.DateTimePicker(); this.end_Date = new System.Windows.Forms.DateTimePicker(); @@ -59,18 +71,7 @@ this.label8 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.tb_etc = new System.Windows.Forms.RichTextBox(); - this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.chkbox = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.date_pay = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.purchase = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bank_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bank_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bank_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bank_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.send_money = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_close = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // @@ -78,14 +79,14 @@ // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, @@ -100,14 +101,14 @@ this.send_money, this.charge, this.etc}); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle4; this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridView1.Location = new System.Drawing.Point(12, 38); this.dataGridView1.Name = "dataGridView1"; @@ -119,6 +120,77 @@ this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dataGridView1.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dataGridView1_CellPainting); // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; + this.idx.Width = 50; + // + // chkbox + // + this.chkbox.HeaderText = ""; + this.chkbox.Name = "chkbox"; + this.chkbox.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.chkbox.Width = 40; + // + // list_date + // + this.list_date.HeaderText = "등록일자"; + this.list_date.Name = "list_date"; + this.list_date.Width = 85; + // + // date_pay + // + this.date_pay.HeaderText = "결제일자"; + this.date_pay.Name = "date_pay"; + this.date_pay.Width = 85; + // + // purchase + // + this.purchase.HeaderText = "거래처"; + this.purchase.Name = "purchase"; + // + // bank_comp + // + this.bank_comp.HeaderText = "은행명"; + this.bank_comp.Name = "bank_comp"; + // + // bank_code + // + this.bank_code.HeaderText = "코드"; + this.bank_code.Name = "bank_code"; + this.bank_code.Width = 40; + // + // bank_num + // + this.bank_num.HeaderText = "계좌번호"; + this.bank_num.Name = "bank_num"; + this.bank_num.Width = 140; + // + // bank_name + // + this.bank_name.HeaderText = "예금주"; + this.bank_name.Name = "bank_name"; + this.bank_name.Width = 70; + // + // send_money + // + this.send_money.HeaderText = "송금금액"; + this.send_money.Name = "send_money"; + // + // charge + // + this.charge.HeaderText = "등록자"; + this.charge.Name = "charge"; + this.charge.Width = 70; + // + // etc + // + this.etc.HeaderText = "비고"; + this.etc.Name = "etc"; + this.etc.Width = 150; + // // label9 // this.label9.AutoSize = true; @@ -365,82 +437,22 @@ this.tb_etc.TabIndex = 34; this.tb_etc.Text = ""; // - // idx + // btn_close // - this.idx.HeaderText = "idx"; - this.idx.Name = "idx"; - this.idx.Visible = false; - this.idx.Width = 50; - // - // chkbox - // - this.chkbox.HeaderText = ""; - this.chkbox.Name = "chkbox"; - this.chkbox.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.chkbox.Width = 40; - // - // list_date - // - this.list_date.HeaderText = "등록일자"; - this.list_date.Name = "list_date"; - this.list_date.Width = 85; - // - // date_pay - // - this.date_pay.HeaderText = "결제일자"; - this.date_pay.Name = "date_pay"; - this.date_pay.Width = 85; - // - // purchase - // - this.purchase.HeaderText = "거래처"; - this.purchase.Name = "purchase"; - // - // bank_comp - // - this.bank_comp.HeaderText = "은행명"; - this.bank_comp.Name = "bank_comp"; - // - // bank_code - // - this.bank_code.HeaderText = "코드"; - this.bank_code.Name = "bank_code"; - this.bank_code.Width = 40; - // - // bank_num - // - this.bank_num.HeaderText = "계좌번호"; - this.bank_num.Name = "bank_num"; - this.bank_num.Width = 140; - // - // bank_name - // - this.bank_name.HeaderText = "예금주"; - this.bank_name.Name = "bank_name"; - this.bank_name.Width = 70; - // - // send_money - // - this.send_money.HeaderText = "송금금액"; - this.send_money.Name = "send_money"; - // - // charge - // - this.charge.HeaderText = "등록자"; - this.charge.Name = "charge"; - this.charge.Width = 70; - // - // etc - // - this.etc.HeaderText = "비고"; - this.etc.Name = "etc"; - this.etc.Width = 150; + this.btn_close.Location = new System.Drawing.Point(741, 9); + this.btn_close.Name = "btn_close"; + this.btn_close.Size = new System.Drawing.Size(75, 23); + this.btn_close.TabIndex = 55; + this.btn_close.Text = "닫 기"; + this.btn_close.UseVisualStyleBackColor = true; + this.btn_close.Click += new System.EventHandler(this.btn_close_Click); // // Remit_reg // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1342, 430); + this.Controls.Add(this.btn_close); this.Controls.Add(this.tb_etc); this.Controls.Add(this.label10); this.Controls.Add(this.label8); @@ -521,5 +533,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn send_money; private System.Windows.Forms.DataGridViewTextBoxColumn charge; private System.Windows.Forms.DataGridViewTextBoxColumn etc; + private System.Windows.Forms.Button btn_close; } } \ No newline at end of file diff --git a/unimarc/unimarc/회계/Remit_reg.cs b/unimarc/unimarc/회계/Remit_reg.cs index c786e28..d9ffb3d 100644 --- a/unimarc/unimarc/회계/Remit_reg.cs +++ b/unimarc/unimarc/회계/Remit_reg.cs @@ -135,8 +135,17 @@ namespace WindowsFormsApp1.Account } private void btn_Excel_Click(object sender, EventArgs e) { - Skill_Grid sg = new Skill_Grid(); - sg.ExportToExcel(dataGridView1); + Excel_text et = new Excel_text(); + // 은행코드 계좌번호 빈칸 금액 예금주 + string[,] inputExcel = new string[dataGridView1.RowCount, 5]; + for (int a = 0; a < dataGridView1.RowCount; a++) + { + inputExcel[a, 0] = dataGridView1.Rows[a].Cells["bank_code"].Value.ToString(); + inputExcel[a, 1] = dataGridView1.Rows[a].Cells["bank_num"].Value.ToString(); + 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); } private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) { @@ -163,5 +172,10 @@ namespace WindowsFormsApp1.Account tb_etc.Text = dataGridView1.Rows[row].Cells["etc"].Value.ToString(); } } + + private void btn_close_Click(object sender, EventArgs e) + { + Close(); + } } } diff --git a/unimarc/unimarc/회계/Remit_reg2.Designer.cs b/unimarc/unimarc/회계/Remit_reg2.Designer.cs index c2dae40..59ab919 100644 --- a/unimarc/unimarc/회계/Remit_reg2.Designer.cs +++ b/unimarc/unimarc/회계/Remit_reg2.Designer.cs @@ -66,6 +66,7 @@ this.label9 = new System.Windows.Forms.Label(); this.list_Date = new System.Windows.Forms.DateTimePicker(); this.label1 = new System.Windows.Forms.Label(); + this.btn_close = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // @@ -211,6 +212,7 @@ this.btn_excel.TabIndex = 16; this.btn_excel.Text = "엑 셀"; this.btn_excel.UseVisualStyleBackColor = true; + this.btn_excel.Click += new System.EventHandler(this.btn_excel_Click); // // btn_save // @@ -386,11 +388,22 @@ this.label1.TabIndex = 32; this.label1.Text = "등록일자"; // + // btn_close + // + this.btn_close.Location = new System.Drawing.Point(755, 223); + this.btn_close.Name = "btn_close"; + this.btn_close.Size = new System.Drawing.Size(75, 23); + this.btn_close.TabIndex = 54; + this.btn_close.Text = "닫 기"; + this.btn_close.UseVisualStyleBackColor = true; + this.btn_close.Click += new System.EventHandler(this.btn_close_Click); + // // Remit_reg2 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(895, 423); + this.Controls.Add(this.btn_close); this.Controls.Add(this.cb_remunerate); this.Controls.Add(this.btn_delete); this.Controls.Add(this.dataGridView1); @@ -465,5 +478,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn send_money; private System.Windows.Forms.DataGridViewTextBoxColumn date_pay; private System.Windows.Forms.DataGridViewTextBoxColumn etc; + private System.Windows.Forms.Button btn_close; } } \ No newline at end of file diff --git a/unimarc/unimarc/회계/Remit_reg2.cs b/unimarc/unimarc/회계/Remit_reg2.cs index a89d012..4f6d6a2 100644 --- a/unimarc/unimarc/회계/Remit_reg2.cs +++ b/unimarc/unimarc/회계/Remit_reg2.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using System.Text.RegularExpressions; using WindowsFormsApp1.Delivery; +using UniMarc.회계; namespace WindowsFormsApp1.Account { @@ -192,5 +193,25 @@ namespace WindowsFormsApp1.Account tb_send_money.Text = dataGridView1.Rows[row].Cells["send_money"].Value.ToString(); tb_etc.Text = dataGridView1.Rows[row].Cells["etc"].Value.ToString(); } + + private void btn_excel_Click(object sender, EventArgs e) + { + Excel_text et = new Excel_text(); + // 은행코드 계좌번호 빈칸 금액 예금주 + string[,] inputExcel = new string[dataGridView1.RowCount, 5]; + for (int a = 0; a < dataGridView1.RowCount; a++) + { + inputExcel[a, 0] = dataGridView1.Rows[a].Cells["bank_code"].Value.ToString(); + inputExcel[a, 1] = dataGridView1.Rows[a].Cells["bank_num"].Value.ToString(); + 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); + } + + private void btn_close_Click(object sender, EventArgs e) + { + Close(); + } } }