diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index d1edc50..0e100d0 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 5fe4e0f..d757a4f 100644 --- a/ISBN_Check_test/Form1.cs +++ b/ISBN_Check_test/Form1.cs @@ -414,7 +414,7 @@ namespace ISBN_Check_test dataGridView1.Rows[idx].Cells["isbn"].Value = value[3]; dataGridView1.Rows[idx].Cells["price2"].Value = value[4]; dataGridView1.Rows[idx].Cells["pubDate"].Value = date; - dataGridView1.Rows[idx].Cells["category"].Value = value[6]; + // dataGridView1.Rows[idx].Cells["category"].Value = value[6]; dataGridView1.Rows[idx].Cells["sold_out"].Value = value[7]; dataGridView1.Rows[idx].DefaultCellStyle.BackColor = Color.Yellow; } diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.application b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application index f411750..dc64d73 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 @@ - wjX6r3plG+yTrBIZAUqcqdQgCON28Rd47mUKHRO2Z4s= + CgbIZnUjssit8y6t+EAt55rGxs4o0TtMtdzqi/E0ZiA= diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe index 786e563..5f4c330 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 9a37095..94e6761 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 @@ - - + + - 0uxqdLPzFta15wECGfRk6pivmDhGXS/qCxP2Slz66Xo= + 26I68qk5+pdnq63FZakhlY3H6G+jd4YooVj5T9Bo48M= @@ -80,7 +80,7 @@ - ZwoRldoYLUV2EmnRuE80N/hvT+kdSXd14q9iHUQ9zok= + drAdbbhGMvFMED147eUmveO80z+f/8nN25buc3TGKnc= \ 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 b09546b..19f5533 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 0ed763c..f00c2a3 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 f411750..dc64d73 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 @@ - wjX6r3plG+yTrBIZAUqcqdQgCON28Rd47mUKHRO2Z4s= + CgbIZnUjssit8y6t+EAt55rGxs4o0TtMtdzqi/E0ZiA= 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 eee08e5..f5bb0f6 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 786e563..5f4c330 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 9a37095..94e6761 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 @@ - - + + - 0uxqdLPzFta15wECGfRk6pivmDhGXS/qCxP2Slz66Xo= + 26I68qk5+pdnq63FZakhlY3H6G+jd4YooVj5T9Bo48M= @@ -80,7 +80,7 @@ - ZwoRldoYLUV2EmnRuE80N/hvT+kdSXd14q9iHUQ9zok= + drAdbbhGMvFMED147eUmveO80z+f/8nN25buc3TGKnc= \ 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 b09546b..19f5533 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 e744faf..055ba2c 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 00676e3..9b42d91 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 c1c0351..7f0a5bf 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 bfb3c6b..fc4e822 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 701078b..d05edd0 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 93a7289..40a8689 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 00676e3..9b42d91 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 c1c0351..7f0a5bf 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 bfb3c6b..fc4e822 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/납품관리/Commodity_registration.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs index 3ce9a37..8545db1 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs @@ -73,17 +73,6 @@ this.panel1 = new System.Windows.Forms.Panel(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.dataGridView2 = new System.Windows.Forms.DataGridView(); - this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column20 = new System.Windows.Forms.DataGridViewButtonColumn(); - this.chk_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Del_Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.btn_morge = new System.Windows.Forms.Button(); this.btn_Edit = new System.Windows.Forms.Button(); this.btn_Del = new System.Windows.Forms.Button(); @@ -105,6 +94,17 @@ this.rbtn_all = new System.Windows.Forms.RadioButton(); this.panel2 = new System.Windows.Forms.Panel(); this.label14 = new System.Windows.Forms.Label(); + this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pur = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dly = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cout = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tol = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.stat2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid_btn_ISBN = new System.Windows.Forms.DataGridViewButtonColumn(); + this.chk_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid_Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit(); @@ -468,99 +468,26 @@ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column11, - this.Column12, - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17, - this.Column18, - this.Column20, + this.list_date, + this.pur, + this.dly, + this.charge, + this.list_name, + this.cout, + this.tol, + this.stat2, + this.Grid_btn_ISBN, this.chk_marc, - this.Del_Check}); + this.Grid_Check}); this.dataGridView2.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; this.dataGridView2.Location = new System.Drawing.Point(3, 39); this.dataGridView2.Name = "dataGridView2"; this.dataGridView2.RowHeadersWidth = 20; this.dataGridView2.RowTemplate.Height = 23; - this.dataGridView2.Size = new System.Drawing.Size(1073, 217); + this.dataGridView2.Size = new System.Drawing.Size(1083, 217); this.dataGridView2.TabIndex = 29; this.dataGridView2.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView2_CellClick); // - // Column11 - // - this.Column11.HeaderText = "목록일자"; - this.Column11.Name = "Column11"; - this.Column11.Width = 80; - // - // Column12 - // - this.Column12.HeaderText = "거래처명"; - this.Column12.Name = "Column12"; - this.Column12.Width = 180; - // - // Column13 - // - this.Column13.HeaderText = "납품목록"; - this.Column13.Name = "Column13"; - this.Column13.Width = 180; - // - // Column14 - // - this.Column14.HeaderText = "담당자"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "목록번호"; - this.Column15.Name = "Column15"; - this.Column15.Resizable = System.Windows.Forms.DataGridViewTriState.True; - // - // Column16 - // - this.Column16.HeaderText = "수량"; - this.Column16.Name = "Column16"; - this.Column16.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Column16.Width = 50; - // - // Column17 - // - dataGridViewCellStyle6.Format = "N0"; - dataGridViewCellStyle6.NullValue = null; - this.Column17.DefaultCellStyle = dataGridViewCellStyle6; - this.Column17.HeaderText = "합계"; - this.Column17.Name = "Column17"; - // - // Column18 - // - this.Column18.HeaderText = "상태"; - this.Column18.Name = "Column18"; - this.Column18.Width = 50; - // - // Column20 - // - this.Column20.HeaderText = "ISBN조회"; - this.Column20.Name = "Column20"; - this.Column20.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Column20.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // chk_marc - // - this.chk_marc.HeaderText = "MarcCheck"; - this.chk_marc.Name = "chk_marc"; - this.chk_marc.ReadOnly = true; - this.chk_marc.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.chk_marc.Visible = false; - // - // Del_Check - // - this.Del_Check.HeaderText = "체크"; - this.Del_Check.Name = "Del_Check"; - this.Del_Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Del_Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.Del_Check.Width = 40; - // // btn_morge // this.btn_morge.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -760,6 +687,81 @@ this.label14.TabIndex = 22; this.label14.Text = "작업\n대상"; // + // list_date + // + this.list_date.HeaderText = "목록일자"; + this.list_date.Name = "list_date"; + this.list_date.Width = 70; + // + // pur + // + this.pur.HeaderText = "거래처명"; + this.pur.Name = "pur"; + this.pur.Width = 150; + // + // dly + // + this.dly.HeaderText = "납품목록"; + this.dly.Name = "dly"; + this.dly.Width = 150; + // + // charge + // + this.charge.HeaderText = "담당자"; + this.charge.Name = "charge"; + // + // list_name + // + this.list_name.HeaderText = "목록명"; + this.list_name.Name = "list_name"; + this.list_name.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.list_name.Width = 250; + // + // cout + // + this.cout.HeaderText = "수량"; + this.cout.Name = "cout"; + this.cout.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.cout.Width = 50; + // + // tol + // + dataGridViewCellStyle6.Format = "N0"; + dataGridViewCellStyle6.NullValue = null; + this.tol.DefaultCellStyle = dataGridViewCellStyle6; + this.tol.HeaderText = "합계"; + this.tol.Name = "tol"; + this.tol.Width = 80; + // + // stat2 + // + this.stat2.HeaderText = "상태"; + this.stat2.Name = "stat2"; + this.stat2.Width = 50; + // + // Grid_btn_ISBN + // + this.Grid_btn_ISBN.HeaderText = "ISBN조회"; + this.Grid_btn_ISBN.Name = "Grid_btn_ISBN"; + this.Grid_btn_ISBN.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Grid_btn_ISBN.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // chk_marc + // + this.chk_marc.HeaderText = "MarcCheck"; + this.chk_marc.Name = "chk_marc"; + this.chk_marc.ReadOnly = true; + this.chk_marc.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.chk_marc.Visible = false; + // + // Grid_Check + // + this.Grid_Check.HeaderText = "체크"; + this.Grid_Check.Name = "Grid_Check"; + this.Grid_Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Grid_Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.Grid_Check.Width = 40; + // // Commodity_registration // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -855,17 +857,6 @@ private System.Windows.Forms.RadioButton rbtn_all; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Label label14; - private System.Windows.Forms.DataGridViewTextBoxColumn Column11; - private System.Windows.Forms.DataGridViewTextBoxColumn Column12; - private System.Windows.Forms.DataGridViewTextBoxColumn Column13; - private System.Windows.Forms.DataGridViewTextBoxColumn Column14; - private System.Windows.Forms.DataGridViewTextBoxColumn Column15; - private System.Windows.Forms.DataGridViewTextBoxColumn Column16; - private System.Windows.Forms.DataGridViewTextBoxColumn Column17; - private System.Windows.Forms.DataGridViewTextBoxColumn Column18; - private System.Windows.Forms.DataGridViewButtonColumn Column20; - private System.Windows.Forms.DataGridViewTextBoxColumn chk_marc; - private System.Windows.Forms.DataGridViewCheckBoxColumn Del_Check; private System.Windows.Forms.DataGridViewTextBoxColumn header; private System.Windows.Forms.DataGridViewTextBoxColumn num; private System.Windows.Forms.DataGridViewTextBoxColumn book_name; @@ -879,5 +870,16 @@ private System.Windows.Forms.DataGridViewTextBoxColumn order; private System.Windows.Forms.DataGridViewTextBoxColumn stat; private System.Windows.Forms.DataGridViewTextBoxColumn chk_time; + private System.Windows.Forms.DataGridViewTextBoxColumn list_date; + private System.Windows.Forms.DataGridViewTextBoxColumn pur; + private System.Windows.Forms.DataGridViewTextBoxColumn dly; + private System.Windows.Forms.DataGridViewTextBoxColumn charge; + private System.Windows.Forms.DataGridViewTextBoxColumn list_name; + private System.Windows.Forms.DataGridViewTextBoxColumn cout; + private System.Windows.Forms.DataGridViewTextBoxColumn tol; + private System.Windows.Forms.DataGridViewTextBoxColumn stat2; + private System.Windows.Forms.DataGridViewButtonColumn Grid_btn_ISBN; + private System.Windows.Forms.DataGridViewTextBoxColumn chk_marc; + private System.Windows.Forms.DataGridViewCheckBoxColumn Grid_Check; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.cs index de5b479..74d939a 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.cs @@ -10,6 +10,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows.Forms; +using WindowsFormsApp1.Mac; namespace WindowsFormsApp1.Delivery { @@ -263,7 +264,7 @@ namespace WindowsFormsApp1.Delivery { for(int a = 0; a < dataGridView2.Rows.Count; a++) { - bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Del_Check"].Value); + bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Grid_Check"].Value); if (isChecked) { if(cout == 0) { delcout = a; cout++; } @@ -274,9 +275,16 @@ namespace WindowsFormsApp1.Delivery if(cout == 0) { MessageBox.Show("체크된 사항이 없습니다."); return; } else if(cout == 1) { - string deldata = dataGridView2.Rows[delcout].Cells[2].Value.ToString(); - db.DB_Delete("Obj_List", "comp_num", main.com_idx, - "dly", deldata); + string[] del_target = { dataGridView2.Rows[delcout].Cells["list_date"].Value.ToString(), + dataGridView2.Rows[delcout].Cells["list_name"].Value.ToString() }; + string[] del_table = { "date", "list_name" }; + + db.DB_Delete_More_term("Obj_List", "comp_num", main.com_idx, del_table, del_target); + db.DB_Delete_No_Limit("Obj_List_Book", "compidx", comp_idx, del_table, del_target); + + del_table[1] = "connect_data"; + db.DB_Delete_More_term("Obj_List_Marc", "compidx", main.com_idx, del_table, del_target); + dataGridView2.Rows.Remove(dataGridView2.Rows[delcout]); } } @@ -286,7 +294,7 @@ namespace WindowsFormsApp1.Delivery int cout = 0; for (int a = 0; a < dataGridView2.Rows.Count; a++) { - bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Del_Check"].Value); + bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Grid_Check"].Value); if (isChecked) { if (cout == 0) { EditNumber = a; cout++; } @@ -307,7 +315,7 @@ namespace WindowsFormsApp1.Delivery private void Add_Grid(string code) { dataGridView2.Rows.Clear(); - string getdata = "`date`, `clt`, `dly`, `charge`, `list_num`, " + + string getdata = "`date`, `clt`, `dly`, `charge`, `list_name`, " + "`vol`, `total`, `state`, `chk_marc`"; string[] othertable = { "comp_num", "state" }; string[] othercol = { main.com_idx, code }; @@ -357,6 +365,7 @@ namespace WindowsFormsApp1.Delivery string[] setData = { comp_idx, "[" + tb_clt1.Text + "]" + tb_dvy1.Text, "", "", "", "", "", "", "", "", "", "", "", start_date.Value.ToString().Substring(0,10) }; + for(int a = 0; a < dataGridView1.Rows.Count; a++) { if (dataGridView1.Rows[a].Cells[2].Value == null || @@ -368,16 +377,23 @@ namespace WindowsFormsApp1.Delivery { dataGridView1.Rows[a].Cells[ea].Value = ""; } - setData[ea + 2] = dataGridView1.Rows[a].Cells[ea].Value.ToString(); + if(dataGridView1.Columns[ea].Name == "unit" || dataGridView1.Columns[ea].Name == "total") { + setData[ea + 2] = dataGridView1.Rows[a].Cells[ea].Value.ToString().Replace(",", ""); + } + else { + setData[ea + 2] = dataGridView1.Rows[a].Cells[ea].Value.ToString(); + } } db.DB_INSERT("Obj_List_Book", DB_col_name, setData); } } private void dataGridView2_CellClick(object sender, DataGridViewCellEventArgs e) { - if (e.ColumnIndex == 9) // ISBN 조회 (버튼 클릭시 ISBN검수 창으로 넘어가야함) + if (dataGridView2.Columns[e.ColumnIndex].Name == "Grid_btn_ISBN") // ISBN 조회 (버튼 클릭시 ISBN검수 창으로 넘어가야함) { - // TODO: 작업진행예정 + Check_ISBN isbn = new Check_ISBN(this); + isbn.list_name = dataGridView2.Rows[e.RowIndex].Cells["list_name"].Value.ToString(); + isbn.Show(); } } private void btn_morge_Click(object sender, EventArgs e) @@ -385,7 +401,7 @@ namespace WindowsFormsApp1.Delivery int cout = 0; for (int a = 0; a < dataGridView2.Rows.Count; a++) { - bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Del_Check"].Value); + bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Grid_Check"].Value); if (isChecked) { if (cout == 0) { MorgeNum[0] = a; cout++; } @@ -413,7 +429,7 @@ namespace WindowsFormsApp1.Delivery { for(int a = 0; a < dataGridView2.Rows.Count; a++) { - bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Del_Check"].Value); + bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Grid_Check"].Value); if (isChecked) { dataGridView2.Rows[a].Cells[7].Value = "진행"; @@ -429,7 +445,7 @@ namespace WindowsFormsApp1.Delivery { for (int a = 0; a < dataGridView2.Rows.Count; a++) { - bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Del_Check"].Value); + bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Grid_Check"].Value); if (isChecked) { dataGridView2.Rows[a].Cells[7].Value = "완료"; @@ -442,7 +458,7 @@ namespace WindowsFormsApp1.Delivery private void btn_lockup_Click(object sender, EventArgs e) { string cmd = "SELECT " + - "`date`,`clt`,`dly`,`charge`,`list_num`," + + "`date`,`clt`,`dly`,`charge`,`list_name`," + "`vol`,`total`,`state`,`chk_marc`" + " from Obj_List WHERE " + "`comp_num` = '" + comp_idx + "' "; diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.resx b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.resx index efe7fcf..9d149e3 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.resx +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.resx @@ -156,37 +156,37 @@ True - + True - + True - + True - + True - + True - + True - + True - + True - + True True - + True diff --git a/unimarc/WindowsFormsApp1/납품관리/List_aggregation.cs b/unimarc/WindowsFormsApp1/납품관리/List_aggregation.cs index 1b5634f..27696f3 100644 --- a/unimarc/WindowsFormsApp1/납품관리/List_aggregation.cs +++ b/unimarc/WindowsFormsApp1/납품관리/List_aggregation.cs @@ -309,7 +309,6 @@ namespace WindowsFormsApp1.Delivery } private void btn_ISBN_Click(object sender, EventArgs e) // ISBN조회 { - // TODO: ISBN조회 창으로 넘어감 Check_ISBN isbn = new Check_ISBN(this); isbn.list_name = tb_list_name.Text; isbn.Show(); diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs index c0d80a8..4d47d8d 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs @@ -261,7 +261,6 @@ namespace WindowsFormsApp1.Delivery } private void tb_search_book_list_KeyDown(object sender, KeyEventArgs e) { - // 폼 새로 띄워서 검색기능활성화해야함. if(e.KeyCode == Keys.Enter) { Order_input_Search search = new Order_input_Search(this); @@ -298,6 +297,7 @@ namespace WindowsFormsApp1.Delivery total += Convert.ToInt32(dataGridView1.Rows[a].Cells["order_count"].Value.ToString()); } } + if (chkIdx.Count < 1) { MessageBox.Show("선택된 도서가 없습니다!"); return; } string[,] inputExcel = new string[chkIdx.Count,7]; string pur = dataGridView1.Rows[chkIdx[0]].Cells["order"].Value.ToString(); for(int a = 0; a < chkIdx.Count; a++) diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.cs index 85e9844..39ece06 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input_Search.cs @@ -70,17 +70,6 @@ namespace WindowsFormsApp1.Delivery string cmd = db.DB_Contains("Purchase", compidx, "sangho", searchText, "`sangho`, `boss`, `jongmok`"); made_grid(cmd); - /* if (searchText == "") { - string cmd = db.DB_Contains("Purchase", compidx, - "", "", "`sangho`, `boss`, `jongmok`"); - made_grid(cmd); - MessageBox.Show(cmd); - } - else { - string cmd = db.DB_Contains("Purchase", compidx, - "sangho", searchText, "`sangho`, `boss`, `jongmok`"); - made_grid(cmd); - } */ } } private void made_grid(string strValue) @@ -140,9 +129,10 @@ namespace WindowsFormsApp1.Delivery string[] tmp_col = { "compidx", "list_name" }; string[] tmp_data = { compidx, dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString() }; - 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); oin.made_grid(cmd, false); oin.tb_search_book_list.Text = tmp_data[1]; diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs index 2e10c59..02092df 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs @@ -18,11 +18,12 @@ namespace WindowsFormsApp1.Mac { Main main; List_aggregation list_agg; + Commodity_registration cr; Helper_DB db = new Helper_DB(); public string compidx; public string list_name = string.Empty; private int rowidx; - private bool save = false; + private bool save = true; public Check_ISBN(Main _main) { InitializeComponent(); @@ -35,6 +36,12 @@ namespace WindowsFormsApp1.Mac list_agg = _list_agg; compidx = list_agg.compidx; } + public Check_ISBN(Commodity_registration _cr) + { + InitializeComponent(); + cr = _cr; + compidx = cr.comp_idx; + } private void Check_ISBN_Load(object sender, EventArgs e) { diff --git a/unimarc/WindowsFormsApp1/마크/Help008Tag.cs b/unimarc/WindowsFormsApp1/마크/Help008Tag.cs index eddcdc1..613f4c8 100644 --- a/unimarc/WindowsFormsApp1/마크/Help008Tag.cs +++ b/unimarc/WindowsFormsApp1/마크/Help008Tag.cs @@ -9,7 +9,7 @@ namespace ExcelTest { class Help008Tag { - public string combo_Change(string Text, string Name, int idx) + public string Combo_Change(string Text, string Name, int idx) { char[] textArray = Text.ToCharArray(); @@ -187,7 +187,7 @@ namespace ExcelTest } return result; } - public bool checkBox_008(string value) + public bool CheckBox_008(string value) { bool result = false; if (value == "1") { result = true; } diff --git a/unimarc/WindowsFormsApp1/마크/Marc.cs b/unimarc/WindowsFormsApp1/마크/Marc.cs index 666d611..6bdb095 100644 --- a/unimarc/WindowsFormsApp1/마크/Marc.cs +++ b/unimarc/WindowsFormsApp1/마크/Marc.cs @@ -124,11 +124,8 @@ namespace ExcelTest { for(int a= 0; a < List_Book.Rows.Count; a++) { - string[] sear_tbl = { "ISBN", "서명", "저자", "출판사" }; - string[] sear_col = { List_Book.Rows[a].Cells["ISBN13"].Value.ToString(), - List_Book.Rows[a].Cells["book_name"].Value.ToString(), - List_Book.Rows[a].Cells["author"].Value.ToString(), - List_Book.Rows[a].Cells["book_comp"].Value.ToString() }; + string[] sear_tbl = { "ISBN" }; + string[] sear_col = { List_Book.Rows[a].Cells["ISBN13"].Value.ToString() }; string Marc = db.More_DB_Search("Marc", sear_tbl, sear_col, "`idx`, `marc`, `grade`"); string[] db_data = Marc.Split('|'); if (db_data.Length < 2) { List_Book.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; } @@ -814,8 +811,7 @@ namespace ExcelTest break; case 88: // TODO: 입력시 코드값?이 출력됨 X쪽의 문제인지 아스키코드의 문제인지 확인 불가. richTextBox1.SelectionColor = Color.Blue; - richTextBox1.SelectedText = "▼"; - richTextBox1.SelectedText = "x"; + richTextBox1.SelectedText = "▼x"; richTextBox1.SelectionColor = Color.Black; break; case 89: @@ -1030,7 +1026,6 @@ namespace ExcelTest else { richTextBox1.SelectionBackColor = Color.Empty; } } } - private void Btn_interlock_Click(object sender, EventArgs e) { // 언어 36 @@ -1169,6 +1164,151 @@ namespace ExcelTest db.DB_INSERT(table_name, Insert_col, Insert_tbl); } } + private void List_Book_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex == -1) { return; } + int row_idx = e.RowIndex; + richTextBox1.Text = ""; + if (!click_Marc(row_idx)) { richTextBox1.Text = Make_Empty(); } + Create_008(); + Color_change("▼"); + Color_change("▲"); + } + private string Make_Empty() + { + // 입력일자 (00-05) + // 발행년유형 (6) + // 발행년1 (07-10) + // 발행년2 (11-14) + // 발행국 (15-17) + + // 삽화표시 (18-21) + // 이용대상자수준 (22) v + // 개별자료형태 (23) v + // 내용형식1 (24) v + // 내용형식2 (25) v + + // 한국대학부호 (26-27) + // 수정레코드 (28) + // 회의간행물 (29) c + // 기념논문집 (30) c + // 색인 (31) + + // 목록전거 (32) + // 문학형식 (33) v + // 전기 (34) v + // 언어 (35-37) v + // 한국정부기관부호 (38-39) + string yyMMdd = DateTime.Now.ToString("yyMMdd"); + string yyyy = DateTime.Now.ToString("yyyy"); + string Empty_008 = yyMMdd + "s" + yyyy + " 000 kor ▲"; + text008.Text = Empty_008.Replace("▲", ""); + data008 = text008.Text; + string Empty_text = "008\t \t" + Empty_008 + "\n020\t \t▲\n" + "056\t \t▲\n" + "100\t \t▲\n" + + "245\t \t▲\n" + "260\t \t▲\n" + "300\t \t▲\n" + + "653\t \t▲\n" + "700\t \t▲\n" + "950\t \t▲\n"; + return Empty_text; + } + bool click_Marc(int row) + { + string Marc_data = List_Book.Rows[row].Cells["db_marc"].Value.ToString(); + if (Marc_data.Length < 3) { return false; } + List TagNum = new List(); + List field = new List(); + Marc_data = Marc_data.Replace("", "▼"); + Marc_data = Marc_data.Replace("", "▲"); + // string leader = Marc_data.Substring(0, 24); + int startidx = 0; + string[] data = Marc_data.Substring(24).Split('▲'); + + // List에 필요한 데이터 집어넣는 작업. + for (int a = 1; a < data.Length - 1; a++) + { + TagNum.Add(data[0].Substring(startidx, 12)); + startidx += 12; + + field.Add(data[a] + "▲"); + } + + // List에 들어간 데이터를 메모장에 출력시키는 작업. + for (int a = 0; a < TagNum.Count; a++) + { + string result = TagNum[a].Substring(0, 3); + if (TagNum[a].Substring(0,3) == "008") { + text008.Text = field[a].Replace("▲", ""); + data008 = text008.Text; + } + else { + } + if (field[a].IndexOf("▼") == -1) { + result += "\t \t" + field[a]; + } + else { + string temp = field[a].Insert(2, "\t"); + result += "\t" + temp; + } + richTextBox1.Text += result + "\n"; + } + return true; + } + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + if (text008.Text.Length < 3) { return; } + + string text = text008.Text; + string comboName = ((ComboBox)sender).Name; + int comboIdx = ((ComboBox)sender).SelectedIndex; + + text008.Text = tag008.Combo_Change(text, comboName, comboIdx); + + Apply_Main_marc(); + } + /// + /// 008text가 메인 텍스트박스에 적용됨. + /// + private void Apply_Main_marc() + { + string text = text008.Text; + richTextBox1.Text = richTextBox1.Text.Replace(data008, text); + data008 = text; + } + private void col008res_TextChanged(object sender, EventArgs e) + { + if (text008.Text.Length < 3) { return; } + string text = text008.Text; + string iText = ((Label)sender).Text; + if (iText.Length < 1) { return; } + char[] textArray = text.ToCharArray(); + char[] inputArray = iText.ToCharArray(); + + switch (((Label)sender).Name) + { + case "col008res": + textArray[26] = inputArray[0]; + textArray[27] = inputArray[1]; + break; + case "gov008res": + textArray[38] = inputArray[0]; + textArray[39] = inputArray[1]; + break; + } + text = new string(textArray); + text008.Text = text; + Apply_Main_marc(); + } + private void input_date_ValueChanged(object sender, EventArgs e) + { + if (text008.Text.Length < 3) { return; } + string date = input_date.Value.ToString(); + date = date.Substring(0, 10); + date = date.Replace("-", ""); + date = date.Remove(0, 2); + + text008.Text = text008.Text.Remove(0, 6); + text008.Text = date + text008.Text; + + Apply_Main_marc(); + } private void Btn_Close_Click(object sender, EventArgs e) { this.Close(); @@ -1290,8 +1430,6 @@ namespace ExcelTest /// public void Create_008() { - //210219s2021 ulk 000 kor ▼ - //0123456789012345678901234567890123456789 string data = text008.Text; if (data == "" || data == null) { return; } @@ -1306,7 +1444,14 @@ namespace ExcelTest * 목록전거 문학형식 전기 언어 한국정부기관부호 */ // 사전에 선언된 string배열에 맞는 데이터를 배정. - Tag008[0] = "20" + data.Substring(0, 6); // 입력일자 (00-05) + int tmp_years = Convert.ToInt32(data.Substring(0, 2)); + int now_years = Convert.ToInt32(DateTime.Now.ToString("yy")); + string century = "20"; + + if (tmp_years > now_years) + century = "19"; + + Tag008[0] = century + data.Substring(0, 6); // 입력일자 (00-05) Tag008[1] = data.Substring(6, 1); // 발행년유형 (6) Tag008[2] = data.Substring(7, 4); // 발행년1 (07-10) Tag008[3] = data.Substring(11, 4); // 발행년2 (11-14) @@ -1340,96 +1485,19 @@ namespace ExcelTest comboBox2.SelectedIndex = tag008.DataType_008(Tag008[7]); // 개별자료형태 comboBox3.SelectedIndex = tag008.Format_008(Tag008[8]); // 내용형식1 comboBox7.SelectedIndex = tag008.Format_008(Tag008[9]); // 내용형식2 - comboBox4.SelectedIndex = tag008.Literary_008(Tag008[16]); // 문학형식 comboBox5.SelectedIndex = tag008.Biography_008(Tag008[17]); // 전기 comboBox6.SelectedIndex = tag008.Language_008(Tag008[18]); // 언어 - checkBox1.Checked = tag008.checkBox_008(Tag008[12]); // 회의간행물 - checkBox2.Checked = tag008.checkBox_008(Tag008[13]); // 기념논문집 + + checkBox1.Checked = tag008.CheckBox_008(Tag008[12]); // 회의간행물 + checkBox2.Checked = tag008.CheckBox_008(Tag008[13]); // 기념논문집 col008res.Text = Tag008[10]; gov008res.Text = Tag008[19]; return; } - /* - /// - /// 008 만드는 함수 - /// - /// - /// - public string Create_008(string strValue) - { - richTextBox2.Text = richTextBox1.Text; - char[] six = { ' ',' ' }; // TODO: 발행년유형 구하는 로직 다시 짜야함. - if (richTextBox1.Text.IndexOf("008") > 0) - { - int cout = richTextBox1.Text.IndexOf("008") + 11; // 발행년유형 - int cc = cout + 26; // 목록전거 - six[0] = richTextBox1.Text[cout]; - six[1] = richTextBox1.Text[cc]; - } - - string result = "008\t \t"; - string[] combo1_res = {" ", "a", "j", "b", "c", - "d", "e", "f", "z" }; - string[] combo2_res = { " ", "d", "f" }; - string[] combo3_res = { " ", "6", "d", "e", "o", - "s", "r", "y", "j", "z", - "m", "g", "l", "v", "w", - "2", "5", "k", "q", "a", - "b", "c", "f", "i", "n", - "t", "p", "u" }; - string[] combo4_res = { " ", "f", "k", "j", "p", - "e", "d", "v", "m", "u", - "l", "s", "t", "w", "h", - "i" }; - string[] combo5_res = { " ", "a", "b", "c", "d" }; - string[] combo6_res = { "kor", "eng", "jpn", "chi", "ger", - "fre", "rus", "spa", "ita", "dut", - "fin", "swe", "por", "nor", "grc", - "cze", "pol", "mul", "may", "mon", - "bur", "vie", "slv", "ara", "afr", - "est", "uzb", "ukr", "mar", "cam", - "tha", "tur", "tuk", "tib", "tag", - "hun" }; - string timenow = DateTime.Now.ToString("yy/MM/dd"); - timenow = timenow.Replace("-", ""); - result += timenow.Replace(" ", ""); // 입력일자(00-05) - - if (six[0] == 's' || six[0] == 'm') { // 발행년유형(6) 발행년1(07-10) 발행년2(11-14) - string tempStr = Regex.Replace(text260c.Text, @"[^0-9]", ""); - if (tempStr.Length == 4) { result += "s" + tempStr + "\t"; } - else if (tempStr.Length == 8) { result += "m" + tempStr; } - } - else { result += six[0]; } - result += tag008.Country_008(text260a.Text); // 발행국(15-17) - result += tag008.Picture_008(text300b.Text); // 삽화표시(18-21) - int Sel = comboBox1.SelectedIndex; - result += combo1_res[Sel]; // 이용대상자수준(22) - Sel = comboBox2.SelectedIndex; - result += combo2_res[Sel]; // 개별자료형태(23) - Sel = comboBox3.SelectedIndex; - result += combo3_res[Sel]; // 내용형식1(24) - Sel = comboBox7.SelectedIndex; - result += combo3_res[Sel]; // 내용형식2(25) - result += col008res.Text + " "; // 한국대학부호(26-27) 수정레코드(28) - if (checkBox1.Checked == true) { result += "1"; } else { result += "0"; } // 회의간행물(29) - if (checkBox2.Checked == true) { result += "1"; } else { result += "0"; } // 기념논문집(30) - if (text504a.Text.Contains("색인") == true) { result += "1"; } else { result += "0"; } // 색인(31) - if (six[1] == ' ' || six[1] == 'a' || six[1] == 'c' || six[1] == 'd') { result += six[1]; } // 목록전거(32) - else { result += "u"; } - Sel = comboBox4.SelectedIndex; - result += combo4_res[Sel]; // 문학형식(33) - Sel = comboBox5.SelectedIndex; - result += combo5_res[Sel]; // 전기(34) - Sel = comboBox6.SelectedIndex; - result += combo6_res[Sel]; // 언어(35-37) - result += gov008res.Text + "▲\n"; // 한국정부기관부호(38-39) - return result; - } - */ /// /// GridView에 다시 집어넣는거 /// @@ -1955,135 +2023,5 @@ namespace ExcelTest GridView505.CurrentCell = null; } - private void List_Book_CellContentClick(object sender, DataGridViewCellEventArgs e) - { - if (e.RowIndex == -1) { return; } - - int row_idx = e.RowIndex; - int col_idx = e.ColumnIndex; - richTextBox1.Text = ""; - click_Marc(row_idx); - Create_008(); - // button3_Click(null, null); - } - void click_Marc(int row) - { - string Marc_data = List_Book.Rows[row].Cells["db_marc"].Value.ToString(); - if (Marc_data.Length < 3) { return; } - List TagNum = new List(); - List field = new List(); - Marc_data = Marc_data.Replace("", "▼"); - Marc_data = Marc_data.Replace("", "▲"); - // string leader = Marc_data.Substring(0, 24); - int startidx = 0; - string[] data = Marc_data.Substring(24).Split('▲'); - - // List에 필요한 데이터 집어넣는 작업. - for (int a = 1; a < data.Length - 1; a++) - { - TagNum.Add(data[0].Substring(startidx, 12)); - startidx += 12; - - field.Add(data[a] + "▲"); - } - - // List에 들어간 데이터를 메모장에 출력시키는 작업. - for (int a = 0; a < TagNum.Count; a++) - { - string result = TagNum[a].Substring(0, 3); - if (TagNum[a].Substring(0,3) == "008") { - text008.Text = field[a].Replace("▲", ""); - data008 = text008.Text; - } - else { - } - if (field[a].IndexOf("▼") == -1) { - result += "\t \t" + field[a]; - } - else { - string temp = field[a].Insert(2, "\t"); - result += "\t" + temp; - } - richTextBox1.Text += result + "\n"; - } - } - private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) - { - if (text008.Text.Length < 3) { return; } - - string text = text008.Text; - string comboName = ((ComboBox)sender).Name; - int comboIdx = ((ComboBox)sender).SelectedIndex; - - text008.Text = tag008.combo_Change(text, comboName, comboIdx); - - Apply_Main_marc(); - - // 입력일자 (00-05) - // 발행년유형 (6) - // 발행년1 (07-10) - // 발행년2 (11-14) - // 발행국 (15-17) - - // 삽화표시 (18-21) - // 이용대상자수준 (22) v - // 개별자료형태 (23) v - // 내용형식1 (24) v - // 내용형식2 (25) v - - // 한국대학부호 (26-27) - // 수정레코드 (28) - // 회의간행물 (29) c - // 기념논문집 (30) c - // 색인 (31) - - // 목록전거 (32) - // 문학형식 (33) v - // 전기 (34) v - // 언어 (35-37) v - // 한국정부기관부호 (38-39) - } - private void Apply_Main_marc() - { - string text = text008.Text; - richTextBox1.Text = richTextBox1.Text.Replace(data008, text); - data008 = text; - } - private void col008res_TextChanged(object sender, EventArgs e) - { - if (text008.Text.Length < 3) { return; } - string text = text008.Text; - string iText = ((Label)sender).Text; - if (iText.Length < 1) { return; } - char[] textArray = text.ToCharArray(); - char[] inputArray = iText.ToCharArray(); - - switch (((Label)sender).Name) - { - case "col008res": - textArray[26] = inputArray[0]; - textArray[27] = inputArray[1]; - break; - case "gov008res": - textArray[38] = inputArray[0]; - textArray[39] = inputArray[1]; - break; - } - text = new string(textArray); - text008.Text = text; - Apply_Main_marc(); - } - private void input_date_ValueChanged(object sender, EventArgs e) - { - string date = input_date.Value.ToString(); - date = date.Substring(0, 10); - date = date.Replace("-", ""); - date = date.Remove(0, 2); - - text008.Text = text008.Text.Remove(0, 6); - text008.Text = date + text008.Text; - - Apply_Main_marc(); - } } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/마크/Marc.designer.cs b/unimarc/WindowsFormsApp1/마크/Marc.designer.cs index 759971b..1be7cdf 100644 --- a/unimarc/WindowsFormsApp1/마크/Marc.designer.cs +++ b/unimarc/WindowsFormsApp1/마크/Marc.designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.button2 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); @@ -142,13 +142,6 @@ this.Btn_Helper = new System.Windows.Forms.Button(); this.Btn_interlock = new System.Windows.Forms.Button(); this.List_Book = new System.Windows.Forms.DataGridView(); - this.btn_Save = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); - this.label4 = new System.Windows.Forms.Label(); - this.text008 = new System.Windows.Forms.TextBox(); - this.panel3 = new System.Windows.Forms.Panel(); - this.btn_close = new System.Windows.Forms.Button(); - this.input_date = new System.Windows.Forms.DateTimePicker(); this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -158,6 +151,13 @@ this.marc_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.db_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_Save = new System.Windows.Forms.Button(); + this.panel2 = new System.Windows.Forms.Panel(); + this.label4 = new System.Windows.Forms.Label(); + this.text008 = new System.Windows.Forms.TextBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.btn_close = new System.Windows.Forms.Button(); + this.input_date = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.GridView020)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.GridView246)).BeginInit(); this.panel1.SuspendLayout(); @@ -227,7 +227,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(378, 18); + this.label1.Location = new System.Drawing.Point(384, 18); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(53, 12); this.label1.TabIndex = 14; @@ -236,7 +236,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(547, 18); + this.label2.Location = new System.Drawing.Point(553, 18); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 206; @@ -246,7 +246,7 @@ // this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(588, 14); + this.comboBox1.Location = new System.Drawing.Point(594, 14); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(79, 20); this.comboBox1.TabIndex = 207; @@ -256,7 +256,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(680, 18); + this.label3.Location = new System.Drawing.Point(686, 18); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(53, 12); this.label3.TabIndex = 206; @@ -266,7 +266,7 @@ // this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(731, 14); + this.comboBox2.Location = new System.Drawing.Point(737, 14); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(79, 20); this.comboBox2.TabIndex = 207; @@ -276,7 +276,7 @@ // label98 // this.label98.AutoSize = true; - this.label98.Location = new System.Drawing.Point(833, 18); + this.label98.Location = new System.Drawing.Point(839, 18); this.label98.Name = "label98"; this.label98.Size = new System.Drawing.Size(53, 12); this.label98.TabIndex = 14; @@ -286,7 +286,7 @@ // this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; - this.comboBox3.Location = new System.Drawing.Point(887, 14); + this.comboBox3.Location = new System.Drawing.Point(893, 14); this.comboBox3.Name = "comboBox3"; this.comboBox3.Size = new System.Drawing.Size(118, 20); this.comboBox3.TabIndex = 207; @@ -296,7 +296,7 @@ // label99 // this.label99.AutoSize = true; - this.label99.Location = new System.Drawing.Point(1130, 18); + this.label99.Location = new System.Drawing.Point(1136, 18); this.label99.Name = "label99"; this.label99.Size = new System.Drawing.Size(29, 12); this.label99.TabIndex = 206; @@ -304,7 +304,7 @@ // // text008col // - this.text008col.Location = new System.Drawing.Point(1159, 14); + this.text008col.Location = new System.Drawing.Point(1165, 14); this.text008col.Name = "text008col"; this.text008col.Size = new System.Drawing.Size(41, 21); this.text008col.TabIndex = 204; @@ -313,7 +313,7 @@ // label100 // this.label100.AutoSize = true; - this.label100.Location = new System.Drawing.Point(632, 40); + this.label100.Location = new System.Drawing.Point(638, 40); this.label100.Name = "label100"; this.label100.Size = new System.Drawing.Size(53, 12); this.label100.TabIndex = 206; @@ -323,7 +323,7 @@ // this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox4.FormattingEnabled = true; - this.comboBox4.Location = new System.Drawing.Point(683, 36); + this.comboBox4.Location = new System.Drawing.Point(689, 36); this.comboBox4.Name = "comboBox4"; this.comboBox4.Size = new System.Drawing.Size(79, 20); this.comboBox4.TabIndex = 207; @@ -333,7 +333,7 @@ // label101 // this.label101.AutoSize = true; - this.label101.Location = new System.Drawing.Point(771, 40); + this.label101.Location = new System.Drawing.Point(777, 40); this.label101.Name = "label101"; this.label101.Size = new System.Drawing.Size(29, 12); this.label101.TabIndex = 206; @@ -343,7 +343,7 @@ // this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox5.FormattingEnabled = true; - this.comboBox5.Location = new System.Drawing.Point(801, 36); + this.comboBox5.Location = new System.Drawing.Point(807, 36); this.comboBox5.Name = "comboBox5"; this.comboBox5.Size = new System.Drawing.Size(101, 20); this.comboBox5.TabIndex = 207; @@ -353,7 +353,7 @@ // label102 // this.label102.AutoSize = true; - this.label102.Location = new System.Drawing.Point(917, 40); + this.label102.Location = new System.Drawing.Point(923, 40); this.label102.Name = "label102"; this.label102.Size = new System.Drawing.Size(29, 12); this.label102.TabIndex = 206; @@ -363,7 +363,7 @@ // this.comboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox6.FormattingEnabled = true; - this.comboBox6.Location = new System.Drawing.Point(947, 36); + this.comboBox6.Location = new System.Drawing.Point(953, 36); this.comboBox6.Name = "comboBox6"; this.comboBox6.Size = new System.Drawing.Size(101, 20); this.comboBox6.TabIndex = 207; @@ -372,7 +372,7 @@ // // text008gov // - this.text008gov.Location = new System.Drawing.Point(1087, 36); + this.text008gov.Location = new System.Drawing.Point(1093, 36); this.text008gov.Name = "text008gov"; this.text008gov.Size = new System.Drawing.Size(41, 21); this.text008gov.TabIndex = 204; @@ -381,7 +381,7 @@ // label103 // this.label103.AutoSize = true; - this.label103.Location = new System.Drawing.Point(1058, 40); + this.label103.Location = new System.Drawing.Point(1064, 40); this.label103.Name = "label103"; this.label103.Size = new System.Drawing.Size(29, 12); this.label103.TabIndex = 206; @@ -1130,7 +1130,7 @@ // this.col008res.AutoSize = true; this.col008res.ForeColor = System.Drawing.Color.Blue; - this.col008res.Location = new System.Drawing.Point(1201, 18); + this.col008res.Location = new System.Drawing.Point(1208, 18); this.col008res.Name = "col008res"; this.col008res.Size = new System.Drawing.Size(13, 12); this.col008res.TabIndex = 206; @@ -1141,7 +1141,7 @@ // this.gov008res.AutoSize = true; this.gov008res.ForeColor = System.Drawing.Color.Blue; - this.gov008res.Location = new System.Drawing.Point(1130, 40); + this.gov008res.Location = new System.Drawing.Point(1136, 40); this.gov008res.Name = "gov008res"; this.gov008res.Size = new System.Drawing.Size(13, 12); this.gov008res.TabIndex = 206; @@ -1151,7 +1151,7 @@ // checkBox1 // this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(380, 38); + this.checkBox1.Location = new System.Drawing.Point(386, 38); this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(112, 16); this.checkBox1.TabIndex = 213; @@ -1162,7 +1162,7 @@ // checkBox2 // this.checkBox2.AutoSize = true; - this.checkBox2.Location = new System.Drawing.Point(504, 38); + this.checkBox2.Location = new System.Drawing.Point(510, 38); this.checkBox2.Name = "checkBox2"; this.checkBox2.Size = new System.Drawing.Size(112, 16); this.checkBox2.TabIndex = 213; @@ -1174,7 +1174,7 @@ // this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox7.FormattingEnabled = true; - this.comboBox7.Location = new System.Drawing.Point(1006, 14); + this.comboBox7.Location = new System.Drawing.Point(1012, 14); this.comboBox7.Name = "comboBox7"; this.comboBox7.Size = new System.Drawing.Size(118, 20); this.comboBox7.TabIndex = 207; @@ -1189,6 +1189,7 @@ this.Btn_Helper.TabIndex = 215; this.Btn_Helper.Text = "도움말"; this.Btn_Helper.UseVisualStyleBackColor = true; + this.Btn_Helper.Visible = false; this.Btn_Helper.Click += new System.EventHandler(this.Btn_Helper_Click); // // Btn_interlock @@ -1206,14 +1207,14 @@ this.List_Book.AllowUserToAddRows = false; this.List_Book.AllowUserToDeleteRows = false; this.List_Book.AllowUserToResizeColumns = 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.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, this.ISBN13, @@ -1225,7 +1226,7 @@ this.db_marc, this.grade}); this.List_Book.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; - this.List_Book.Location = new System.Drawing.Point(2, 14); + this.List_Book.Location = new System.Drawing.Point(6, 18); this.List_Book.MultiSelect = false; this.List_Book.Name = "List_Book"; this.List_Book.ReadOnly = true; @@ -1238,6 +1239,69 @@ this.List_Book.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.List_Book_CellContentClick); this.List_Book.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView8_KeyDown); // + // list_idx + // + this.list_idx.HeaderText = "list_idx"; + this.list_idx.Name = "list_idx"; + this.list_idx.ReadOnly = true; + this.list_idx.Visible = false; + this.list_idx.Width = 30; + // + // ISBN13 + // + this.ISBN13.HeaderText = "ISBN13"; + this.ISBN13.Name = "ISBN13"; + this.ISBN13.ReadOnly = true; + // + // book_name + // + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + this.book_name.ReadOnly = true; + // + // author + // + this.author.HeaderText = "저자"; + this.author.Name = "author"; + this.author.ReadOnly = true; + this.author.Width = 50; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.ReadOnly = true; + this.book_comp.Width = 50; + // + // pay + // + this.pay.HeaderText = "정가"; + this.pay.Name = "pay"; + this.pay.ReadOnly = true; + this.pay.Width = 50; + // + // marc_idx + // + this.marc_idx.HeaderText = "marc_idx"; + this.marc_idx.Name = "marc_idx"; + this.marc_idx.ReadOnly = true; + this.marc_idx.Visible = false; + this.marc_idx.Width = 30; + // + // db_marc + // + this.db_marc.HeaderText = "marc"; + this.db_marc.Name = "db_marc"; + this.db_marc.ReadOnly = true; + this.db_marc.Visible = false; + // + // grade + // + this.grade.HeaderText = "등급"; + this.grade.Name = "grade"; + this.grade.ReadOnly = true; + this.grade.Visible = false; + // // btn_Save // this.btn_Save.Location = new System.Drawing.Point(1233, 39); @@ -1321,11 +1385,11 @@ // // text008 // - this.text008.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.text008.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text008.Location = new System.Drawing.Point(60, 4); this.text008.MaxLength = 40; this.text008.Name = "text008"; - this.text008.Size = new System.Drawing.Size(356, 22); + this.text008.Size = new System.Drawing.Size(356, 21); this.text008.TabIndex = 204; // // panel3 @@ -1333,7 +1397,7 @@ this.panel3.BackColor = System.Drawing.SystemColors.ActiveCaption; this.panel3.Controls.Add(this.text008); this.panel3.Controls.Add(this.label4); - this.panel3.Location = new System.Drawing.Point(380, 60); + this.panel3.Location = new System.Drawing.Point(381, 60); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(430, 30); this.panel3.TabIndex = 219; @@ -1352,80 +1416,17 @@ // this.input_date.CustomFormat = "yyyy-MM-dd"; this.input_date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.input_date.Location = new System.Drawing.Point(437, 14); + this.input_date.Location = new System.Drawing.Point(443, 14); this.input_date.Name = "input_date"; this.input_date.Size = new System.Drawing.Size(91, 21); this.input_date.TabIndex = 220; this.input_date.ValueChanged += new System.EventHandler(this.input_date_ValueChanged); // - // list_idx - // - this.list_idx.HeaderText = "list_idx"; - this.list_idx.Name = "list_idx"; - this.list_idx.ReadOnly = true; - this.list_idx.Visible = false; - this.list_idx.Width = 30; - // - // ISBN13 - // - this.ISBN13.HeaderText = "ISBN13"; - this.ISBN13.Name = "ISBN13"; - this.ISBN13.ReadOnly = true; - // - // book_name - // - this.book_name.HeaderText = "도서명"; - this.book_name.Name = "book_name"; - this.book_name.ReadOnly = true; - // - // author - // - this.author.HeaderText = "저자"; - this.author.Name = "author"; - this.author.ReadOnly = true; - this.author.Width = 50; - // - // book_comp - // - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - this.book_comp.ReadOnly = true; - this.book_comp.Width = 50; - // - // pay - // - this.pay.HeaderText = "정가"; - this.pay.Name = "pay"; - this.pay.ReadOnly = true; - this.pay.Width = 50; - // - // marc_idx - // - this.marc_idx.HeaderText = "marc_idx"; - this.marc_idx.Name = "marc_idx"; - this.marc_idx.ReadOnly = true; - this.marc_idx.Visible = false; - this.marc_idx.Width = 30; - // - // db_marc - // - this.db_marc.HeaderText = "marc"; - this.db_marc.Name = "db_marc"; - this.db_marc.ReadOnly = true; - this.db_marc.Visible = false; - // - // grade - // - this.grade.HeaderText = "등급"; - this.grade.Name = "grade"; - this.grade.ReadOnly = true; - this.grade.Visible = false; - // // Marc // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1339, 753); + this.ClientSize = new System.Drawing.Size(1316, 753); this.Controls.Add(this.input_date); this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); diff --git a/unimarc/WindowsFormsApp1/마크/Marc.resx b/unimarc/WindowsFormsApp1/마크/Marc.resx index 16b4663..e0e778e 100644 --- a/unimarc/WindowsFormsApp1/마크/Marc.resx +++ b/unimarc/WindowsFormsApp1/마크/Marc.resx @@ -129,6 +129,36 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -153,6 +183,18 @@ True + + True + + + True + + + True + + + True + True @@ -177,12 +219,48 @@ True + + True + + + True + + + True + + + True + + + True + + + True + True True + + True + + + True + + + True + + + True + + + True + + + True + True