diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index f0bcd13..ed2df48 100644 Binary files a/unimarc/.vs/WindowsFormsApp1/v16/.suo and b/unimarc/.vs/WindowsFormsApp1/v16/.suo differ diff --git a/unimarc/WindowsFormsApp1/Main.cs b/unimarc/WindowsFormsApp1/Main.cs index ad2ad85..b877c59 100644 --- a/unimarc/WindowsFormsApp1/Main.cs +++ b/unimarc/WindowsFormsApp1/Main.cs @@ -1127,7 +1127,7 @@ namespace WindowsFormsApp1 { // 엑셀 테스트 Excel_text et = new Excel_text(); - et.mk_Excel_Order(); +// et.mk_Excel_Order(); } private void button2_Click(object sender, EventArgs e) diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index f15d78c..1a21773 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 ee19f2d..61bd768 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 3f84849..a6bd691 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 e5bff7e..f05fbdc 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 d98b624..6924735 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 f15d78c..1a21773 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 ee19f2d..61bd768 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 3f84849..a6bd691 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 ef0948e..e76afd6 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 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 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(); this.label1 = new System.Windows.Forms.Label(); this.tb_search_order = new System.Windows.Forms.TextBox(); this.cb_user = new System.Windows.Forms.ComboBox(); @@ -76,9 +76,11 @@ 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(); + this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -91,7 +93,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.list_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.chk_order = new System.Windows.Forms.DataGridViewCheckBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); @@ -406,18 +407,19 @@ // 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, this.M, + this.isbn, this.book_name, this.author, this.book_comp, @@ -430,30 +432,29 @@ this.order_date, this.send_date, this.num, - this.list_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; + 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; 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; + 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; 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, 482); + this.dataGridView1.Size = new System.Drawing.Size(1283, 482); 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); @@ -560,6 +561,16 @@ this.btn_close.UseVisualStyleBackColor = true; this.btn_close.Click += new System.EventHandler(this.btn_close_Click); // + // button1 + // + this.button1.Location = new System.Drawing.Point(818, 111); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 50; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // // chk // this.chk.HeaderText = "선택"; @@ -580,6 +591,11 @@ this.M.Name = "M"; this.M.Width = 25; // + // isbn + // + this.isbn.HeaderText = "ISBN13"; + this.isbn.Name = "isbn"; + // // book_name // this.book_name.HeaderText = "도서명"; @@ -651,17 +667,11 @@ this.num.Name = "num"; this.num.Width = 50; // - // list_num - // - this.list_num.HeaderText = "목록번호"; - this.list_num.Name = "list_num"; - this.list_num.Width = 60; - // // chk_order // - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.NullValue = false; - this.chk_order.DefaultCellStyle = dataGridViewCellStyle6; + 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; @@ -670,7 +680,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1268, 634); + this.ClientSize = new System.Drawing.Size(1305, 634); + this.Controls.Add(this.button1); this.Controls.Add(this.btn_close); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -750,9 +761,11 @@ public System.Windows.Forms.TextBox tb_search_book_list; public System.Windows.Forms.DataGridView dataGridView1; public System.Windows.Forms.TextBox tb_orderText; + private System.Windows.Forms.Button button1; private System.Windows.Forms.DataGridViewTextBoxColumn chk; private System.Windows.Forms.DataGridViewTextBoxColumn order; private System.Windows.Forms.DataGridViewTextBoxColumn M; + private System.Windows.Forms.DataGridViewTextBoxColumn isbn; private System.Windows.Forms.DataGridViewTextBoxColumn book_name; private System.Windows.Forms.DataGridViewTextBoxColumn author; private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; @@ -765,7 +778,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn order_date; private System.Windows.Forms.DataGridViewTextBoxColumn send_date; private System.Windows.Forms.DataGridViewTextBoxColumn num; - private System.Windows.Forms.DataGridViewTextBoxColumn list_num; private System.Windows.Forms.DataGridViewCheckBoxColumn chk_order; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs index d8eba70..3e8cb22 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs @@ -77,9 +77,10 @@ namespace WindowsFormsApp1.Delivery { string[] tmp_col = { "compidx" }; string[] tmp_data = { compidx }; - string takedata = "`order`, `order_stat`, `book_name`, `author`, `book_comp`, " + - "`order_count`, `count`, `pay`, `total`, `etc`, " + - "`list_name`, `order_date`, `send_date`, `header`, `num`"; + string takedata = "`order`, `order_stat`, `isbn`, `book_name`, `author`, " + + "`book_comp`, `order_count`, `count`, `pay`, `total`, " + + "`etc`, `list_name`, `order_date`, `send_date`, `header`, " + + "`num`"; string cmd = db.More_DB_Search("Obj_List_Book", tmp_col, tmp_data, takedata); made_grid(cmd, true); date_Substring(); @@ -99,8 +100,7 @@ namespace WindowsFormsApp1.Delivery dataGridView1.Rows[a].Cells["send_date"].Value = dataGridView1.Rows[a].Cells["send_date"].Value.ToString().Substring(0, 10); } - if (dataGridView1.Rows[a].Cells["book_comp"].Value.ToString().Contains("(주)") == true) - { + if (dataGridView1.Rows[a].Cells["book_comp"].Value.ToString().Contains("(주)") == true) { dataGridView1.Rows[a].Cells["book_comp"].Value = dataGridView1.Rows[a].Cells["book_comp"].Value.ToString().Replace("(주)", ""); } @@ -121,26 +121,27 @@ namespace WindowsFormsApp1.Delivery */ for (int a = 0; a < data.Length; a++) { - if (a % 15 == 0) { mkgrid[1] = data[a]; } // 주문처 - if (a % 15 == 1) { // M + if (a % 16 == 0) { mkgrid[1] = data[a]; } // 주문처 + if (a % 16 == 1) { // M if (data[a] == "0") { data[a] = data[a].Replace("0", ""); } if (data[a] == "1") { data[a] = data[a].Replace("1", "V"); } mkgrid[2] = data[a]; } - if (a % 15 == 2) { mkgrid[3] = data[a]; } // 도서명 - if (a % 15 == 3) { mkgrid[4] = data[a]; } // 저자 - if (a % 15 == 4) { mkgrid[5] = data[a]; } // 출판사 - if (a % 15 == 5) { mkgrid[6] = data[a]; } // 주문수 - if (a % 15 == 6) { mkgrid[7] = data[a]; } // 원주문 - if (a % 15 == 7) { mkgrid[8] = data[a]; } // 정가 - if (a % 15 == 8) { mkgrid[9] = data[a]; } // 합계 - if (a % 15 == 9) { mkgrid[10] = data[a]; } // 비고 - if (a % 15 == 10) { mkgrid[11] = data[a]; } // 납품처 - if (a % 15 == 11) { mkgrid[12] = data[a]; } // 주문일자 - if (a % 15 == 12) { mkgrid[13] = data[a]; } // 송금일자 - if (a % 15 == 13) { mkgrid[14] = data[a]; } // 번호 - if (a % 15 == 14) { // 번호 - mkgrid[14] += " " + data[a]; + if (a % 16 == 2) { mkgrid[3] = data[a]; } // ISBN + if (a % 16 == 3) { mkgrid[4] = data[a]; } // 도서명 + if (a % 16 == 4) { mkgrid[5] = data[a]; } // 저자 + if (a % 16 == 5) { mkgrid[6] = data[a]; } // 출판사 + if (a % 16 == 6) { mkgrid[7] = data[a]; } // 주문수 + if (a % 16 == 7) { mkgrid[8] = data[a]; } // 원주문 + if (a % 16 == 8) { mkgrid[9] = data[a]; } // 정가 + if (a % 16 == 9) { mkgrid[10] = data[a]; } // 합계 + if (a % 16 == 10) { mkgrid[11] = data[a]; } // 비고 + if (a % 16 == 11) { mkgrid[12] = data[a]; } // 납품처 + if (a % 16 == 12) { mkgrid[13] = data[a]; } // 주문일자 + if (a % 16 == 13) { mkgrid[14] = data[a]; } // 송금일자 + if (a % 16 == 14) { mkgrid[15] = data[a]; } // 번호 + if (a % 16 == 15) { // 번호 + mkgrid[15] += " " + data[a]; if (chk == false) { dataGridView1.Rows.Add(mkgrid); } else { if(Array_Inspection(mkgrid) == true) @@ -284,5 +285,30 @@ namespace WindowsFormsApp1.Delivery tb_orderText_KeyDown(null, e); } } + + private void button1_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() == "V") + { + chkIdx.Add(a); + } + } + string[][] inputExcel = new string[chkIdx.Count][]; + 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 + } + Excel_text ex = new Excel_text(); + ex.mk_Excel_Order(inputExcel); + } } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.resx b/unimarc/WindowsFormsApp1/납품관리/Order_input.resx index 977134f..376172a 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.resx +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.resx @@ -126,6 +126,9 @@ True + + True + True @@ -162,9 +165,6 @@ True - - True - True