diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index e88d98e..7eabbfa 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 d757a4f..06c8c16 100644 --- a/ISBN_Check_test/Form1.cs +++ b/ISBN_Check_test/Form1.cs @@ -104,7 +104,8 @@ 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); + // insert_By_Aladin(api.Aladin(query, "ISBN13", param), a); + richTextBox1.Text = api.Aladin(query, "ISBN13", param); } } private void Naver_API(DataGridView gridview, int start, int end) diff --git a/ISBN_Check_test/Form1_Sub.cs b/ISBN_Check_test/Form1_Sub.cs index 832b23c..c3aa8c8 100644 --- a/ISBN_Check_test/Form1_Sub.cs +++ b/ISBN_Check_test/Form1_Sub.cs @@ -45,6 +45,8 @@ namespace ISBN_Check_test StreamReader reader = new StreamReader(stream, Encoding.UTF8); String xml = reader.ReadToEnd(); stream.Close(); + + return xml; // xml형식을 json형식으로 변환 XmlDocument doc = new XmlDocument(); doc.LoadXml(xml); diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.application b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application index dc64d73..bab6e9f 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 @@ - CgbIZnUjssit8y6t+EAt55rGxs4o0TtMtdzqi/E0ZiA= + 8N4/Pl6ig/T8cBz+eEqT6pbz5MtRtdCsvu1zv7PWX2o= diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe index 5f4c330..041d7c3 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 94e6761..8a0cc6a 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 @@ - + @@ -42,14 +42,14 @@ - - + + - 26I68qk5+pdnq63FZakhlY3H6G+jd4YooVj5T9Bo48M= + bdOYkYERRvJUqx91y1qmQjuXv88VCmpYTIG8UBAfmGo= @@ -74,13 +74,13 @@ R+Wg8QGvQVHX8T0ta/qbhH1bXkqY0fRnS3wBV3J0bN8= - + - drAdbbhGMvFMED147eUmveO80z+f/8nN25buc3TGKnc= + ozAby1Nftdrpio9AQip4nUd/wUETl8WqO8llSVov95w= \ 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 19f5533..b2088e6 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 f00c2a3..9edd1f3 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 dc64d73..bab6e9f 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 @@ - CgbIZnUjssit8y6t+EAt55rGxs4o0TtMtdzqi/E0ZiA= + 8N4/Pl6ig/T8cBz+eEqT6pbz5MtRtdCsvu1zv7PWX2o= 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 fb98680..f352976 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 5f4c330..041d7c3 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 94e6761..8a0cc6a 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 @@ - + @@ -42,14 +42,14 @@ - - + + - 26I68qk5+pdnq63FZakhlY3H6G+jd4YooVj5T9Bo48M= + bdOYkYERRvJUqx91y1qmQjuXv88VCmpYTIG8UBAfmGo= @@ -74,13 +74,13 @@ R+Wg8QGvQVHX8T0ta/qbhH1bXkqY0fRnS3wBV3J0bN8= - + - drAdbbhGMvFMED147eUmveO80z+f/8nN25buc3TGKnc= + ozAby1Nftdrpio9AQip4nUd/wUETl8WqO8llSVov95w= \ 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 19f5533..b2088e6 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/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index 585b310..3aa0b5a 100644 Binary files a/unimarc/.vs/WindowsFormsApp1/v16/.suo and b/unimarc/.vs/WindowsFormsApp1/v16/.suo differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index d89c761..0664261 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 460c8e4..f6bf970 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 6fd8cf7..b805014 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/DesignTimeResolveAssemblyReferences.cache b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 8abc4cb..39e6750 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt index 5a73386..291a8ec 100644 --- a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt +++ b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt @@ -375,3 +375,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\Window C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\bin\Debug\System.Numerics.Vectors.dll 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 diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache index 56d1ecf..a1eeb98 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 new file mode 100644 index 0000000..3676da6 Binary files /dev/null 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 d89c761..0664261 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 460c8e4..f6bf970 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 6fd8cf7..b805014 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.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs index 5986989..d2dc5f8 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs @@ -28,10 +28,9 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + 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(); this.label1 = new System.Windows.Forms.Label(); this.tb_search_order = new System.Windows.Forms.TextBox(); this.cb_user = new System.Windows.Forms.ComboBox(); @@ -64,10 +63,10 @@ this.btn_send_chk = new System.Windows.Forms.Button(); this.tb_orderText = new System.Windows.Forms.TextBox(); this.label12 = new System.Windows.Forms.Label(); - this.button15 = new System.Windows.Forms.Button(); - this.button16 = new System.Windows.Forms.Button(); + 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.chk = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.chk = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.order = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.M = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -83,7 +82,6 @@ this.order_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.send_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.chk_order = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.panel1 = new System.Windows.Forms.Panel(); this.label14 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); @@ -91,7 +89,7 @@ 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.button17 = new System.Windows.Forms.Button(); + 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(); @@ -359,7 +357,7 @@ this.btn_order_send.TabIndex = 42; this.btn_order_send.Text = "주문보내기"; this.btn_order_send.UseVisualStyleBackColor = true; - this.btn_order_send.Click += new System.EventHandler(this.button13_Click); + this.btn_order_send.Click += new System.EventHandler(this.btn_order_send_Click); // // btn_send_chk // @@ -388,37 +386,38 @@ this.label12.TabIndex = 43; this.label12.Text = "주문처명"; // - // button15 + // btn_order_list_change // - this.button15.Location = new System.Drawing.Point(1126, 84); - this.button15.Name = "button15"; - this.button15.Size = new System.Drawing.Size(129, 23); - this.button15.TabIndex = 45; - this.button15.Text = "리스트 일괄변경"; - this.button15.UseVisualStyleBackColor = true; + this.btn_order_list_change.Location = new System.Drawing.Point(1126, 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; + this.btn_order_list_change.Text = "리스트 일괄변경"; + this.btn_order_list_change.UseVisualStyleBackColor = true; + this.btn_order_list_change.Click += new System.EventHandler(this.btn_order_list_change_Click); // - // button16 + // btn_order_chk // - this.button16.Location = new System.Drawing.Point(1126, 111); - this.button16.Name = "button16"; - this.button16.Size = new System.Drawing.Size(129, 23); - this.button16.TabIndex = 46; - this.button16.Text = "선택주문 일괄입력"; - this.button16.UseVisualStyleBackColor = true; - this.button16.Click += new System.EventHandler(this.button16_Click); + this.btn_order_chk.Location = new System.Drawing.Point(1126, 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; + this.btn_order_chk.Text = "선택주문 일괄입력"; + this.btn_order_chk.UseVisualStyleBackColor = true; + this.btn_order_chk.Click += new System.EventHandler(this.btn_order_chk_Click); // // dataGridView1 // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + 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; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.chk, this.order, @@ -435,42 +434,41 @@ this.list_name, this.order_date, this.send_date, - this.num, - this.chk_order}); - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle7; + this.num}); + 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.True; + this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.Location = new System.Drawing.Point(9, 142); this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; + 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; + this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.RowHeadersWidth = 10; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.dataGridView1.Size = new System.Drawing.Size(1283, 566); + this.dataGridView1.Size = new System.Drawing.Size(1246, 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); + this.dataGridView1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridView1_DataError); + this.dataGridView1.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dataGridView1_EditingControlShowing); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // // chk // - this.chk.HeaderText = "선택"; + this.chk.HeaderText = "주문선택"; this.chk.Name = "chk"; - this.chk.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.chk.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.chk.Width = 40; + this.chk.Width = 60; // // order // @@ -560,15 +558,6 @@ this.num.Name = "num"; this.num.Width = 50; // - // chk_order - // - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.NullValue = false; - this.chk_order.DefaultCellStyle = dataGridViewCellStyle6; - this.chk_order.HeaderText = "주문선택"; - this.chk_order.Name = "chk_order"; - this.chk_order.Width = 60; - // // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -651,14 +640,15 @@ this.tb_search_book_list.TabIndex = 44; this.tb_search_book_list.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_search_book_list_KeyDown); // - // button17 + // btn_order_empty // - this.button17.Location = new System.Drawing.Point(993, 111); - this.button17.Name = "button17"; - this.button17.Size = new System.Drawing.Size(129, 23); - this.button17.TabIndex = 46; - this.button17.Text = "주문처빈칸 일괄입력"; - this.button17.UseVisualStyleBackColor = true; + this.btn_order_empty.Location = new System.Drawing.Point(993, 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; + this.btn_order_empty.Text = "주문처빈칸 일괄입력"; + this.btn_order_empty.UseVisualStyleBackColor = true; + this.btn_order_empty.Click += new System.EventHandler(this.btn_order_empty_Click); // // btn_close // @@ -684,15 +674,15 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1305, 722); + this.ClientSize = new System.Drawing.Size(1268, 722); this.Controls.Add(this.btn_Excel); this.Controls.Add(this.btn_close); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); this.Controls.Add(this.dataGridView1); - this.Controls.Add(this.button17); - this.Controls.Add(this.button16); - this.Controls.Add(this.button15); + this.Controls.Add(this.btn_order_empty); + this.Controls.Add(this.btn_order_chk); + this.Controls.Add(this.btn_order_list_change); this.Controls.Add(this.tb_orderText); this.Controls.Add(this.label12); this.Controls.Add(this.btn_order_send); @@ -752,11 +742,11 @@ private System.Windows.Forms.Button btn_order_send; private System.Windows.Forms.Button btn_send_chk; private System.Windows.Forms.Label label12; - private System.Windows.Forms.Button button15; - private System.Windows.Forms.Button button16; + private System.Windows.Forms.Button btn_order_list_change; + private System.Windows.Forms.Button btn_order_chk; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.Button button17; + private System.Windows.Forms.Button btn_order_empty; private System.Windows.Forms.Button btn_close; private System.Windows.Forms.Label label14; private System.Windows.Forms.Label label13; @@ -766,7 +756,8 @@ public System.Windows.Forms.DataGridView dataGridView1; public System.Windows.Forms.TextBox tb_orderText; private System.Windows.Forms.Button btn_Excel; - private System.Windows.Forms.DataGridViewTextBoxColumn chk; + private System.Windows.Forms.OpenFileDialog openFileDialog1; + private System.Windows.Forms.DataGridViewCheckBoxColumn chk; private System.Windows.Forms.DataGridViewTextBoxColumn order; private System.Windows.Forms.DataGridViewTextBoxColumn M; private System.Windows.Forms.DataGridViewTextBoxColumn isbn; @@ -782,7 +773,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn order_date; private System.Windows.Forms.DataGridViewTextBoxColumn send_date; private System.Windows.Forms.DataGridViewTextBoxColumn num; - private System.Windows.Forms.DataGridViewCheckBoxColumn chk_order; - private System.Windows.Forms.OpenFileDialog openFileDialog1; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs index 4d47d8d..671d229 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs @@ -109,10 +109,10 @@ namespace WindowsFormsApp1.Delivery { dataGridView1.Rows.Clear(); string[] data = strValue.Split('|'); - string[] mkgrid = {"", "", "", "", "", - "", "", "", "", "", - "", "", "", "", "", - "" }; + string[] mkgrid = { "false", "", "", "", "", + "", "", "", "", "", + "", "", "", "", "", + "" }; /* 선택 / o주문처 / oM / o도서명 / o저자 / * o출판사 / o주문수 / o원주문 / o정가 / o합계 / * o비고 / o납품처 / o주문일자 / o송금일자 / oo번호 / @@ -255,7 +255,7 @@ namespace WindowsFormsApp1.Delivery } else if (chk_mkdate.Contains("." + e.RowIndex + " , ") == false) { - dataGridView1.Rows[e.RowIndex].Cells[13].Value = System.DateTime.Now.ToString("d"); + dataGridView1.Rows[e.RowIndex].Cells[13].Value = DateTime.Now.ToString("d"); chk_mkdate += "." + e.RowIndex + ", "; } } @@ -282,8 +282,20 @@ namespace WindowsFormsApp1.Delivery } private void dataGridView1_KeyDown(object sender, KeyEventArgs e) { - if(ColumnIndex == 1) - tb_orderText_KeyDown(null, e); + int row = dataGridView1.CurrentCell.RowIndex; + int col = dataGridView1.CurrentCell.ColumnIndex; + if (e.KeyCode == Keys.Enter) + { + if (col == 1) { + MessageBox.Show(row.ToString() + " " + col.ToString()); + } + } + if (e.KeyCode == Keys.Delete) { + Skill_Grid sg = new Skill_Grid(); + sg.DataGrid_to_Delete(sender, e); + } + + //tb_orderText_KeyDown(sender, e); } private void btn_Excel_Click(object sender, EventArgs e) { @@ -291,7 +303,7 @@ namespace WindowsFormsApp1.Delivery int total = 0; for(int a = 0; a < dataGridView1.Rows.Count; a++) { - if (dataGridView1.Rows[a].Cells["chk"].Value.ToString() == "O") + if (dataGridView1.Rows[a].Cells["chk"].Value.ToString() == "true") { chkIdx.Add(a); total += Convert.ToInt32(dataGridView1.Rows[a].Cells["order_count"].Value.ToString()); @@ -321,21 +333,7 @@ namespace WindowsFormsApp1.Delivery Excel_text ex = new Excel_text(); ex.mk_Excel_Order(inputExcel, total, compidx, pur); } - private void button16_Click(object sender, EventArgs e) - { - List chkIdx = new List(); - for (int a = 0; a < dataGridView1.Rows.Count; a++) - { - if (dataGridView1.Rows[a].Cells["chk"].Value.ToString() == "O") { - chkIdx.Add(a); - } - } - for(int a= 0; a < chkIdx.Count; a++) - { - dataGridView1.Rows[chkIdx[a]].Cells["order"].Value = tb_orderText.Text; - } - } - private void button13_Click(object sender, EventArgs e) + private void btn_order_send_Click(object sender, EventArgs e) { /* List chkIdx = new List(); @@ -440,7 +438,6 @@ namespace WindowsFormsApp1.Delivery else MessageBox.Show("접속 실패"); // 바로빌 FAX API연동 - db.DB_Update("Comp", "fax_Key", fax.Send_BaroFax(filename, fax_param), "idx", compidx); } if (cb_ordersend.SelectedItem.ToString() == "메일") { @@ -455,5 +452,45 @@ namespace WindowsFormsApp1.Delivery fax.Send_chk_BaroFax(fax_key[0]); } + private void btn_order_list_change_Click(object sender, EventArgs e) + { + for(int a = 0; a < dataGridView1.Rows.Count; a++) + { + dataGridView1.Rows[a].Cells["order"].Value = tb_orderText.Text; + } + } + private void btn_order_chk_Click(object sender, EventArgs e) + { + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["chk"].Value.ToString() == "true") + dataGridView1.Rows[a].Cells["order"].Value = tb_orderText.Text; + } + } + private void btn_order_empty_Click(object sender, EventArgs e) + { + for(int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["order"].Value.ToString() == "") + dataGridView1.Rows[a].Cells["order"].Value = tb_orderText.Text; + } + } + private void dataGridView1_DataError(object sender, DataGridViewDataErrorEventArgs e) + { + + } + private void dataGridView1_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) + { + var txtEdit = (TextBox)e.Control; + txtEdit.KeyDown += EditKeyDown; + } + private void EditKeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + e.SuppressKeyPress = true; + base.OnKeyDown(e); + } + } } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.resx b/unimarc/WindowsFormsApp1/납품관리/Order_input.resx index 873fdb7..1cecdbb 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.resx +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - True @@ -165,9 +162,6 @@ True - - True - 5, 1