diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index daae464..0937796 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 b60d489..4fede2a 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 d2c4c4a..d0fd60d 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 0c7181d..f08d750 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache index 82d6537..5cedfcc 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 b60d489..4fede2a 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 d2c4c4a..d0fd60d 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 0c7181d..f08d750 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs index 4742a33..908df93 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs @@ -206,6 +206,16 @@ namespace WindowsFormsApp1.Delivery check = (CheckBox)(row.Cells[16].Value); } } + if (e.ColumnIndex == 0 && chk_O == false) + { + dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = "O"; + chk_O = true; + } + else if (e.ColumnIndex == 0 && chk_O == true) + { + dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = ""; + chk_O = false; + } } private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { @@ -226,15 +236,8 @@ namespace WindowsFormsApp1.Delivery bl.Show(); return; } - if (e.ColumnIndex == 0 && chk_O == false) + if (e.ColumnIndex == 0) { - dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = "O"; - chk_O = true; - } - else if (e.ColumnIndex == 0 && chk_O == true) - { - dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = ""; - chk_O = false; } else if (e.ColumnIndex == 2 && chk_V == false) { @@ -248,12 +251,12 @@ namespace WindowsFormsApp1.Delivery } else if (chk_mkdate.Contains("." + e.RowIndex + ", ") == true) { - dataGridView1.Rows[e.RowIndex].Cells[12].Value = ""; + dataGridView1.Rows[e.RowIndex].Cells[13].Value = ""; chk_mkdate = chk_mkdate.Replace("." + e.RowIndex + ", ", ""); } else if (chk_mkdate.Contains("." + e.RowIndex + " , ") == false) { - dataGridView1.Rows[e.RowIndex].Cells[12].Value = System.DateTime.Now.ToString("d"); + dataGridView1.Rows[e.RowIndex].Cells[13].Value = System.DateTime.Now.ToString("d"); chk_mkdate += "." + e.RowIndex + ", "; } } @@ -301,13 +304,16 @@ namespace WindowsFormsApp1.Delivery string[,] inputExcel = new string[chkIdx.Count,7]; for(int a = 0; a < chkIdx.Count; a++) { - inputExcel[a, 0] = a.ToString(); + string list = dataGridView1.Rows[chkIdx[a]].Cells["list_name"].Value.ToString(); + string div = list.Substring(list.IndexOf(']')+1); + int num = a + 1; + inputExcel[a, 0] = num.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" + + inputExcel[a, 6] = div + "\n" + dataGridView1.Rows[chkIdx[a]].Cells["isbn"].Value.ToString(); } Excel_text ex = new Excel_text();