diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index 4e163d0..dc99471 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/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index d351abc..a6e16c6 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 c65bd64..aa5e694 100644 --- a/unimarc/WindowsFormsApp1/Email.cs +++ b/unimarc/WindowsFormsApp1/Email.cs @@ -16,7 +16,10 @@ namespace WindowsFormsApp1 public void Send_mail(string compidx, string pur, string filePath) { db.DBcon(); + #region Setup + String_Text st = new String_Text(); + // 보내는 이 : 메일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); @@ -28,6 +31,22 @@ namespace WindowsFormsApp1 tmp_db = db.DB_Select_Search(taker_Area, "Purchase", "sangho", pur); string[] arr_pur = tmp_db.Split('|'); + string sender = arr_pur[0]; + + string tmp = "안녕"; + if (st.isContainHangul(tmp)==true) { + MessageBox.Show("DB내 저장된 이메일이 사양과 다릅니다. 직접 입력해주세요."); + + Skill_Search_Text sst = new Skill_Search_Text(); + string value = ""; + if (sst.InputBox("보내실 이메일을 적어주세요.", "보내실 이메일을 적어주세요.", ref value) == DialogResult.OK) { + if (value == "") { return; } + } + else { + return; + sender = value; + } + } #endregion MailMessage mail = new MailMessage(); @@ -36,13 +55,13 @@ namespace WindowsFormsApp1 mail.From = new MailAddress("jhk132765@naver.com"); // 받는 사람 이메일 - mail.To.Add("jhk132765@gmail.com"); + mail.To.Add(sender); // 메일 제목 - mail.Subject = "메일 제목"; // arr_db[0] + "주문분입니다."; + mail.Subject = arr_db[0] + "주문분입니다."; // 메일 내용 - mail.Body = "메일 내용"; // arr_db[0] + "주문분입니다."; + mail.Body = arr_db[0] + "주문분입니다."; // 첨부파일 System.Net.Mail.Attachment attachment; @@ -52,11 +71,11 @@ namespace WindowsFormsApp1 mail.Attachments.Add(attachment); // SMTP 및 포트 설정 - SmtpClient smtp = new SmtpClient("smtp.naver.com", 587); // (arr_db[3], Convert.Int32(arr_db[4]); + SmtpClient smtp = new SmtpClient(arr_db[3], Convert.ToInt32(arr_db[4])); smtp.EnableSsl = true; // 계정 설정 - smtp.Credentials = new NetworkCredential("jhk132765@naver.com", "cjaeks3356!"); // (arr_db[1], arr_db[2]); + smtp.Credentials = new NetworkCredential(arr_db[1], arr_db[2]); try { diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index 9a95578..f571ff7 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 e2d7b3f..dcd7ef1 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 2399343..c9e9e0f 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.csprojAssemblyReference.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache index d3937d2..c0e8056 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 9a95578..f571ff7 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 e2d7b3f..dcd7ef1 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 2399343..c9e9e0f 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/납품관리/Order_input.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs index 4c39da1..c0d80a8 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs @@ -266,6 +266,7 @@ namespace WindowsFormsApp1.Delivery { Order_input_Search search = new Order_input_Search(this); search.Where_Open = "book_list"; + search.searchText = tb_search_book_list.Text; search.TopMost = true; search.Show(); } @@ -275,6 +276,7 @@ namespace WindowsFormsApp1.Delivery if (e.KeyCode == Keys.Enter) { Order_input_Search search = new Order_input_Search(this); search.Where_Open = "Order"; + search.searchText = tb_orderText.Text; search.TopMost = true; search.Show(); } diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.Designer.cs index 60801ac..c5a0e90 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.Designer.cs @@ -91,7 +91,6 @@ this.Controls.Add(this.dataGridView1); this.Name = "Order_input_Search"; this.Text = "Order_input_Search"; - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Order_input_Search_FormClosed); this.Load += new System.EventHandler(this.Order_input_Search_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.cs index 4ebc58e..85e9844 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.cs @@ -19,8 +19,8 @@ namespace WindowsFormsApp1.Delivery Helper_DB db = new Helper_DB(); int grididx = 0; - public string Where_Open = ""; - string searchText = ""; + public string Where_Open; + public string searchText; string compidx; public Order_input_Search(Order_input o_in) @@ -28,12 +28,6 @@ namespace WindowsFormsApp1.Delivery InitializeComponent(); oin = o_in; compidx = oin.compidx; - if (Where_Open == "book_list") { - searchText = oin.tb_search_book_list.Text; - } - else if (Where_Open == "Order") { - searchText = oin.tb_orderText.Text; - } } public Order_input_Search(Remit_reg2 _rem2) { @@ -76,8 +70,7 @@ namespace WindowsFormsApp1.Delivery string cmd = db.DB_Contains("Purchase", compidx, "sangho", searchText, "`sangho`, `boss`, `jongmok`"); made_grid(cmd); - /* - if (searchText == "") { + /* if (searchText == "") { string cmd = db.DB_Contains("Purchase", compidx, "", "", "`sangho`, `boss`, `jongmok`"); made_grid(cmd); @@ -87,7 +80,7 @@ namespace WindowsFormsApp1.Delivery string cmd = db.DB_Contains("Purchase", compidx, "sangho", searchText, "`sangho`, `boss`, `jongmok`"); made_grid(cmd); - }*/ + } */ } } private void made_grid(string strValue) @@ -99,9 +92,19 @@ namespace WindowsFormsApp1.Delivery { if (a % 3 == 0) { res[0] = data[a]; } if (a % 3 == 1) { res[1] = data[a]; } - if (a % 3 == 2) { res[2] = data[a]; dataGridView1.Rows.Add(res); } + if (a % 3 == 2) { res[2] = data[a]; + if(Contain_Text(res[0])) + dataGridView1.Rows.Add(res); + } } } + private bool Contain_Text(string ori) + { + if (ori.Contains(searchText)) + return true; + + return false; + } private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) { grididx = e.RowIndex; @@ -154,8 +157,5 @@ namespace WindowsFormsApp1.Delivery pb.tb_purchase.Text = dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString(); pb.btn_Lookup_Click(null, null); } - private void Order_input_Search_FormClosed(object sender, FormClosedEventArgs e) - { - } } } diff --git a/unimarc/WindowsFormsApp1/납품관리/Purchase.cs b/unimarc/WindowsFormsApp1/납품관리/Purchase.cs index 24a76a2..3c6d7f1 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Purchase.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Purchase.cs @@ -16,7 +16,7 @@ namespace WindowsFormsApp1.Delivery public partial class Purchase : Form { Helper_DB db = new Helper_DB(); - Skill_TextBox st = new Skill_TextBox(); + String_Text st = new String_Text(); Main main; public string compidx; public int grididx; diff --git a/unimarc/WindowsFormsApp1/마크/Marc.cs b/unimarc/WindowsFormsApp1/마크/Marc.cs index d68ef43..3450341 100644 --- a/unimarc/WindowsFormsApp1/마크/Marc.cs +++ b/unimarc/WindowsFormsApp1/마크/Marc.cs @@ -179,6 +179,7 @@ namespace ExcelTest result = "메모장\n008\t\t200604s20192020ulk b 000a kor "; + # region richTextBox1에 마크를 만드는 코드 { // 020 Tag for (a = 0; a < data020.RowCount - 1; a++) @@ -537,7 +538,9 @@ namespace ExcelTest if (text940a.Text != "" && text940a.Text != "940a 로컬서명") { result += "940" + mid + Sort + "a" + text940a.Text + End; } - } // richTextBox1에 마크를 만드는 코드 + } + #endregion + richTextBox1.Text = result.Replace("\n▲", ""); Color_change("▲"); Color_change("▼"); @@ -851,6 +854,8 @@ namespace ExcelTest findNchange fnc = new findNchange(this); fnc.Show(); break; + default: + break; } } } @@ -1677,6 +1682,7 @@ namespace ExcelTest /// public void ReturnToBox(string num, string sym, string list, string list2 = "") { + #region 이 안에 태그있다 { // 041 Tag if (num == "041") @@ -1859,7 +1865,9 @@ namespace ExcelTest { if (list[0] == 'a') { text940a.Text = list.Substring(1, list.Length - 1); } } - } // 이 안에 태그있다 + } + #endregion + Color_change("▲"); Color_change("▼"); }