diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index 7eabbfa..4d37836 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/bin/Debug/ISBN_Check_test.application b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application index bab6e9f..e35afa1 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 @@ - 8N4/Pl6ig/T8cBz+eEqT6pbz5MtRtdCsvu1zv7PWX2o= + KaOR9WNRzGEkEt/L6WRvYUKErNaykb0irghudtfTbMo= diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe index 041d7c3..98be031 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 8a0cc6a..1c42727 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 @@ - + @@ -43,13 +43,13 @@ - + - bdOYkYERRvJUqx91y1qmQjuXv88VCmpYTIG8UBAfmGo= + lW399SUW4oVNHmKhonNbeZ2ufIuXhK+YJO9VqdT6bJ8= @@ -80,7 +80,7 @@ - ozAby1Nftdrpio9AQip4nUd/wUETl8WqO8llSVov95w= + i3swclH27Z786WNE6JwZJW8AIYuPyeXJ/oYEB+gM4FA= \ 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 b2088e6..058678e 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 9edd1f3..25a1820 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 bab6e9f..e35afa1 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 @@ - 8N4/Pl6ig/T8cBz+eEqT6pbz5MtRtdCsvu1zv7PWX2o= + KaOR9WNRzGEkEt/L6WRvYUKErNaykb0irghudtfTbMo= diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache index f352976..eee08e5 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache differ diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe index 041d7c3..98be031 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 8a0cc6a..1c42727 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 @@ - + @@ -43,13 +43,13 @@ - + - bdOYkYERRvJUqx91y1qmQjuXv88VCmpYTIG8UBAfmGo= + lW399SUW4oVNHmKhonNbeZ2ufIuXhK+YJO9VqdT6bJ8= @@ -80,7 +80,7 @@ - ozAby1Nftdrpio9AQip4nUd/wUETl8WqO8llSVov95w= + i3swclH27Z786WNE6JwZJW8AIYuPyeXJ/oYEB+gM4FA= \ 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 b2088e6..058678e 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/Setup1/Debug/Setup1.msi b/Setup1/Debug/Setup1.msi index 9ed8dbc..4189777 100644 Binary files a/Setup1/Debug/Setup1.msi and b/Setup1/Debug/Setup1.msi differ diff --git a/Setup1/Setup1.vdproj b/Setup1/Setup1.vdproj index 4339dd6..3845eeb 100644 --- a/Setup1/Setup1.vdproj +++ b/Setup1/Setup1.vdproj @@ -22,19 +22,19 @@ "Entry" { "MsmKey" = "8:_36AC4F62C92B6D0BCDD2C56761258591" - "OwnerKey" = "8:_6FD3A2ED6BCE4D60998CA77094F077A6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_6FD3A2ED6BCE4D60998CA77094F077A6" - "OwnerKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_F645A90D8DD843CF9495192BFCC290BB" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8E5B8C9896AC806B09C2BF089A2B0DA2" - "OwnerKey" = "8:_6FD3A2ED6BCE4D60998CA77094F077A6" + "OwnerKey" = "8:_F645A90D8DD843CF9495192BFCC290BB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F645A90D8DD843CF9495192BFCC290BB" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -46,7 +46,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6FD3A2ED6BCE4D60998CA77094F077A6" + "OwnerKey" = "8:_F645A90D8DD843CF9495192BFCC290BB" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -289,7 +289,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:ISBN조회프로그램" "ProductCode" = "8:{A8A04035-B337-4B41-88F1-8A5982917757}" - "PackageCode" = "8:{E8137EB0-3234-42B5-B209-18D17ACB496F}" + "PackageCode" = "8:{BB929504-C489-4722-89F6-230B374B36F4}" "UpgradeCode" = "8:{26ED5F40-94B6-454E-894F-FE448A69CB2D}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" @@ -409,7 +409,7 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_6C4907FFDB874945A1B221C86CE2A522" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_DE74ABC431374957A44C0B13428F68E5" { "Name" = "8:ISBN 조회" "Arguments" = "8:" @@ -417,7 +417,7 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_6FD3A2ED6BCE4D60998CA77094F077A6" + "Target" = "8:_F645A90D8DD843CF9495192BFCC290BB" "Folder" = "8:_A66867392A5046CAB74023B14B8C3140" "WorkingFolder" = "8:_945325C397F845FB86F255B5AAC3663E" "Icon" = "8:_0D6062360C5F4D6BA7D1EBF485EEFF70" @@ -822,7 +822,7 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6FD3A2ED6BCE4D60998CA77094F077A6" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F645A90D8DD843CF9495192BFCC290BB" { "SourcePath" = "8:..\\ISBN_Check_test\\obj\\Debug\\ISBN_Check_test.exe" "TargetName" = "8:" diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index d052eab..4ebd5e2 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 aa5e694..d99849c 100644 --- a/unimarc/WindowsFormsApp1/Email.cs +++ b/unimarc/WindowsFormsApp1/Email.cs @@ -13,12 +13,11 @@ namespace WindowsFormsApp1 class Email { Helper_DB db = new Helper_DB(); - public void Send_mail(string compidx, string pur, string filePath) + public bool Send_mail(string compidx, string pur, string filePath, string sender) { db.DBcon(); #region Setup - String_Text st = new String_Text(); // 보내는 이 : 메일ID, 메일PW, smtp주소, 포트번호 string sender_Area = "`comp_name`, `email_ID`, `email_PW`, `smtp`, `port`"; @@ -26,27 +25,6 @@ namespace WindowsFormsApp1 string[] arr_db = tmp_db.Split('|'); - // 받는 이 : 메일 - string taker_Area = "`email`"; - 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(); @@ -81,10 +59,12 @@ namespace WindowsFormsApp1 { smtp.Send(mail); MessageBox.Show("메일 전송 완료"); + return true; } catch(SmtpException e) { MessageBox.Show(e.ToString()); + return false; } } /// diff --git a/unimarc/WindowsFormsApp1/WindowsFormsApp1.csproj b/unimarc/WindowsFormsApp1/WindowsFormsApp1.csproj index 4e220bd..716336f 100644 --- a/unimarc/WindowsFormsApp1/WindowsFormsApp1.csproj +++ b/unimarc/WindowsFormsApp1/WindowsFormsApp1.csproj @@ -90,6 +90,12 @@ True Reference.svcmap + + Form + + + Order_Send_Chk.cs + Form @@ -582,6 +588,9 @@ Work_Log.cs + + Order_Send_Chk.cs + Check_ISBN_Sub.cs diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index 066eacf..55fd536 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 e2d204c..85dc26a 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 21b7707..0113fb4 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/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 3a7737e..8289da1 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.CoreCompileInputs.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.CoreCompileInputs.cache index bb8bfda..56d85a9 100644 --- a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.CoreCompileInputs.cache +++ b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -95b5b9901765015531bb86a1c60df3f15920c313 +31638290a3c75b4ec84290b2c00f026a8e6e2c75 diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt index 291a8ec..d3dbd74 100644 --- a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt +++ b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt @@ -376,3 +376,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\bin\Debug\System C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.마크.Check_ISBN_Sub.resources C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.마크.Search_Infor_Sub.resources C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.csprojAssemblyReference.cache +C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.납품관리.Order_Send_Chk.resources diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache index ad8ba04..468a8c7 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 081cb15..368c47e 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 066eacf..55fd536 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 e2d204c..85dc26a 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/WindowsFormsApp1.납품관리.Order_Send_Chk.resources b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.납품관리.Order_Send_Chk.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.납품관리.Order_Send_Chk.resources differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll index 21b7707..0113fb4 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_Send_Chk.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Order_Send_Chk.Designer.cs new file mode 100644 index 0000000..53e1847 --- /dev/null +++ b/unimarc/WindowsFormsApp1/납품관리/Order_Send_Chk.Designer.cs @@ -0,0 +1,353 @@ + +namespace WindowsFormsApp1.납품관리 +{ + partial class Order_Send_Chk + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); + this.Start_DatePicker = new System.Windows.Forms.DateTimePicker(); + this.label7 = new System.Windows.Forms.Label(); + this.End_DatePicker = new System.Windows.Forms.DateTimePicker(); + this.label2 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + 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.FaxKey = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.f_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.f_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.f_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.f_state = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.f_page1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.f_page2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.f_filename = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.f_res = new System.Windows.Forms.DataGridViewTextBoxColumn(); + 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.DataGridViewTextBoxColumn(); + 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(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.textBox1); + this.panel1.Controls.Add(this.Start_DatePicker); + this.panel1.Controls.Add(this.label7); + this.panel1.Controls.Add(this.End_DatePicker); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.label1); + this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(538, 35); + this.panel1.TabIndex = 0; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 10); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(69, 12); + this.label1.TabIndex = 0; + this.label1.Text = "발송 요청일"; + // + // Start_DatePicker + // + this.Start_DatePicker.CustomFormat = "yyyy-MM-dd"; + this.Start_DatePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.Start_DatePicker.Location = new System.Drawing.Point(96, 6); + this.Start_DatePicker.Name = "Start_DatePicker"; + this.Start_DatePicker.Size = new System.Drawing.Size(85, 21); + this.Start_DatePicker.TabIndex = 18; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(184, 10); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(14, 12); + this.label7.TabIndex = 19; + this.label7.Text = "~"; + // + // End_DatePicker + // + this.End_DatePicker.CustomFormat = "yyyy-MM-dd"; + this.End_DatePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.End_DatePicker.Location = new System.Drawing.Point(200, 6); + this.End_DatePicker.Name = "End_DatePicker"; + this.End_DatePicker.Size = new System.Drawing.Size(85, 21); + this.End_DatePicker.TabIndex = 20; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(322, 10); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.TabIndex = 0; + this.label2.Text = "거래처명"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(381, 6); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(147, 21); + this.textBox1.TabIndex = 21; + // + // btn_Lookup + // + this.btn_Lookup.Location = new System.Drawing.Point(569, 15); + this.btn_Lookup.Name = "btn_Lookup"; + this.btn_Lookup.Size = new System.Drawing.Size(85, 28); + this.btn_Lookup.TabIndex = 1; + this.btn_Lookup.Text = "조 회"; + this.btn_Lookup.UseVisualStyleBackColor = true; + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(660, 15); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(85, 28); + this.btn_Close.TabIndex = 1; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + // + // dataGrid_Fax + // + this.dataGrid_Fax.AllowUserToAddRows = false; + this.dataGrid_Fax.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.True; + this.dataGrid_Fax.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dataGrid_Fax.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGrid_Fax.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.FaxKey, + this.f_comp, + this.f_num, + this.f_date, + this.f_state, + this.f_page1, + this.f_page2, + this.f_filename, + this.f_res}); + this.dataGrid_Fax.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; + this.dataGrid_Fax.Location = new System.Drawing.Point(12, 53); + this.dataGrid_Fax.Name = "dataGrid_Fax"; + this.dataGrid_Fax.RowHeadersWidth = 10; + this.dataGrid_Fax.RowTemplate.Height = 23; + this.dataGrid_Fax.Size = new System.Drawing.Size(890, 493); + this.dataGrid_Fax.TabIndex = 2; + // + // dataGrid_Email + // + this.dataGrid_Email.AllowUserToAddRows = false; + this.dataGrid_Email.AllowUserToDeleteRows = 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.dataGrid_Email.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + this.dataGrid_Email.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGrid_Email.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.m_clt, + this.m_date, + this.m_time, + this.m_sender, + this.m_taker, + this.m_filename, + this.m_sendres}); + this.dataGrid_Email.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; + this.dataGrid_Email.Location = new System.Drawing.Point(12, 53); + this.dataGrid_Email.Name = "dataGrid_Email"; + this.dataGrid_Email.RowHeadersWidth = 10; + this.dataGrid_Email.RowTemplate.Height = 23; + this.dataGrid_Email.Size = new System.Drawing.Size(890, 493); + this.dataGrid_Email.TabIndex = 3; + // + // 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.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"; + // + // m_clt + // + this.m_clt.HeaderText = "거래처명"; + this.m_clt.Name = "m_clt"; + this.m_clt.Width = 150; + // + // m_date + // + this.m_date.HeaderText = "날짜"; + this.m_date.Name = "m_date"; + // + // m_time + // + this.m_time.HeaderText = "시간"; + this.m_time.Name = "m_time"; + // + // m_sender + // + this.m_sender.HeaderText = "보낸 메일주소"; + this.m_sender.Name = "m_sender"; + this.m_sender.Width = 130; + // + // m_taker + // + this.m_taker.HeaderText = "받는 메일주소"; + this.m_taker.Name = "m_taker"; + this.m_taker.Width = 130; + // + // m_filename + // + this.m_filename.HeaderText = "전송파일명"; + this.m_filename.Name = "m_filename"; + this.m_filename.Width = 150; + // + // m_sendres + // + this.m_sendres.HeaderText = "전송결과"; + this.m_sendres.Name = "m_sendres"; + // + // Order_Send_Chk + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(914, 558); + this.Controls.Add(this.dataGrid_Email); + this.Controls.Add(this.btn_Close); + this.Controls.Add(this.btn_Lookup); + 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(); + ((System.ComponentModel.ISupportInitialize)(this.dataGrid_Fax)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGrid_Email)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.DateTimePicker Start_DatePicker; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.DateTimePicker End_DatePicker; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Button btn_Lookup; + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.DataGridView dataGrid_Fax; + private System.Windows.Forms.DataGridView dataGrid_Email; + private System.Windows.Forms.DataGridViewTextBoxColumn FaxKey; + private System.Windows.Forms.DataGridViewTextBoxColumn f_comp; + private System.Windows.Forms.DataGridViewTextBoxColumn f_num; + private System.Windows.Forms.DataGridViewTextBoxColumn f_date; + private System.Windows.Forms.DataGridViewTextBoxColumn f_state; + private System.Windows.Forms.DataGridViewTextBoxColumn f_page1; + private System.Windows.Forms.DataGridViewTextBoxColumn f_page2; + private System.Windows.Forms.DataGridViewTextBoxColumn f_filename; + private System.Windows.Forms.DataGridViewTextBoxColumn f_res; + private System.Windows.Forms.DataGridViewTextBoxColumn m_clt; + private System.Windows.Forms.DataGridViewTextBoxColumn m_date; + private System.Windows.Forms.DataGridViewTextBoxColumn m_time; + private System.Windows.Forms.DataGridViewTextBoxColumn m_sender; + private System.Windows.Forms.DataGridViewTextBoxColumn m_taker; + private System.Windows.Forms.DataGridViewTextBoxColumn m_filename; + private System.Windows.Forms.DataGridViewTextBoxColumn m_sendres; + } +} \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_Send_Chk.cs b/unimarc/WindowsFormsApp1/납품관리/Order_Send_Chk.cs new file mode 100644 index 0000000..9101784 --- /dev/null +++ b/unimarc/WindowsFormsApp1/납품관리/Order_Send_Chk.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using WindowsFormsApp1.Delivery; + +namespace WindowsFormsApp1.납품관리 +{ + public partial class Order_Send_Chk : Form + { + string[] set_date = { "", "" }; + string compidx; + Helper_DB db = new Helper_DB(); + Order_input oi; + public Order_Send_Chk(Order_input _oi) + { + InitializeComponent(); + oi = _oi; + compidx = oi.compidx; + } + private void Order_Send_Chk_Load(object sender, EventArgs e) + { + db.DBcon(); + + #region 일자설정 + int Year = DateTime.Now.Year; + int Month = DateTime.Now.Month; + int Day = DateTime.Now.Day - 1; + Start_DatePicker.Value = new DateTime(Year, Month, Day); + + set_date[0] = Start_DatePicker.Value.ToString().Substring(0, 10); + set_date[1] = End_DatePicker.Value.ToString().Substring(0, 10); + #endregion + + #region Grid설정 + string Area = "`구분`, `팩스전송키`, `거래처명`, `날짜`, `시간`, `보낸이`, `받는이`, `전송파일명`, `전송결과`"; + string Fax_Key_tmp = db.Search_Date("Send_Order", Area, "날짜", set_date[0], set_date[1], compidx); + string[] Fax_Key = Fax_Key_tmp.Split('|'); + input_Grid(Fax_Key); + #endregion + } + private void input_Grid(string[] data) + { + switch(oi.cb_ordersend.SelectedIndex) + { + case 0: + dataGrid_Email.Enabled = false; + dataGrid_Email.Visible = false; + Fax_Grid(data); + break; + + case 1: + dataGrid_Fax.Enabled = false; + dataGrid_Fax.Visible = false; + Email_Grid(data); + break; + + default: + break; + } + } + private void Fax_Grid(string[] data) + { + string[] grid = { "", "", "", "", "", + "", "", "" }; + int len = 9; + for(int a = 0; a < data.Length; a++) + { + if (a % len == 0) { + if (data[a] != "팩스") return; + } + if (a % len == 1) { + dataGrid_Fax.Rows.Add(Plus_Fax(data[a], grid)); + } + } + } + private void Email_Grid(string[] data) + { + string[] grid = { "", "", "", "", "", + "" }; + int len = 9; + for(int a= 0; a < data.Length; a++) + { + if (a % len == 0) { + if (data[a] != "메일") return; + } + if (a % len == 2) { grid[0] = data[a]; } + if (a % len == 3) { grid[1] = data[a]; } + if (a % len == 4) { grid[2] = data[a]; } + if (a % len == 5) { grid[3] = data[a]; } + if (a % len == 6) { grid[4] = data[a]; } + if (a % len == 7) { grid[5] = data[a]; dataGrid_Email.Rows.Add(grid); } + } + } + private string[] Plus_Fax(string faxkey, string[] grid) + { + Barobill_FAX fax = new Barobill_FAX(); + + // 수신자회사명, 수신번호, 전송일시, 전송결과, 전송페이지수, 성공페이지수, 전송파일명 + string[] data = fax.Send_chk_BaroFax(faxkey); + MessageBox.Show(faxkey); + grid[0] = faxkey; + grid[1] = data[0]; + grid[2] = data[1]; + grid[3] = data[2]; + grid[4] = data[3]; + grid[5] = data[4]; + grid[6] = data[5]; + grid[7] = data[6]; + + return grid; + } + } +} diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_Send_Chk.resx b/unimarc/WindowsFormsApp1/납품관리/Order_Send_Chk.resx new file mode 100644 index 0000000..4587772 --- /dev/null +++ b/unimarc/WindowsFormsApp1/납품관리/Order_Send_Chk.resx @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs index 6245331..6f65457 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs @@ -378,7 +378,7 @@ // // tb_orderText // - this.tb_orderText.Location = new System.Drawing.Point(993, 85); + this.tb_orderText.Location = new System.Drawing.Point(987, 85); this.tb_orderText.Name = "tb_orderText"; this.tb_orderText.Size = new System.Drawing.Size(129, 21); this.tb_orderText.TabIndex = 44; @@ -387,7 +387,7 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(940, 89); + this.label12.Location = new System.Drawing.Point(934, 89); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(53, 12); this.label12.TabIndex = 43; @@ -395,7 +395,7 @@ // // btn_order_list_change // - this.btn_order_list_change.Location = new System.Drawing.Point(1126, 84); + this.btn_order_list_change.Location = new System.Drawing.Point(1120, 84); this.btn_order_list_change.Name = "btn_order_list_change"; this.btn_order_list_change.Size = new System.Drawing.Size(129, 23); this.btn_order_list_change.TabIndex = 45; @@ -405,7 +405,7 @@ // // btn_order_chk // - this.btn_order_chk.Location = new System.Drawing.Point(1126, 111); + this.btn_order_chk.Location = new System.Drawing.Point(1120, 111); this.btn_order_chk.Name = "btn_order_chk"; this.btn_order_chk.Size = new System.Drawing.Size(129, 23); this.btn_order_chk.TabIndex = 46; @@ -463,7 +463,7 @@ this.dataGridView1.RowHeadersWidth = 10; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.dataGridView1.Size = new System.Drawing.Size(1246, 566); + this.dataGridView1.Size = new System.Drawing.Size(1240, 566); this.dataGridView1.TabIndex = 47; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); @@ -649,7 +649,7 @@ // // btn_order_empty // - this.btn_order_empty.Location = new System.Drawing.Point(993, 111); + this.btn_order_empty.Location = new System.Drawing.Point(987, 111); this.btn_order_empty.Name = "btn_order_empty"; this.btn_order_empty.Size = new System.Drawing.Size(129, 23); this.btn_order_empty.TabIndex = 46; @@ -681,7 +681,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1268, 722); + this.ClientSize = new System.Drawing.Size(1261, 722); this.Controls.Add(this.btn_Excel); this.Controls.Add(this.btn_close); this.Controls.Add(this.panel2); @@ -745,7 +745,6 @@ private System.Windows.Forms.Button btn_All_unchk; private System.Windows.Forms.Button btn_Save; private System.Windows.Forms.Button button12; - private System.Windows.Forms.ComboBox cb_ordersend; private System.Windows.Forms.Button btn_order_send; private System.Windows.Forms.Button btn_send_chk; private System.Windows.Forms.Label label12; @@ -780,5 +779,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn order_date; private System.Windows.Forms.DataGridViewTextBoxColumn send_date; private System.Windows.Forms.DataGridViewTextBoxColumn num; + public System.Windows.Forms.ComboBox cb_ordersend; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs index 508e94e..fa9275c 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using WindowsFormsApp1.납품관리; namespace WindowsFormsApp1.Delivery { @@ -367,6 +368,9 @@ namespace WindowsFormsApp1.Delivery } } */ + string Date = DateTime.Now.ToString("yyyy-MM-dd"); + string Time = DateTime.Now.ToString("HH-mm-ss"); + String_Text st = new String_Text(); string pur = "dasd"; string FilePath = string.Empty; string filename = string.Empty; @@ -452,18 +456,57 @@ namespace WindowsFormsApp1.Delivery // 바로빌 FAX API연동 db.DB_Update("Comp", "fax_Key", fax.Send_BaroFax(filename, fax_param), "idx", compidx); + string Fax_Key = fax.Send_BaroFax(filename, fax_param); + string[] col_Name = { "compidx", "구분", "팩스전송키", "날짜", "시간" }; + string[] set_Data = { compidx, "팩스", Fax_Key, Date, Time }; + + db.DB_INSERT("Send_Order", col_Name, set_Data); } if (cb_ordersend.SelectedItem.ToString() == "메일") { + + // 보내는 이 : 메일ID + string sender_Area = "`email_ID`"; + string tmp_db = db.DB_Select_Search(sender_Area, "Comp", "idx", compidx); + + string[] arr_db = tmp_db.Split('|'); + + // 받는 이 : 메일 + string taker_Area = "`email`"; + tmp_db = db.DB_Select_Search(taker_Area, "Purchase", "sangho", pur); + + string[] arr_pur = tmp_db.Split('|'); + string m_send = arr_pur[0]; + + if (st.isContainHangul(m_send) == 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 { + m_send = value; + } + } + Email email = new Email(); - email.Send_mail(compidx, pur, Odig.FileName); + if (email.Send_mail(compidx, pur, Odig.FileName, m_send)) { + + string[] col_Name = { "compidx", "구분", "거래처명", "날짜", "시간", "보낸이", "받는이", "전송파일명", "전송결과" }; + string[] set_Data = { compidx, "메일", pur, Date, Time, arr_db[0], m_send, filename, "성공" }; + db.DB_INSERT("Send_Order", col_Name, set_Data); + MessageBox.Show("전송 성공!"); + } + else { MessageBox.Show("전송 실패!"); } } } private void btn_send_chk_Click(object sender, EventArgs e) { - string db_tmp = db.DB_Select_Search("`fax_Key`", "Comp", "idx", compidx); - string[] fax_key = db_tmp.Split('|'); + Order_Send_Chk orc = new Order_Send_Chk(this); + orc.Show(); - fax.Send_chk_BaroFax(fax_key[0]); } private void btn_order_list_change_Click(object sender, EventArgs e) { diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN.Designer.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN.Designer.cs index 063fa2c..a13084f 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN.Designer.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN.Designer.cs @@ -32,16 +32,6 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.btn_lookup = new System.Windows.Forms.Button(); - this.cb_filter = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.tb_list_name = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.btn_Save = new System.Windows.Forms.Button(); - this.btn_Close = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.cb_api = new System.Windows.Forms.ComboBox(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -62,6 +52,17 @@ this.sold_out = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.image = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.api_data = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_lookup = new System.Windows.Forms.Button(); + this.cb_filter = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.tb_list_name = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.btn_Save = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.cb_api = new System.Windows.Forms.ComboBox(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // @@ -120,97 +121,6 @@ this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // - // btn_lookup - // - this.btn_lookup.Location = new System.Drawing.Point(709, 7); - this.btn_lookup.Name = "btn_lookup"; - this.btn_lookup.Size = new System.Drawing.Size(99, 23); - this.btn_lookup.TabIndex = 1; - this.btn_lookup.Text = "ISBN 자동 조회"; - this.btn_lookup.UseVisualStyleBackColor = true; - this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); - // - // cb_filter - // - this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_filter.FormattingEnabled = true; - this.cb_filter.Location = new System.Drawing.Point(516, 8); - this.cb_filter.Name = "cb_filter"; - this.cb_filter.Size = new System.Drawing.Size(161, 20); - this.cb_filter.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(16, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 12); - this.label1.TabIndex = 3; - this.label1.Text = "목록명"; - // - // tb_list_name - // - this.tb_list_name.Enabled = false; - this.tb_list_name.Location = new System.Drawing.Point(59, 8); - this.tb_list_name.Name = "tb_list_name"; - this.tb_list_name.Size = new System.Drawing.Size(199, 21); - this.tb_list_name.TabIndex = 4; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(457, 12); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(57, 12); - this.label2.TabIndex = 3; - this.label2.Text = "검색 조건"; - // - // btn_Save - // - this.btn_Save.Location = new System.Drawing.Point(819, 7); - this.btn_Save.Name = "btn_Save"; - this.btn_Save.Size = new System.Drawing.Size(99, 23); - this.btn_Save.TabIndex = 1; - this.btn_Save.Text = "전 체 저 장"; - this.btn_Save.UseVisualStyleBackColor = true; - this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); - // - // btn_Close - // - this.btn_Close.Location = new System.Drawing.Point(929, 7); - this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(99, 23); - this.btn_Close.TabIndex = 1; - this.btn_Close.Text = "닫 기"; - this.btn_Close.UseVisualStyleBackColor = true; - this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(278, 12); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(57, 12); - this.label3.TabIndex = 5; - this.label3.Text = "검색 엔진"; - // - // cb_api - // - this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_api.FormattingEnabled = true; - this.cb_api.Location = new System.Drawing.Point(337, 8); - this.cb_api.Name = "cb_api"; - this.cb_api.Size = new System.Drawing.Size(93, 20); - this.cb_api.TabIndex = 6; - this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); - // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(1060, 7); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(219, 23); - this.progressBar1.TabIndex = 7; - // // num // this.num.HeaderText = "번호"; @@ -319,11 +229,111 @@ this.api_data.Name = "api_data"; this.api_data.Visible = false; // + // btn_lookup + // + this.btn_lookup.Location = new System.Drawing.Point(709, 7); + this.btn_lookup.Name = "btn_lookup"; + this.btn_lookup.Size = new System.Drawing.Size(99, 23); + this.btn_lookup.TabIndex = 1; + this.btn_lookup.Text = "ISBN 자동 조회"; + this.btn_lookup.UseVisualStyleBackColor = true; + this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); + // + // cb_filter + // + this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_filter.FormattingEnabled = true; + this.cb_filter.Location = new System.Drawing.Point(516, 8); + this.cb_filter.Name = "cb_filter"; + this.cb_filter.Size = new System.Drawing.Size(161, 20); + this.cb_filter.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(16, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(41, 12); + this.label1.TabIndex = 3; + this.label1.Text = "목록명"; + // + // tb_list_name + // + this.tb_list_name.Enabled = false; + this.tb_list_name.Location = new System.Drawing.Point(59, 8); + this.tb_list_name.Name = "tb_list_name"; + this.tb_list_name.Size = new System.Drawing.Size(199, 21); + this.tb_list_name.TabIndex = 4; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(457, 12); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 12); + this.label2.TabIndex = 3; + this.label2.Text = "검색 조건"; + // + // btn_Save + // + this.btn_Save.Location = new System.Drawing.Point(819, 7); + this.btn_Save.Name = "btn_Save"; + this.btn_Save.Size = new System.Drawing.Size(99, 23); + this.btn_Save.TabIndex = 1; + this.btn_Save.Text = "전 체 저 장"; + this.btn_Save.UseVisualStyleBackColor = true; + this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(929, 7); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(99, 23); + this.btn_Close.TabIndex = 1; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(278, 12); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(57, 12); + this.label3.TabIndex = 5; + this.label3.Text = "검색 엔진"; + // + // cb_api + // + this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_api.FormattingEnabled = true; + this.cb_api.Location = new System.Drawing.Point(337, 8); + this.cb_api.Name = "cb_api"; + this.cb_api.Size = new System.Drawing.Size(93, 20); + this.cb_api.TabIndex = 6; + this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); + // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(1060, 7); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(219, 23); + this.progressBar1.TabIndex = 7; + // + // richTextBox1 + // + this.richTextBox1.Location = new System.Drawing.Point(12, 589); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(1615, 123); + this.richTextBox1.TabIndex = 8; + this.richTextBox1.Text = ""; + // // Check_ISBN // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1639, 594); + this.ClientSize = new System.Drawing.Size(1639, 724); + this.Controls.Add(this.richTextBox1); this.Controls.Add(this.progressBar1); this.Controls.Add(this.cb_api); this.Controls.Add(this.label3); @@ -377,5 +387,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn sold_out; private System.Windows.Forms.DataGridViewTextBoxColumn image; private System.Windows.Forms.DataGridViewTextBoxColumn api_data; + private System.Windows.Forms.RichTextBox richTextBox1; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs index ce8be96..50934da 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs @@ -115,7 +115,7 @@ namespace WindowsFormsApp1.Mac // 도서명 / 저자 / 출판사 / isbn / 정가 // 발행일 / 도서분류 / 재고 string[] param = { "title", "author", "publisher", "isbn13", "priceStandard", - "pubDate", "categoryName", "stockStatus" }; + "pubDate", "categoryName", "stockStatus", "cover" }; API api = new API(); switch (cb_filter.SelectedIndex) @@ -582,6 +582,7 @@ namespace WindowsFormsApp1.Mac private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) { rowidx = e.RowIndex; + richTextBox1.Text = dataGridView1.Rows[rowidx].Cells["api_data"].Value.ToString(); } private void Check_ISBN_FormClosing(object sender, FormClosingEventArgs e) { diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs index b50dcb7..abedb43 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs @@ -70,8 +70,10 @@ namespace WindowsFormsApp1.마크 } private string change_Date_type(string date) { - if (Call_API == "알라딘") + if (Call_API == "알라딘") { + MessageBox.Show(date); return String.Format("{0:yyyy/MM/dd}", DateTime.Parse(date.Remove(date.IndexOf(" G")))); + } else if (Call_API == "네이버") return DateTime.ParseExact(date, "yyyyMMdd", null).ToString("yyyy-MM-dd"); else diff --git a/unimarc/unimarc/Debug/unimarc.msi b/unimarc/unimarc/Debug/unimarc.msi index 7b0c7a3..3b3b985 100644 Binary files a/unimarc/unimarc/Debug/unimarc.msi and b/unimarc/unimarc/Debug/unimarc.msi differ