diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index ed2df48..daae464 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 1a21773..b60d489 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 61bd768..d2c4c4a 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 a6bd691..0c7181d 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 f05fbdc..554fda4 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 6924735..82d6537 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 1a21773..b60d489 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 61bd768..d2c4c4a 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 a6bd691..0c7181d 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 e76afd6..7421cf5 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs @@ -28,10 +28,10 @@ /// 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 dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = 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(); @@ -67,16 +67,6 @@ this.button15 = new System.Windows.Forms.Button(); this.button16 = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.panel1 = new System.Windows.Forms.Panel(); - this.label14 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.tb_search_book_comp = new System.Windows.Forms.TextBox(); - this.tb_search_book_name = new System.Windows.Forms.TextBox(); - this.panel2 = new System.Windows.Forms.Panel(); - this.tb_search_book_list = new System.Windows.Forms.TextBox(); - this.button17 = new System.Windows.Forms.Button(); - this.btn_close = new System.Windows.Forms.Button(); - this.button1 = new System.Windows.Forms.Button(); this.chk = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.order = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.M = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -94,6 +84,17 @@ 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(); + this.tb_search_book_comp = new System.Windows.Forms.TextBox(); + this.tb_search_book_name = new System.Windows.Forms.TextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.tb_search_book_list = new System.Windows.Forms.TextBox(); + this.button17 = new System.Windows.Forms.Button(); + this.btn_close = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -407,14 +408,14 @@ // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle17.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.chk, this.order, @@ -433,24 +434,24 @@ this.send_date, this.num, this.chk_order}); - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle19.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle19; this.dataGridView1.Location = new System.Drawing.Point(9, 142); this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle20.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle20; this.dataGridView1.RowHeadersWidth = 10; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; @@ -460,6 +461,111 @@ this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // + // chk + // + 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; + // + // order + // + this.order.HeaderText = "주문처"; + this.order.Name = "order"; + this.order.Width = 80; + // + // M + // + this.M.HeaderText = "M"; + this.M.Name = "M"; + this.M.Width = 25; + // + // isbn + // + this.isbn.HeaderText = "ISBN13"; + this.isbn.Name = "isbn"; + // + // book_name + // + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + this.book_name.Width = 200; + // + // author + // + this.author.HeaderText = "저자"; + this.author.Name = "author"; + this.author.Width = 80; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + // + // order_count + // + this.order_count.HeaderText = "주문\n수"; + this.order_count.Name = "order_count"; + this.order_count.Width = 50; + // + // count + // + this.count.HeaderText = "원주\n문"; + this.count.Name = "count"; + this.count.Width = 50; + // + // pay + // + this.pay.HeaderText = "정가"; + this.pay.Name = "pay"; + this.pay.Width = 80; + // + // total + // + this.total.HeaderText = "합계"; + this.total.Name = "total"; + this.total.Width = 75; + // + // etc + // + this.etc.HeaderText = "비 고"; + this.etc.Name = "etc"; + // + // list_name + // + this.list_name.HeaderText = "구분"; + this.list_name.Name = "list_name"; + this.list_name.Width = 80; + // + // order_date + // + this.order_date.HeaderText = "주문일자"; + this.order_date.Name = "order_date"; + this.order_date.Width = 80; + // + // send_date + // + this.send_date.HeaderText = "송금일자"; + this.send_date.Name = "send_date"; + this.send_date.Visible = false; + this.send_date.Width = 80; + // + // num + // + this.num.HeaderText = "번호"; + this.num.Name = "num"; + this.num.Width = 50; + // + // chk_order + // + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle18.NullValue = false; + this.chk_order.DefaultCellStyle = dataGridViewCellStyle18; + this.chk_order.HeaderText = "주문선택"; + this.chk_order.Name = "chk_order"; + this.chk_order.Width = 60; + // // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -571,116 +677,20 @@ this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // - // chk + // richTextBox1 // - 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; - // - // order - // - this.order.HeaderText = "주문처"; - this.order.Name = "order"; - this.order.Width = 80; - // - // M - // - this.M.HeaderText = "M"; - this.M.Name = "M"; - this.M.Width = 25; - // - // isbn - // - this.isbn.HeaderText = "ISBN13"; - this.isbn.Name = "isbn"; - // - // book_name - // - this.book_name.HeaderText = "도서명"; - this.book_name.Name = "book_name"; - this.book_name.Width = 200; - // - // author - // - this.author.HeaderText = "저자"; - this.author.Name = "author"; - this.author.Width = 80; - // - // book_comp - // - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - // - // order_count - // - this.order_count.HeaderText = "주문\n수"; - this.order_count.Name = "order_count"; - this.order_count.Width = 50; - // - // count - // - this.count.HeaderText = "원주\n문"; - this.count.Name = "count"; - this.count.Width = 50; - // - // pay - // - this.pay.HeaderText = "정가"; - this.pay.Name = "pay"; - this.pay.Width = 80; - // - // total - // - this.total.HeaderText = "합계"; - this.total.Name = "total"; - this.total.Width = 75; - // - // etc - // - this.etc.HeaderText = "비 고"; - this.etc.Name = "etc"; - // - // list_name - // - this.list_name.HeaderText = "구분"; - this.list_name.Name = "list_name"; - this.list_name.Width = 80; - // - // order_date - // - this.order_date.HeaderText = "주문일자"; - this.order_date.Name = "order_date"; - this.order_date.Width = 80; - // - // send_date - // - this.send_date.HeaderText = "송금일자"; - this.send_date.Name = "send_date"; - this.send_date.Visible = false; - this.send_date.Width = 80; - // - // num - // - this.num.HeaderText = "번호"; - this.num.Name = "num"; - this.num.Width = 50; - // - // chk_order - // - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.NullValue = false; - this.chk_order.DefaultCellStyle = dataGridViewCellStyle2; - this.chk_order.HeaderText = "주문선택"; - this.chk_order.Name = "chk_order"; - this.chk_order.Width = 60; + this.richTextBox1.Location = new System.Drawing.Point(9, 607); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(715, 259); + this.richTextBox1.TabIndex = 51; + this.richTextBox1.Text = ""; // // Order_input // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1305, 634); + this.ClientSize = new System.Drawing.Size(1305, 878); + this.Controls.Add(this.richTextBox1); this.Controls.Add(this.button1); this.Controls.Add(this.btn_close); this.Controls.Add(this.panel2); @@ -779,5 +789,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn send_date; private System.Windows.Forms.DataGridViewTextBoxColumn num; private System.Windows.Forms.DataGridViewCheckBoxColumn chk_order; + private System.Windows.Forms.RichTextBox richTextBox1; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs index 3e8cb22..4742a33 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs @@ -289,26 +289,29 @@ namespace WindowsFormsApp1.Delivery private void button1_Click(object sender, EventArgs e) { List chkIdx = new List(); + int total = 0; for(int a = 0; a < dataGridView1.Rows.Count; a++) { - if (dataGridView1.Rows[a].Cells["chk"].Value.ToString() == "V") + if (dataGridView1.Rows[a].Cells["chk"].Value.ToString() == "O") { chkIdx.Add(a); + total += Convert.ToInt32(dataGridView1.Rows[a].Cells["order_count"].Value.ToString()); } } - string[][] inputExcel = new string[chkIdx.Count][]; + string[,] inputExcel = new string[chkIdx.Count,7]; for(int a = 0; a < chkIdx.Count; a++) { - inputExcel[a][0] = dataGridView1.Rows[chkIdx[0]].Cells["book_comp"].Value.ToString(); // 출판사 - inputExcel[a][1] = dataGridView1.Rows[chkIdx[1]].Cells["book_name"].Value.ToString(); // 도서명 - inputExcel[a][2] = dataGridView1.Rows[chkIdx[2]].Cells["author"].Value.ToString(); // 저자 - inputExcel[a][3] = dataGridView1.Rows[chkIdx[3]].Cells["order_count"].Value.ToString(); // 주문수 - inputExcel[a][4] = dataGridView1.Rows[chkIdx[4]].Cells["pay"].Value.ToString(); // 정가 - inputExcel[a][5] = dataGridView1.Rows[chkIdx[5]].Cells["list_name"].Value.ToString(); // 납품목록명 - inputExcel[a][6] = dataGridView1.Rows[chkIdx[6]].Cells["isbn"].Value.ToString(); // ISBN - } + inputExcel[a, 0] = a.ToString(); + inputExcel[a, 1] = dataGridView1.Rows[chkIdx[a]].Cells["book_comp"].Value.ToString(); + inputExcel[a, 2] = dataGridView1.Rows[chkIdx[a]].Cells["book_name"].Value.ToString(); + inputExcel[a, 3] = dataGridView1.Rows[chkIdx[a]].Cells["author"].Value.ToString(); + inputExcel[a, 4] = dataGridView1.Rows[chkIdx[a]].Cells["order_count"].Value.ToString(); + inputExcel[a, 5] = dataGridView1.Rows[chkIdx[a]].Cells["pay"].Value.ToString(); + inputExcel[a, 6] = dataGridView1.Rows[chkIdx[a]].Cells["list_name"].Value.ToString() + "\n" + + dataGridView1.Rows[chkIdx[a]].Cells["isbn"].Value.ToString(); + } Excel_text ex = new Excel_text(); - ex.mk_Excel_Order(inputExcel); + ex.mk_Excel_Order(inputExcel, total); } } } \ No newline at end of file