diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo
index dac5635..05953bc 100644
Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ
diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo
new file mode 100644
index 0000000..e26ad3e
Binary files /dev/null and b/unimarc/.vs/unimarc/v17/.suo differ
diff --git a/unimarc/UpgradeLog.htm b/unimarc/UpgradeLog.htm
new file mode 100644
index 0000000..b360d70
Binary files /dev/null and b/unimarc/UpgradeLog.htm differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe
index 6cada8d..dc0920e 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb
index 7ecce76..a3e344a 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll
index 48f0918..efbd9c2 100644
Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 46d06a0..3bbe158 100644
Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index cca7e0f..483885c 100644
Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll b/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll
index 9507416..5cb26f5 100644
Binary files a/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll and b/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
index 1b95f61..01af366 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache
index ff1eb17..4131a87 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe
index 6cada8d..dc0920e 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb
index 7ecce76..a3e344a 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll
index 48f0918..efbd9c2 100644
Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/마크/Check_copy.Designer.cs b/unimarc/unimarc/마크/Check_copy.Designer.cs
index 3553d70..927a785 100644
--- a/unimarc/unimarc/마크/Check_copy.Designer.cs
+++ b/unimarc/unimarc/마크/Check_copy.Designer.cs
@@ -42,9 +42,6 @@
this.label1 = new System.Windows.Forms.Label();
this.panel2 = new System.Windows.Forms.Panel();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
- this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.webBrowser1 = new System.Windows.Forms.WebBrowser();
this.btn_ApplyFilter = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
@@ -56,6 +53,9 @@
this.btn_OpenMemo = new System.Windows.Forms.Button();
this.chk_spChar = new System.Windows.Forms.CheckBox();
this.panel5 = new System.Windows.Forms.Panel();
+ this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.SearchCount)).BeginInit();
this.panel2.SuspendLayout();
@@ -224,24 +224,6 @@
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
//
- // book_name
- //
- this.book_name.HeaderText = "도서명(총서명)";
- this.book_name.Name = "book_name";
- this.book_name.Width = 350;
- //
- // book_comp
- //
- this.book_comp.HeaderText = "출판사";
- this.book_comp.Name = "book_comp";
- this.book_comp.Width = 150;
- //
- // Count
- //
- this.Count.HeaderText = "검색 수";
- this.Count.Name = "Count";
- this.Count.Width = 70;
- //
// webBrowser1
//
this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -361,6 +343,27 @@
this.panel5.Size = new System.Drawing.Size(673, 738);
this.panel5.TabIndex = 4;
//
+ // book_name
+ //
+ this.book_name.HeaderText = "도서명(총서명)";
+ this.book_name.Name = "book_name";
+ this.book_name.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ this.book_name.Width = 350;
+ //
+ // book_comp
+ //
+ this.book_comp.HeaderText = "출판사";
+ this.book_comp.Name = "book_comp";
+ this.book_comp.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ this.book_comp.Width = 150;
+ //
+ // Count
+ //
+ this.Count.HeaderText = "검색 수";
+ this.Count.Name = "Count";
+ this.Count.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ this.Count.Width = 70;
+ //
// Check_copy
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -405,14 +408,14 @@
private System.Windows.Forms.Panel panel5;
private System.Windows.Forms.CheckBox chk_spChar;
private System.Windows.Forms.CheckBox chk_RemoveBrit;
- private System.Windows.Forms.DataGridViewTextBoxColumn book_name;
- private System.Windows.Forms.DataGridViewTextBoxColumn book_comp;
- private System.Windows.Forms.DataGridViewTextBoxColumn Count;
public System.Windows.Forms.NumericUpDown SearchCount;
private System.Windows.Forms.RadioButton rb_isNumber;
private System.Windows.Forms.RadioButton rb_isHave;
private System.Windows.Forms.Button btn_GridReset;
private System.Windows.Forms.Button btn_OpenMemo;
private System.Windows.Forms.Button btn_ResultEmpty;
+ private System.Windows.Forms.DataGridViewTextBoxColumn book_name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn book_comp;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Count;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs
index 938155b..3df8133 100644
--- a/unimarc/unimarc/마크/Check_copy.cs
+++ b/unimarc/unimarc/마크/Check_copy.cs
@@ -230,14 +230,17 @@ namespace WindowsFormsApp1.Mac
}
// 전남 도립 TODO: 오류발생 (원인불명) [한번에 3개씩 검색결과가 표출됨]
- // else if (URL.IndexOf("lib.jeonnam.go.kr") > -1)
- // {
- // Delay(500);
- // if (URL.IndexOf("value") > -1)
- // BookCount = 전남도립결과();
- //
- // 전남도립입력(text);
- // }
+
+ /*
+ else if (URL.IndexOf("lib.jeonnam.go.kr") > -1)
+ {
+ Delay(500);
+ if (URL.IndexOf("value") > -1)
+ BookCount = 전남도립결과();
+
+ 전남도립입력(text);
+ }
+ */
// 전남 고흥 (군립중앙, 군립남부, 군립북부 등 총 7개 도서관)
else if (URL.IndexOf("ghlib.go.kr/BookSearch") > -1)
@@ -808,6 +811,7 @@ namespace WindowsFormsApp1.Mac
#endregion
#region 전남 목포
+
bool isMokClick = false;
void 전남목포입력(string text)
diff --git a/unimarc/unimarc/마크/DLS_Copy.cs b/unimarc/unimarc/마크/DLS_Copy.cs
index a586c03..676065b 100644
--- a/unimarc/unimarc/마크/DLS_Copy.cs
+++ b/unimarc/unimarc/마크/DLS_Copy.cs
@@ -175,6 +175,8 @@ namespace WindowsFormsApp1.Mac
string Target = dataGridView1.Rows[a].Cells["Book_name"].Value.ToString();
Check = SearchName(Target);
}
+ if (Check == "0")
+ Check = "";
dataGridView1.Rows[a].Cells["Check"].Value = Check;
}
return true;
@@ -284,9 +286,8 @@ namespace WindowsFormsApp1.Mac
foreach (string code in Area)
{
if (code == dlsArea)
- {
break;
- }
+
idx++;
}
diff --git a/unimarc/unimarc/마크/Mac_List_Add.Designer.cs b/unimarc/unimarc/마크/Mac_List_Add.Designer.cs
index 9ad43db..781a8bd 100644
--- a/unimarc/unimarc/마크/Mac_List_Add.Designer.cs
+++ b/unimarc/unimarc/마크/Mac_List_Add.Designer.cs
@@ -29,13 +29,13 @@ namespace UniMarc.마크
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = 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 dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
this.cb_User = new System.Windows.Forms.ComboBox();
this.btn_Close = new System.Windows.Forms.Button();
@@ -59,6 +59,11 @@ namespace UniMarc.마크
this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Total = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.btn_Upload = new System.Windows.Forms.Button();
+ this.cb_Gubun = new System.Windows.Forms.ComboBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.btn_DelRow = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
@@ -67,6 +72,10 @@ namespace UniMarc.마크
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.label5);
+ this.panel1.Controls.Add(this.cb_Gubun);
+ this.panel1.Controls.Add(this.btn_DelRow);
+ this.panel1.Controls.Add(this.btn_Upload);
this.panel1.Controls.Add(this.cb_User);
this.panel1.Controls.Add(this.btn_Close);
this.panel1.Controls.Add(this.btn_Empty);
@@ -105,7 +114,7 @@ namespace UniMarc.마크
//
// btn_Empty
//
- this.btn_Empty.Location = new System.Drawing.Point(647, 5);
+ this.btn_Empty.Location = new System.Drawing.Point(647, 4);
this.btn_Empty.Name = "btn_Empty";
this.btn_Empty.Size = new System.Drawing.Size(75, 23);
this.btn_Empty.TabIndex = 3;
@@ -197,14 +206,14 @@ namespace UniMarc.마크
this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- 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.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ 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;
+ dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.header,
this.num,
@@ -238,51 +247,53 @@ namespace UniMarc.마크
//
// BookName
//
- dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
- this.BookName.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+ this.BookName.DefaultCellStyle = dataGridViewCellStyle9;
this.BookName.HeaderText = "도서명";
this.BookName.Name = "BookName";
this.BookName.Width = 200;
//
// Author
//
- dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
- this.Author.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+ this.Author.DefaultCellStyle = dataGridViewCellStyle10;
this.Author.HeaderText = "저자";
this.Author.Name = "Author";
//
// BookComp
//
- dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
- this.BookComp.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+ this.BookComp.DefaultCellStyle = dataGridViewCellStyle11;
this.BookComp.HeaderText = "출판사";
this.BookComp.Name = "BookComp";
this.BookComp.Width = 120;
//
// Price
//
- dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
- dataGridViewCellStyle5.Format = "N0";
- dataGridViewCellStyle5.NullValue = "0";
- this.Price.DefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+ dataGridViewCellStyle12.Format = "N0";
+ dataGridViewCellStyle12.NullValue = "0";
+ this.Price.DefaultCellStyle = dataGridViewCellStyle12;
this.Price.HeaderText = "가격";
this.Price.Name = "Price";
this.Price.Width = 80;
//
// Count
//
- dataGridViewCellStyle6.Format = "N0";
- dataGridViewCellStyle6.NullValue = "1";
- this.Count.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+ dataGridViewCellStyle13.Format = "N0";
+ dataGridViewCellStyle13.NullValue = "1";
+ this.Count.DefaultCellStyle = dataGridViewCellStyle13;
this.Count.HeaderText = "수량";
this.Count.Name = "Count";
this.Count.Width = 45;
//
// Total
//
- dataGridViewCellStyle7.Format = "N0";
- dataGridViewCellStyle7.NullValue = "0";
- this.Total.DefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+ dataGridViewCellStyle14.Format = "N0";
+ dataGridViewCellStyle14.NullValue = "0";
+ this.Total.DefaultCellStyle = dataGridViewCellStyle14;
this.Total.HeaderText = "합계";
this.Total.Name = "Total";
this.Total.Width = 80;
@@ -292,6 +303,48 @@ namespace UniMarc.마크
this.ISBN.HeaderText = "ISBN";
this.ISBN.Name = "ISBN";
//
+ // btn_Upload
+ //
+ this.btn_Upload.Location = new System.Drawing.Point(728, 30);
+ this.btn_Upload.Name = "btn_Upload";
+ this.btn_Upload.Size = new System.Drawing.Size(75, 23);
+ this.btn_Upload.TabIndex = 6;
+ this.btn_Upload.Text = "txt불러오기";
+ this.btn_Upload.UseVisualStyleBackColor = true;
+ this.btn_Upload.Click += new System.EventHandler(this.btn_Upload_Click);
+ //
+ // cb_Gubun
+ //
+ this.cb_Gubun.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_Gubun.FormattingEnabled = true;
+ this.cb_Gubun.Location = new System.Drawing.Point(647, 31);
+ this.cb_Gubun.Name = "cb_Gubun";
+ this.cb_Gubun.Size = new System.Drawing.Size(75, 20);
+ this.cb_Gubun.TabIndex = 1;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(592, 35);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(53, 12);
+ this.label5.TabIndex = 1;
+ this.label5.Text = "쉼표구분";
+ //
+ // openFileDialog1
+ //
+ this.openFileDialog1.FileName = "openFileDialog1";
+ //
+ // btn_DelRow
+ //
+ this.btn_DelRow.Location = new System.Drawing.Point(560, 4);
+ this.btn_DelRow.Name = "btn_DelRow";
+ this.btn_DelRow.Size = new System.Drawing.Size(81, 23);
+ this.btn_DelRow.TabIndex = 6;
+ this.btn_DelRow.Text = "선택 셀 삭제";
+ this.btn_DelRow.UseVisualStyleBackColor = true;
+ this.btn_DelRow.Click += new System.EventHandler(this.btn_DelRow_Click);
+ //
// Mac_List_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -335,5 +388,10 @@ namespace UniMarc.마크
private System.Windows.Forms.DataGridViewTextBoxColumn Count;
private System.Windows.Forms.DataGridViewTextBoxColumn Total;
private System.Windows.Forms.DataGridViewTextBoxColumn ISBN;
+ private System.Windows.Forms.Button btn_Upload;
+ private System.Windows.Forms.ComboBox cb_Gubun;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.OpenFileDialog openFileDialog1;
+ private System.Windows.Forms.Button btn_DelRow;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Mac_List_Add.cs b/unimarc/unimarc/마크/Mac_List_Add.cs
index 3420b94..c374697 100644
--- a/unimarc/unimarc/마크/Mac_List_Add.cs
+++ b/unimarc/unimarc/마크/Mac_List_Add.cs
@@ -5,10 +5,12 @@ using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
+using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
using WindowsFormsApp1;
using WindowsFormsApp1.Mac;
+using System.IO;
namespace UniMarc.마크
{
@@ -31,6 +33,9 @@ namespace UniMarc.마크
string compidx = Properties.Settings.Default.compidx;
string MyName = Properties.Settings.Default.User;
+ #region 콤보박스 채우기
+
+ // 담당자
string CompQuery = string.Format("SELECT `comp_name` FROM `Comp` WHERE `idx` = {0}", compidx);
string cmd = string.Format("SELECT `name` FROM `User_Data` WHERE `affil` = ({0});", CompQuery);
string[] cmdResult = db.DB_Send_CMD_Search(cmd).Split('|');
@@ -42,6 +47,12 @@ namespace UniMarc.마크
}
cb_User.SelectedItem = MyName;
+
+ // 쉼표구분
+ string[] Gubun = { "tap", ",", "|" };
+ cb_Gubun.Items.AddRange(Gubun);
+ cb_Gubun.SelectedIndex = 0;
+ #endregion
}
private void Delivery_TextChanged(object sender, EventArgs e)
@@ -165,6 +176,46 @@ namespace UniMarc.마크
#endregion
+ private void btn_Upload_Click(object sender, EventArgs e)
+ {
+ string FilePath = "";
+ openFileDialog1.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
+
+ if (openFileDialog1.ShowDialog() == DialogResult.OK)
+ FilePath = openFileDialog1.FileName;
+
+ string[] textValue = File.ReadAllLines(FilePath);
+ char Gubun = cb_Gubun.Text[0];
+
+ if (textValue.Length < 0)
+ return;
+ try
+ {
+ foreach (string Value in textValue)
+ {
+ string[] grid = Value.Split(Gubun);
+ dataGridView1.Rows.Add(grid);
+ }
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("오류가 발생했습니다.\n" + ex.Message, "Error");
+ }
+ }
+
+ private void btn_DelRow_Click(object sender, EventArgs e)
+ {
+ DialogResult result = MessageBox.Show("삭제하시겠습니까?", "삭제", MessageBoxButtons.YesNo);
+
+ if (result == DialogResult.No) return;
+
+ int row = dataGridView1.CurrentCell.RowIndex;
+
+ if (row < 0) return;
+
+ dataGridView1.Rows.Remove(dataGridView1.Rows[row]);
+ }
+
private void btn_Close_Click(object sender, EventArgs e)
{
this.Close();
diff --git a/unimarc/unimarc/마크/Mac_List_Add.resx b/unimarc/unimarc/마크/Mac_List_Add.resx
index c5e1fd5..17fe864 100644
--- a/unimarc/unimarc/마크/Mac_List_Add.resx
+++ b/unimarc/unimarc/마크/Mac_List_Add.resx
@@ -144,4 +144,10 @@
True
+
+ 10, 8
+
+
+ 35
+
\ No newline at end of file