diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo
index 553a0a3..0eb163e 100644
Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe
index 655bf74..5fa1b1d 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 161299c..6db8005 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 b513e3d..77eb0e0 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/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
index 72dbcd1..4e26990 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.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe
index 655bf74..5fa1b1d 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 161299c..6db8005 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 b513e3d..77eb0e0 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/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs
index 7fc29d2..c6eaa8f 100644
--- a/unimarc/unimarc/마크/Marc.cs
+++ b/unimarc/unimarc/마크/Marc.cs
@@ -2159,25 +2159,99 @@ namespace ExcelTest
///
/// 메모장 채우기
///
- /// 메모장으로 쓸 RichTextBox
/// [0]:태그번호, [1]:지시기호, [2]:마크내용
private void InputMemo(string[] SplitTag)
{
dataGridView1.Rows.Clear();
+ #region BackUp1
+ /*
string[] Tag =
{
- "020", "041", "056", "082", "245",
- "246", "250", "260", "300", "440",
- "490", "500", "504", "505", "507",
- "520", "521", "525", "536", "546",
- "586", "650", "653", "700", "710",
- "900", "910", "940", "100", "110", "111"
+ "020", "041", "056", "082", "100",
+ "110", "111", "245", "246", "250",
+ "260", "300", "440", "490", "500",
+ "504", "505", "507", "520", "521",
+ "525", "536", "546", "586", "650",
+ "653", "700", "710", "900", "910",
+ "940"
};
-
+
List RemainTag = new List();
- List BlankTag = MakeMarcLine();
+ List BlankTag = MakeMarcLine(); // 칸채우기 변환
+ */
+ #endregion
+ string[] Tag =
+ {
+ "020", "041", "056", "082", "100",
+ "110", "111", "245", "246", "250",
+ "260", "300", "440", "490", "500",
+ "504", "505", "507", "520", "521",
+ "525", "536", "546", "586", "650",
+ "653", "700", "710", "900", "910",
+ "940"
+ };
+
+ List RemainTag = new List();
+ List BlankTag = MakeMarcLine(); // 칸채우기 변환
+
+ foreach (string Content in SplitTag)
+ {
+ if (Content == "")
+ continue;
+
+ string tagNum = Content.Substring(0, 3);
+ bool isCopy = false;
+
+ foreach (string Num in Tag)
+ {
+ if (tagNum == Num) {
+ isCopy = true;
+ break;
+ }
+ }
+
+ if (isCopy)
+ {
+ string AddText = "";
+ foreach (string Blank in BlankTag)
+ {
+ if (Blank.Length < 4)
+ continue;
+
+ string StrNum = Blank.Substring(0, 3);
+ int Num = Convert.ToInt32(StrNum);
+ int tagNumInt = Convert.ToInt32(tagNum);
+
+ if (Num == tagNumInt)
+ {
+ AddText = Blank.Replace("\n", "");
+ AddText = AddText.Replace("▲", "▲\n");
+ break;
+ }
+
+ }
+ if (AddText == "")
+ continue;
+
+ if (AddText.Substring(AddText.Length - 1, 1) == "\n")
+ AddText = AddText.Substring(0, AddText.Length - 1);
+
+ RemainTag.Add(AddText);
+ }
+ else
+ {
+ Content.TrimEnd('\n');
+ RemainTag.Add(Content + "▲");
+ }
+ }
+
+ RemainTag = RemainTag.Distinct().ToList();
+ richTextBox1.Text = string.Join("\n", RemainTag);
+
+ #region BackUp2
+ /*
foreach (string Content in SplitTag)
{
if (Content == "")
@@ -2259,6 +2333,8 @@ namespace ExcelTest
richTextBox1.Text += string.Format("{0}\t{1}\t{2}\n", tag, jisi, marc);
}
+ */
+ #endregion
}
private List MakeMarcLine()
@@ -2442,10 +2518,11 @@ namespace ExcelTest
p246 = dgv.Rows[a].Cells["Text246p"].Value.ToString();
- result += string.Format("246\t{0}\t▼a{1}", Jisi, a246);
+ result += string.Format("246\t{0}\t", Jisi);
- if (b246 != "") result += "▼b" + b246;
if (i246 != "") result += "▼i" + i246;
+ if (a246 != "") result += "▼a" + a246;
+ if (b246 != "") result += "▼b" + b246;
if (n246 != "") result += "▼n" + n246;
if (p246 != "") result += "▼p" + p246;
@@ -2750,13 +2827,13 @@ namespace ExcelTest
string result = "245\t \t";
if (boxText[0] != "") result += "▼a" + boxText[0];
+ if (boxText[1] != "") result += "▼n" + boxText[1];
if (boxText[3] != "") {
string[] splitText245b = boxText[3].Split('▽');
foreach (string text in splitText245b)
result += "▼b" + text;
}
- if (boxText[1] != "") result += "▼n" + boxText[1];
if (boxText[2] != "") result += "▼p" + boxText[2];
if (boxText[4] != "") result += "▼x" + boxText[4];
if (boxText[5] != "") result += "▼d" + boxText[5];
@@ -3339,6 +3416,7 @@ namespace ExcelTest
{
rb_Filter.Checked = false;
rb_Sort.Checked = false;
+
comboBox8.SelectedIndex = 0;
comboBox9.SelectedIndex = 0;
diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs
index 06e294d..0031c01 100644
--- a/unimarc/unimarc/마크/Marc.designer.cs
+++ b/unimarc/unimarc/마크/Marc.designer.cs
@@ -2073,6 +2073,7 @@
this.text586a.Name = "text586a";
this.text586a.Size = new System.Drawing.Size(387, 21);
this.text586a.TabIndex = 267;
+ this.text586a.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FillTextBox_KeyDown);
//
// groupBox2
//
diff --git a/unimarc/unimarc/편의기능/Quick_menu.cs b/unimarc/unimarc/편의기능/Quick_menu.cs
index 7c8e01c..a728998 100644
--- a/unimarc/unimarc/편의기능/Quick_menu.cs
+++ b/unimarc/unimarc/편의기능/Quick_menu.cs
@@ -145,7 +145,6 @@ namespace WindowsFormsApp1.Convenience
if (name == combo.Name)
break;
- count++;
}
if (DetailMenu[count].Items.Count > 0)
@@ -162,10 +161,10 @@ namespace WindowsFormsApp1.Convenience
DetailMenu[count].Items.AddRange(Home);
break;
case 2: // 납품관리
- DetailMenu[count].Items.AddRange(Div);
+ //DetailMenu[count].Items.AddRange(Div);
break;
case 3: // 회계
- DetailMenu[count].Items.AddRange(Acc);
+ //DetailMenu[count].Items.AddRange(Acc);
break;
case 4: // 마크
DetailMenu[count].Items.AddRange(Marc);