diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index 1bddccb..3c74f6f 100644 Binary files a/unimarc/.vs/WindowsFormsApp1/v16/.suo and b/unimarc/.vs/WindowsFormsApp1/v16/.suo differ diff --git a/unimarc/WindowsFormsApp1/Email.cs b/unimarc/WindowsFormsApp1/Email.cs index d99849c..91b3def 100644 --- a/unimarc/WindowsFormsApp1/Email.cs +++ b/unimarc/WindowsFormsApp1/Email.cs @@ -28,18 +28,25 @@ namespace WindowsFormsApp1 #endregion MailMessage mail = new MailMessage(); + MailMessage mail_by_self = new MailMessage(); // 보내는 사람 이메일 + // mail.From = new MailAddress(arr_db[1]); + // mail_by_self.From = new MailAddress(arr_db[1]); mail.From = new MailAddress("jhk132765@naver.com"); + mail_by_self.From = new MailAddress("jhk132765@naver.com"); // 받는 사람 이메일 mail.To.Add(sender); + mail_by_self.To.Add(arr_db[3]); // 메일 제목 mail.Subject = arr_db[0] + "주문분입니다."; + mail_by_self.Subject = "Send_" + arr_db[0] + "주문분입니다."; // 메일 내용 mail.Body = arr_db[0] + "주문분입니다."; + mail_by_self.Body = "Send_" + arr_db[0] + "주문분입니다."; // 첨부파일 System.Net.Mail.Attachment attachment; @@ -47,17 +54,22 @@ namespace WindowsFormsApp1 // 첨부파일 붙이기 attachment = new System.Net.Mail.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]); try { smtp.Send(mail); + smtp_by_self.Send(mail_by_self); MessageBox.Show("메일 전송 완료"); return true; } diff --git a/unimarc/WindowsFormsApp1/Main.Designer.cs b/unimarc/WindowsFormsApp1/Main.Designer.cs index 47d4d7b..5da308e 100644 --- a/unimarc/WindowsFormsApp1/Main.Designer.cs +++ b/unimarc/WindowsFormsApp1/Main.Designer.cs @@ -42,11 +42,8 @@ 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(); 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(); this.회계ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.송금내역조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.송금등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -60,7 +57,6 @@ 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(); this.단축키설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -163,28 +159,28 @@ // 사용자정보ToolStripMenuItem // this.사용자정보ToolStripMenuItem.Name = "사용자정보ToolStripMenuItem"; - this.사용자정보ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.사용자정보ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.사용자정보ToolStripMenuItem.Text = "사업자 정보"; this.사용자정보ToolStripMenuItem.Click += new System.EventHandler(this.사용자정보ToolStripMenuItem_Click); // // 사용자관리ToolStripMenuItem // this.사용자관리ToolStripMenuItem.Name = "사용자관리ToolStripMenuItem"; - this.사용자관리ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.사용자관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.사용자관리ToolStripMenuItem.Text = "사용자 관리"; this.사용자관리ToolStripMenuItem.Click += new System.EventHandler(this.사용자관리ToolStripMenuItem_Click); // // 납품거래처관리ToolStripMenuItem // this.납품거래처관리ToolStripMenuItem.Name = "납품거래처관리ToolStripMenuItem"; - this.납품거래처관리ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.납품거래처관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.납품거래처관리ToolStripMenuItem.Text = "납품 / 거래처 관리"; this.납품거래처관리ToolStripMenuItem.Click += new System.EventHandler(this.납품거래처관리ToolStripMenuItem_Click); // // 주문처관리ToolStripMenuItem // this.주문처관리ToolStripMenuItem.Name = "주문처관리ToolStripMenuItem"; - this.주문처관리ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.주문처관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.주문처관리ToolStripMenuItem.Text = "주문처 관리"; this.주문처관리ToolStripMenuItem.Click += new System.EventHandler(this.주문처관리ToolStripMenuItem_Click); // @@ -192,14 +188,14 @@ // this.비밀번호변경ToolStripMenuItem.Enabled = false; this.비밀번호변경ToolStripMenuItem.Name = "비밀번호변경ToolStripMenuItem"; - this.비밀번호변경ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.비밀번호변경ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.비밀번호변경ToolStripMenuItem.Text = "비밀번호 변경"; this.비밀번호변경ToolStripMenuItem.Click += new System.EventHandler(this.비밀번호변경ToolStripMenuItem_Click); // // 도서정보관리ToolStripMenuItem // this.도서정보관리ToolStripMenuItem.Name = "도서정보관리ToolStripMenuItem"; - this.도서정보관리ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.도서정보관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.도서정보관리ToolStripMenuItem.Text = "도서정보 관리"; this.도서정보관리ToolStripMenuItem.Click += new System.EventHandler(this.도서정보관리ToolStripMenuItem_Click); // @@ -207,7 +203,7 @@ // this.사용대장ToolStripMenuItem.Enabled = false; this.사용대장ToolStripMenuItem.Name = "사용대장ToolStripMenuItem"; - this.사용대장ToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.사용대장ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.사용대장ToolStripMenuItem.Text = "사용대장"; this.사용대장ToolStripMenuItem.Click += new System.EventHandler(this.사용대장ToolStripMenuItem_Click); // @@ -218,11 +214,8 @@ this.목록등록편의ToolStripMenuItem, this.목록집계ToolStripMenuItem, this.주문입력ToolStripMenuItem, - this.견적서ToolStripMenuItem, this.매입ToolStripMenuItem, - this.매입반품입력ToolStripMenuItem, - this.재고입력및조회ToolStripMenuItem, - this.예가조회ToolStripMenuItem}); + this.재고입력및조회ToolStripMenuItem}); this.납품관리ToolStripMenuItem.Name = "납품관리ToolStripMenuItem"; this.납품관리ToolStripMenuItem.Size = new System.Drawing.Size(84, 20); this.납품관리ToolStripMenuItem.Text = "납품관리(&D)"; @@ -230,77 +223,52 @@ // 물품등록ToolStripMenuItem // this.물품등록ToolStripMenuItem.Name = "물품등록ToolStripMenuItem"; - this.물품등록ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.물품등록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.물품등록ToolStripMenuItem.Text = "물품등록"; this.물품등록ToolStripMenuItem.Click += new System.EventHandler(this.물품등록ToolStripMenuItem_Click); // // 목록등록편의ToolStripMenuItem // this.목록등록편의ToolStripMenuItem.Name = "목록등록편의ToolStripMenuItem"; - this.목록등록편의ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.목록등록편의ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.목록등록편의ToolStripMenuItem.Text = "목록조회"; this.목록등록편의ToolStripMenuItem.Click += new System.EventHandler(this.목록등록편의ToolStripMenuItem_Click); // // 목록집계ToolStripMenuItem // this.목록집계ToolStripMenuItem.Name = "목록집계ToolStripMenuItem"; - this.목록집계ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.목록집계ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.목록집계ToolStripMenuItem.Text = "목록집계"; this.목록집계ToolStripMenuItem.Click += new System.EventHandler(this.목록집계ToolStripMenuItem_Click); // // 주문입력ToolStripMenuItem // this.주문입력ToolStripMenuItem.Name = "주문입력ToolStripMenuItem"; - this.주문입력ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.주문입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.주문입력ToolStripMenuItem.Text = "주문입력"; this.주문입력ToolStripMenuItem.Click += new System.EventHandler(this.주문입력ToolStripMenuItem_Click); // - // 견적서ToolStripMenuItem - // - this.견적서ToolStripMenuItem.Enabled = false; - this.견적서ToolStripMenuItem.Name = "견적서ToolStripMenuItem"; - 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(166, 22); + this.매입ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.매입ToolStripMenuItem.Text = "입고작업"; this.매입ToolStripMenuItem.Click += new System.EventHandler(this.매입ToolStripMenuItem_Click); // - // 매입반품입력ToolStripMenuItem - // - this.매입반품입력ToolStripMenuItem.Enabled = false; - this.매입반품입력ToolStripMenuItem.Name = "매입반품입력ToolStripMenuItem"; - 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(166, 22); + this.재고입력및조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.재고입력및조회ToolStripMenuItem.Text = "재고입력 및 조회"; this.재고입력및조회ToolStripMenuItem.Click += new System.EventHandler(this.재고입력및조회ToolStripMenuItem_Click); // - // 예가조회ToolStripMenuItem - // - this.예가조회ToolStripMenuItem.Enabled = false; - this.예가조회ToolStripMenuItem.Name = "예가조회ToolStripMenuItem"; - this.예가조회ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); - this.예가조회ToolStripMenuItem.Text = "예가조회"; - this.예가조회ToolStripMenuItem.Click += new System.EventHandler(this.예가조회ToolStripMenuItem_Click); - // // 회계ToolStripMenuItem // this.회계ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.송금내역조회ToolStripMenuItem, this.송금등록ToolStripMenuItem, this.매입장부ToolStripMenuItem, - this.매출입력ToolStripMenuItem, - this.매출입금ToolStripMenuItem}); + this.매출입력ToolStripMenuItem}); this.회계ToolStripMenuItem.Name = "회계ToolStripMenuItem"; this.회계ToolStripMenuItem.Size = new System.Drawing.Size(59, 20); this.회계ToolStripMenuItem.Text = "회계(&A)"; @@ -332,14 +300,14 @@ // 매입집계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); // // 매입장부ToolStripMenuItem1 // this.매입장부ToolStripMenuItem1.Name = "매입장부ToolStripMenuItem1"; - this.매입장부ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.매입장부ToolStripMenuItem1.Size = new System.Drawing.Size(138, 22); this.매입장부ToolStripMenuItem1.Text = "매입 장부"; this.매입장부ToolStripMenuItem1.Click += new System.EventHandler(this.매입장부ToolStripMenuItem1_Click); // @@ -347,7 +315,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(138, 22); this.매입미결제ToolStripMenuItem.Text = "매입 미결제"; this.매입미결제ToolStripMenuItem.Click += new System.EventHandler(this.매입미결제ToolStripMenuItem_Click); // @@ -399,13 +367,6 @@ 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.Text = "계산서 관리"; - this.매출입금ToolStripMenuItem.Click += new System.EventHandler(this.매출입금ToolStripMenuItem_Click); - // // 마크ToolStripMenuItem // this.마크ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -428,7 +389,7 @@ this.불용어ToolStripMenuItem, this.작업지시서ToolStripMenuItem}); this.설정ToolStripMenuItem.Name = "설정ToolStripMenuItem"; - this.설정ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.설정ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.설정ToolStripMenuItem.Text = "설정"; // // 단축키설정ToolStripMenuItem @@ -467,7 +428,7 @@ this.엑셀작성ToolStripMenuItem, this.iSBN조회ToolStripMenuItem}); this.마크작업ToolStripMenuItem.Name = "마크작업ToolStripMenuItem"; - this.마크작업ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.마크작업ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.마크작업ToolStripMenuItem.Text = "마크 작업"; // // 마크목록ToolStripMenuItem @@ -504,7 +465,7 @@ this.반입ToolStripMenuItem, this.반출ToolStripMenuItem}); this.반입및반출ToolStripMenuItem.Name = "반입및반출ToolStripMenuItem"; - this.반입및반출ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.반입및반출ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.반입및반출ToolStripMenuItem.Text = "반입 및 반출"; // // 반입ToolStripMenuItem @@ -527,7 +488,7 @@ this.복본조사ToolStripMenuItem1, this.dLS복본조사ToolStripMenuItem}); this.복본조사ToolStripMenuItem.Name = "복본조사ToolStripMenuItem"; - this.복본조사ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.복본조사ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.복본조사ToolStripMenuItem.Text = "복본 조사"; // // 복본조사ToolStripMenuItem1 @@ -552,7 +513,7 @@ this.검수ToolStripMenuItem, this.저자기호ToolStripMenuItem}); this.부가기능ToolStripMenuItem.Name = "부가기능ToolStripMenuItem"; - this.부가기능ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.부가기능ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.부가기능ToolStripMenuItem.Text = "부가기능"; // // 마크수집ToolStripMenuItem @@ -589,7 +550,7 @@ this.dLS조회ToolStripMenuItem, this.dLS입력ToolStripMenuItem}); this.dLSToolStripMenuItem.Name = "dLSToolStripMenuItem"; - this.dLSToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.dLSToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.dLSToolStripMenuItem.Text = "DLS"; // // dLS조회ToolStripMenuItem @@ -613,7 +574,7 @@ this.마크통계ToolStripMenuItem, this.장비관리ToolStripMenuItem1}); this.기타ToolStripMenuItem.Name = "기타ToolStripMenuItem"; - this.기타ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.기타ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.기타ToolStripMenuItem.Text = "기타"; // // 서류작성ToolStripMenuItem @@ -976,16 +937,12 @@ private System.Windows.Forms.ToolStripMenuItem 목록등록편의ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 목록집계ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 주문입력ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 예가조회ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 견적서ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 매입ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 매입반품입력ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 재고입력및조회ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 회계ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 송금등록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 매입장부ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 매출입력ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 매출입금ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 매입장부ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 매입집계ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 매입미결제ToolStripMenuItem; diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index f7899f1..e89efb7 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe and b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb index 4890980..4ba057b 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb and b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll index d95ff7c..ceeb053 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache index f15d81d..1f485e5 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache index 6568287..f17f2b9 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe index f7899f1..e89efb7 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb index 4890980..4ba057b 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll index d95ff7c..ceeb053 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/납품관리/Purchase.cs b/unimarc/WindowsFormsApp1/납품관리/Purchase.cs index 3c6d7f1..bc27db7 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Purchase.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Purchase.cs @@ -830,7 +830,8 @@ namespace WindowsFormsApp1.Delivery 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(), + // 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() }; @@ -838,7 +839,7 @@ namespace WindowsFormsApp1.Delivery if(copy_chk.Length < 3) { // 중복없음 INSERT db.DB_INSERT("Inven", insert_Col, insert_Data); } - else { // 중복 UPDATE + else { // 중복 UPDATE db.More_Update("Inven", insert_Col, insert_Data, Search_Col, Search_Data); } } diff --git a/unimarc/WindowsFormsApp1/홈/User_Infor.Designer.cs b/unimarc/WindowsFormsApp1/홈/User_Infor.Designer.cs index 705205c..773cba8 100644 --- a/unimarc/WindowsFormsApp1/홈/User_Infor.Designer.cs +++ b/unimarc/WindowsFormsApp1/홈/User_Infor.Designer.cs @@ -331,6 +331,7 @@ this.tb_boss.Name = "tb_boss"; this.tb_boss.Size = new System.Drawing.Size(150, 21); this.tb_boss.TabIndex = 0; + this.tb_boss.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_email_pw // @@ -339,6 +340,7 @@ this.tb_email_pw.PasswordChar = '*'; this.tb_email_pw.Size = new System.Drawing.Size(150, 21); this.tb_email_pw.TabIndex = 0; + this.tb_email_pw.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_email_id // @@ -346,6 +348,7 @@ this.tb_email_id.Name = "tb_email_id"; this.tb_email_id.Size = new System.Drawing.Size(150, 21); this.tb_email_id.TabIndex = 0; + this.tb_email_id.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_bank_comp // @@ -353,6 +356,7 @@ this.tb_bank_comp.Name = "tb_bank_comp"; this.tb_bank_comp.Size = new System.Drawing.Size(150, 21); this.tb_bank_comp.TabIndex = 0; + this.tb_bank_comp.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_port // @@ -360,6 +364,7 @@ this.tb_port.Name = "tb_port"; this.tb_port.Size = new System.Drawing.Size(150, 21); this.tb_port.TabIndex = 0; + this.tb_port.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); this.tb_port.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_port_KeyPress); // // tb_smtp @@ -368,6 +373,7 @@ this.tb_smtp.Name = "tb_smtp"; this.tb_smtp.Size = new System.Drawing.Size(150, 21); this.tb_smtp.TabIndex = 0; + this.tb_smtp.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_bank_no // @@ -375,6 +381,7 @@ this.tb_bank_no.Name = "tb_bank_no"; this.tb_bank_no.Size = new System.Drawing.Size(150, 21); this.tb_bank_no.TabIndex = 0; + this.tb_bank_no.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_fax // @@ -382,6 +389,7 @@ this.tb_fax.Name = "tb_fax"; this.tb_fax.Size = new System.Drawing.Size(150, 21); this.tb_fax.TabIndex = 0; + this.tb_fax.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_tel // @@ -389,6 +397,7 @@ this.tb_tel.Name = "tb_tel"; this.tb_tel.Size = new System.Drawing.Size(150, 21); this.tb_tel.TabIndex = 0; + this.tb_tel.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_barea // @@ -396,6 +405,7 @@ this.tb_barea.Name = "tb_barea"; this.tb_barea.Size = new System.Drawing.Size(150, 21); this.tb_barea.TabIndex = 0; + this.tb_barea.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_email // @@ -403,6 +413,7 @@ this.tb_email.Name = "tb_email"; this.tb_email.Size = new System.Drawing.Size(150, 21); this.tb_email.TabIndex = 0; + this.tb_email.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_addr // @@ -410,6 +421,7 @@ this.tb_addr.Name = "tb_addr"; this.tb_addr.Size = new System.Drawing.Size(324, 21); this.tb_addr.TabIndex = 0; + this.tb_addr.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_zip // @@ -418,6 +430,7 @@ this.tb_zip.Size = new System.Drawing.Size(45, 21); this.tb_zip.TabIndex = 0; this.tb_zip.Text = " -"; + this.tb_zip.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_jongmok // @@ -425,6 +438,7 @@ this.tb_jongmok.Name = "tb_jongmok"; this.tb_jongmok.Size = new System.Drawing.Size(150, 21); this.tb_jongmok.TabIndex = 0; + this.tb_jongmok.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_uptae // @@ -432,6 +446,7 @@ this.tb_uptae.Name = "tb_uptae"; this.tb_uptae.Size = new System.Drawing.Size(150, 21); this.tb_uptae.TabIndex = 0; + this.tb_uptae.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_cobin // @@ -439,6 +454,7 @@ this.tb_cobin.Name = "tb_cobin"; this.tb_cobin.Size = new System.Drawing.Size(150, 21); this.tb_cobin.TabIndex = 0; + this.tb_cobin.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_bubin // @@ -446,6 +462,7 @@ this.tb_bubin.Name = "tb_bubin"; this.tb_bubin.Size = new System.Drawing.Size(150, 21); this.tb_bubin.TabIndex = 0; + this.tb_bubin.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_sangho // @@ -454,6 +471,7 @@ this.tb_sangho.Name = "tb_sangho"; this.tb_sangho.Size = new System.Drawing.Size(150, 21); this.tb_sangho.TabIndex = 0; + this.tb_sangho.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // panel19 // diff --git a/unimarc/WindowsFormsApp1/홈/User_Infor.cs b/unimarc/WindowsFormsApp1/홈/User_Infor.cs index 4955f93..0e8c4f7 100644 --- a/unimarc/WindowsFormsApp1/홈/User_Infor.cs +++ b/unimarc/WindowsFormsApp1/홈/User_Infor.cs @@ -102,5 +102,12 @@ namespace WindowsFormsApp1.Home Email mail = new Email(); mail.Send_Test_mail("글로리아북", tb_email.Text, "테스트 메일입니다", "테스트 메일입니다"); } + + private void tb_sangho_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Escape) { + btn_close_Click(null, null); + } + } } } diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Book.cs b/unimarc/WindowsFormsApp1/회계/Sales_Book.cs index 30c42a0..4115a52 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Book.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Book.cs @@ -204,8 +204,8 @@ namespace WindowsFormsApp1.회계 int yesr = Convert.ToInt32(out_date.Substring(0, 4)); int month = Convert.ToInt32(out_date.Substring(4, 2)); int day = Convert.ToInt32(out_date.Substring(6, 2)); - sde.MdiParent = main; - // sde.WindowState = FormWindowState.Maximized; + sde.MdiParent = this.MdiParent; + sde.WindowState = FormWindowState.Maximized; sde.Out_Date.Value = new DateTime(yesr, month, day); sde.tb_clt.Text = tb_clt.Text; sde.Show(); diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Detail.cs b/unimarc/WindowsFormsApp1/회계/Sales_Detail.cs index cd04ff0..ea7db6a 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Detail.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Detail.cs @@ -24,11 +24,6 @@ namespace WindowsFormsApp1.회계 sb = _sb; compidx = sb.compidx; } - public Sales_Detail(Main _main) - { - InitializeComponent(); - main = _main; - } public Sales_Detail(Sales_Lookup _sl) { InitializeComponent();