=====* UniMarc [0.0151] 버전 업데이트 내용 *=====

** ERP 작업 전면 중단 (마크우선) **

1. 마크 작성 폼 추가.
ㄴ 단일 마크 작성용.
ㄴ 내부 외부 DB검색가능
ㄴ 검색하여 가져온 정보가 외부DB일 경우, 그 정보를 수정하여 본 사업장 DB에 INSERT하게 됨.
ㄴ 반대로 내부 DB일 경우, 본 사업장 DB에 UPDATE.
ㄴ 리셋기능 추가.

unimarc/unimarc/Main.Designer.cs

@@ -126,6 +126,7 @@
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.botUserLabel = new System.Windows.Forms.ToolStripLabel();
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+            this.마크작성 = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.panel1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
@@ -229,49 +230,49 @@
             // 목록등록
             // 
             this.목록등록.Name = "목록등록";
-            this.목록등록.Size = new System.Drawing.Size(166, 22);
+            this.목록등록.Size = new System.Drawing.Size(180, 22);
             this.목록등록.Text = "물품등록";
             this.목록등록.Click += new System.EventHandler(this.물품등록ToolStripMenuItem_Click);
             // 
             // 목록조회
             // 
             this.목록조회.Name = "목록조회";
-            this.목록조회.Size = new System.Drawing.Size(166, 22);
+            this.목록조회.Size = new System.Drawing.Size(180, 22);
             this.목록조회.Text = "목록조회";
             this.목록조회.Click += new System.EventHandler(this.목록등록편의ToolStripMenuItem_Click);
             // 
             // 목록집계
             // 
             this.목록집계.Name = "목록집계";
-            this.목록집계.Size = new System.Drawing.Size(166, 22);
+            this.목록집계.Size = new System.Drawing.Size(180, 22);
             this.목록집계.Text = "목록집계";
             this.목록집계.Click += new System.EventHandler(this.목록집계ToolStripMenuItem_Click);
             // 
             // 주문입력
             // 
             this.주문입력.Name = "주문입력";
-            this.주문입력.Size = new System.Drawing.Size(166, 22);
+            this.주문입력.Size = new System.Drawing.Size(180, 22);
             this.주문입력.Text = "주문입력";
             this.주문입력.Click += new System.EventHandler(this.주문입력ToolStripMenuItem_Click);
             // 
             // 입고작업
             // 
             this.입고작업.Name = "입고작업";
-            this.입고작업.Size = new System.Drawing.Size(166, 22);
+            this.입고작업.Size = new System.Drawing.Size(180, 22);
             this.입고작업.Text = "입고작업";
             this.입고작업.Click += new System.EventHandler(this.매입ToolStripMenuItem_Click);
             // 
             // 재고입력및조회
             // 
             this.재고입력및조회.Name = "재고입력및조회";
-            this.재고입력및조회.Size = new System.Drawing.Size(166, 22);
+            this.재고입력및조회.Size = new System.Drawing.Size(180, 22);
             this.재고입력및조회.Text = "재고입력 및 조회";
             this.재고입력및조회.Click += new System.EventHandler(this.재고입력및조회ToolStripMenuItem_Click);
             // 
             // 반품처리
             // 
             this.반품처리.Name = "반품처리";
-            this.반품처리.Size = new System.Drawing.Size(166, 22);
+            this.반품처리.Size = new System.Drawing.Size(180, 22);
             this.반품처리.Text = "반품처리";
             this.반품처리.Click += new System.EventHandler(this.반품처리ToolStripMenuItem_Click);
             // 
@@ -435,6 +436,7 @@
             // 마크작업
             // 
             this.마크작업.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.마크작성,
             this.마크목록,
             this.소장자료검색,
             this.마크정리,
@@ -491,14 +493,14 @@
             // 마크반입
             // 
             this.마크반입.Name = "마크반입";
-            this.마크반입.Size = new System.Drawing.Size(98, 22);
+            this.마크반입.Size = new System.Drawing.Size(180, 22);
             this.마크반입.Text = "반입";
             this.마크반입.Click += new System.EventHandler(this.반입ToolStripMenuItem_Click);
             // 
             // 마크반출
             // 
             this.마크반출.Name = "마크반출";
-            this.마크반출.Size = new System.Drawing.Size(98, 22);
+            this.마크반출.Size = new System.Drawing.Size(180, 22);
             this.마크반출.Text = "반출";
             this.마크반출.Click += new System.EventHandler(this.반출ToolStripMenuItem_Click);
             // 
@@ -1003,6 +1005,13 @@
             this.botUserLabel.Size = new System.Drawing.Size(43, 22);
             this.botUserLabel.Text = "이용자";
             // 
+            // 마크작성
+            // 
+            this.마크작성.Name = "마크작성";
+            this.마크작성.Size = new System.Drawing.Size(180, 22);
+            this.마크작성.Text = "마크 작성";
+            this.마크작성.Click += new System.EventHandler(this.마크작성ToolStripMenuItem_Click);
+            // 
             // Main
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1128,5 +1137,6 @@
         public System.Windows.Forms.Button ShortCut11;
         private System.Windows.Forms.ToolStripMenuItem 신규사업자등록ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 기존사업자관리ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 마크작성;
     }
 }

unimarc/unimarc/Main.cs

@@ -22,6 +22,7 @@ using WindowsFormsApp1.마크;
 using WindowsFormsApp1.회계;
 using WindowsFormsApp1.납품관리;
 using UniMarc.회계;
+using UniMarc.마크;
 using UniMarc.Properties;
 
 namespace WindowsFormsApp1
@@ -144,7 +145,7 @@ namespace WindowsFormsApp1
             };
 
             Image[] source_Marc = {
-                Resources._3_1_1_마크목록, Resources._3_1_2_소장자료검색, Resources._3_1_3_마크정리, Resources._3_1_4_복본조사, Resources._3_1_5_ISBN조회,
+                Resources._3_1_1_마크작성, Resources._3_1_2_마크목록, Resources._3_1_3_소장자료검색, Resources._3_1_4_마크정리, Resources._3_1_5_복본조사, Resources._3_1_6_ISBN조회,
                 Resources._3_2_1_반입, Resources._3_2_2_반출,
                 Resources._3_3_1_전집관리, Resources._3_3_2_저자기호,
                 Resources._3_4_1_DLS조회입력, Resources._3_4_2_DLS복본조사,
@@ -156,7 +157,7 @@ namespace WindowsFormsApp1
             };
 
             string[] Marc = {
-                "마크 목록", "소장자료검색", "마크 정리", "복본 조사", "ISBN 조회",
+                "마크 추가", "마크 목록", "소장자료검색", "마크 정리", "복본 조사", "ISBN 조회",
                 "반입", "반출",
                 "전집관리", "저자기호",
                 "DLS 조회 입력", "DLS 복본 조사",
@@ -210,18 +211,18 @@ namespace WindowsFormsApp1
             };
 
             string[] Marc = {
-                "마크 목록", "소장자료검색", "마크 정리", "ISBN 조회", "반입",
+                "마크 추가", "마크 목록", "소장자료검색", "마크 정리", "ISBN 조회", "반입",
                 "반출", "복본 조사", "DLS 복본 조사", "마크 수집", "전집관리",
                 "검수", "저자기호", "DLS 조회 입력", "서류작성",
                 "마크통계", "장비관리" };
             ToolStripMenuItem[] MarcT = {
-                마크목록, 소장자료검색, 마크정리, iSBN조회, 마크반입,
+                마크작성, 마크목록, 소장자료검색, 마크정리, iSBN조회, 마크반입,
                 마크반출, 복본조사1, dLS복본조사, 마크수집, 전집관리,
                 검수, 저자기호, DLS조회, 서류작성,
                 마크통계, 장비관리
             };
             ToolStripMenuItem[] TempMarc = {
-                마크작업, 마크작업, 마크작업, 마크작업, 반입및반출,
+                마크작업, 마크작업, 마크작업, 마크작업, 마크작업, 반입및반출,
                 반입및반출, 마크작업, DLS, 부가기능, 부가기능,
                 부가기능, 부가기능, DLS, 마크기타,
                 마크기타, 마크기타
@@ -801,6 +802,7 @@ namespace WindowsFormsApp1
         Set_Macro Mac_set_Macro;
         Nonverbal Mac_nonverbal;
         Job_Order Job_Order;
+        AddMarc AddMarc;
         Mac_List Mac_List;
         Mac_Stat Mac_Stat;
         Marc_Plan Marc_Plan;
@@ -880,6 +882,20 @@ namespace WindowsFormsApp1
             }
         }
 
+        private void 마크작성ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (AddMarc != null)
+                AddMarc.Focus();
+            else
+            {
+                AddMarc = new AddMarc(this);
+                AddMarc.MdiParent = this;
+                AddMarc.WindowState = FormWindowState.Maximized;
+                AddMarc.FormClosed += (o, ea) => AddMarc = null;
+                AddMarc.Show();
+            }
+
+        }
         private void 마크목록ToolStripMenuItem_Click(object sender, EventArgs e)
         {
             if (Mac_List != null)
@@ -1416,5 +1432,6 @@ namespace WindowsFormsApp1
             }
         }
         #endregion
+
     }
 }

unimarc/unimarc/Properties/Resources.Designer.cs

@@ -103,9 +103,9 @@ namespace UniMarc.Properties {
         /// <summary>
         ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
         /// </summary>
-        internal static System.Drawing.Bitmap _3_1_1_마크목록 {
+        internal static System.Drawing.Bitmap _3_1_1_마크작성 {
             get {
-                object obj = ResourceManager.GetObject("3_1_1_마크목록", resourceCulture);
+                object obj = ResourceManager.GetObject("_3_1_1_마크작성", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -113,9 +113,9 @@ namespace UniMarc.Properties {
         /// <summary>
         ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
         /// </summary>
-        internal static System.Drawing.Bitmap _3_1_2_소장자료검색 {
+        internal static System.Drawing.Bitmap _3_1_2_마크목록 {
             get {
-                object obj = ResourceManager.GetObject("3_1_2_소장자료검색", resourceCulture);
+                object obj = ResourceManager.GetObject("_3_1_2_마크목록", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -123,9 +123,9 @@ namespace UniMarc.Properties {
         /// <summary>
         ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
         /// </summary>
-        internal static System.Drawing.Bitmap _3_1_3_마크정리 {
+        internal static System.Drawing.Bitmap _3_1_3_소장자료검색 {
             get {
-                object obj = ResourceManager.GetObject("3_1_3_마크정리", resourceCulture);
+                object obj = ResourceManager.GetObject("_3_1_3_소장자료검색", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -133,9 +133,9 @@ namespace UniMarc.Properties {
         /// <summary>
         ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
         /// </summary>
-        internal static System.Drawing.Bitmap _3_1_4_복본조사 {
+        internal static System.Drawing.Bitmap _3_1_4_마크정리 {
             get {
-                object obj = ResourceManager.GetObject("3_1_4_복본조사", resourceCulture);
+                object obj = ResourceManager.GetObject("_3_1_4_마크정리", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -143,9 +143,19 @@ namespace UniMarc.Properties {
         /// <summary>
         ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
         /// </summary>
-        internal static System.Drawing.Bitmap _3_1_5_ISBN조회 {
+        internal static System.Drawing.Bitmap _3_1_5_복본조사 {
             get {
-                object obj = ResourceManager.GetObject("3_1_5_ISBN조회", resourceCulture);
+                object obj = ResourceManager.GetObject("_3_1_5_복본조사", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
+        internal static System.Drawing.Bitmap _3_1_6_ISBN조회 {
+            get {
+                object obj = ResourceManager.GetObject("_3_1_6_ISBN조회", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }

unimarc/unimarc/Properties/Resources.resx

@@ -127,33 +127,18 @@
   <data name="3_3_2_저자기호" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\3_3_2_저자기호.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="3_1_2_소장자료검색" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3_1_2_소장자료검색.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="3_2_2_반출" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\3_2_2_반출.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="3_1_1_마크목록" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3_1_1_마크목록.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="_1_3_납품처관리" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\1_3_납품처관리.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="3_4_1_DLS조회입력" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\3_4_1_DLS조회입력.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="3_1_3_마크정리" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3_1_3_마크정리.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="_1_1_사업체정보" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\1_1_사업체정보.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="3_1_4_복본조사" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3_1_4_복본조사.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="3_1_5_ISBN조회" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3_1_5_ISBN조회.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="3_5_1_마크통계" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\3_5_1_마크통계.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -166,4 +151,22 @@
   <data name="0_Empty" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\0_Empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="_3_1_1_마크작성" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_1_1_마크작성.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_3_1_2_마크목록" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_1_2_마크목록.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_3_1_3_소장자료검색" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_1_3_소장자료검색.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_3_1_4_마크정리" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_1_4_마크정리.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_3_1_5_복본조사" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_1_5_복본조사.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_3_1_6_ISBN조회" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_1_6_ISBN조회.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

unimarc/unimarc/UniMarc.csproj

@@ -96,6 +96,12 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Reference.svcmap</DependentUpon>
     </Compile>
+    <Compile Include="마크\AddMarc.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="마크\AddMarc.Designer.cs">
+      <DependentUpon>AddMarc.cs</DependentUpon>
+    </Compile>
     <Compile Include="마크\Check_Copy_Login.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -741,6 +747,9 @@
     <Compile Include="작업일지\Work_Log.Designer.cs">
       <DependentUpon>Work_Log.cs</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="마크\AddMarc.resx">
+      <DependentUpon>AddMarc.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="마크\Check_Copy_Login.resx">
       <DependentUpon>Check_Copy_Login.cs</DependentUpon>
     </EmbeddedResource>
@@ -1309,21 +1318,6 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\3_1_1_마크목록.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\3_1_2_소장자료검색.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\3_1_3_마크정리.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\3_1_4_복본조사.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\3_1_5_ISBN조회.png" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\3_2_1_반입.png" />
   </ItemGroup>
@@ -1351,5 +1345,13 @@
   <ItemGroup>
     <None Include="Resources\0_Empty.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\3_1_1_마크작성.png" />
+    <Content Include="Resources\3_1_2_마크목록.png" />
+    <Content Include="Resources\3_1_3_소장자료검색.png" />
+    <Content Include="Resources\3_1_4_마크정리.png" />
+    <Content Include="Resources\3_1_5_복본조사.png" />
+    <Content Include="Resources\3_1_6_ISBN조회.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ae849b4d4d77c5d74963f76c6a300d60041bd741
+7302e0570e54cbccb8701d8479403eeead7b2be4

unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt

@@ -136,3 +136,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.
 C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_Plan_PrintLabel.resources
 C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.ShowDeleteMarc.resources
 C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Check_Copy_Login.resources
+C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.AddMarc.resources

unimarc/unimarc/마크/AddMarc.resx

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btn_Reflesh008.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+  <metadata name="text505n.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text505t.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text505d.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text505e.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Text246Jisi.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Text246i.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Text246a.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Text246b.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Text246n.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Text246p.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CheckSet.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Text020a.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Text020g.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Text020c.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text440a.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text440n.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text440p.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text440vNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text440vTxt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text440x.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text490a.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="text490v.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>32</value>
+  </metadata>
+</root>

unimarc/unimarc/마크/Marc.cs

@@ -274,208 +274,6 @@ namespace ExcelTest
             call = ((RichTextBox)sender).Name;
             richTextBox1.LanguageOption = 0;
 
-            if (e.Alt)
-            {
-                /*
-                if (e.KeyValue == 48 || e.KeyValue == 96)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼0";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-                else if (e.KeyValue == 49 || e.KeyValue == 97)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼1";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-                else if (e.KeyValue == 50 || e.KeyValue == 98)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼2";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-                else if (e.KeyValue == 51 || e.KeyValue == 99)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼3";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-                else if (e.KeyValue == 52 || e.KeyValue == 100)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼4";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-                else if (e.KeyValue == 53 || e.KeyValue == 101)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼5";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-                else if (e.KeyValue == 54 || e.KeyValue == 102)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼6";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-                else if (e.KeyValue == 55 || e.KeyValue == 103)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼7";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-                else if (e.KeyValue == 56 || e.KeyValue == 104)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼8";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-                else if (e.KeyValue == 57 || e.KeyValue == 105)
-                {
-                    richTextBox1.SelectionColor = Color.Blue;
-                    richTextBox1.SelectedText = "▼9";
-                    richTextBox1.SelectionColor = Color.Black;
-                }
-
-                switch (e.KeyValue)
-                {
-                    case 65:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼a";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 66:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼b";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 67:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼c";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 68:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼d";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 69:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼e";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 70:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼f";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 71:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼g";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 72:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼h";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 73:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼i";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 74:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼j";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 75:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼k";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 76:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼l";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 77:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼m";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 78:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼n";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 79:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼o";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 80:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼p";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 81:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼q";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 82:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼r";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 83:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼s";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 84:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼t";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 85:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼u";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 86:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼v";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 87:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼w";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 88:            // TODO: 입력시 코드값?이 출력됨 X쪽의 문제인지 아스키코드의 문제인지 확인 불가.
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = @"▼x";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 89:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼y";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    case 90:
-                        richTextBox1.SelectionColor = Color.Blue;
-                        richTextBox1.SelectedText = "▼z";
-                        richTextBox1.SelectionColor = Color.Black;
-                        break;
-                    default:
-                        break;
-                }
-                */
-            }
-
             if (e.Control) {
                 switch (e.KeyValue)
                 {
@@ -510,7 +308,7 @@ namespace ExcelTest
         }
 
         /// <summary>
-        /// F9~F12로 등급별 세이브 저장
+        /// F9~F12로 등급별 저장
         /// </summary>
         /// <param name="key">F9~F12</param>
         private void SaveGrade(Keys key)
@@ -570,8 +368,8 @@ namespace ExcelTest
         }
         private void Btn_preview_Click(object sender, EventArgs e)
         {
-            Marc_Preview mp = new Marc_Preview(this);
+            Marc_Preview mp = new Marc_Preview();
-            mp.book_data = data_book;
+            mp.isbn = data_book[0];
             mp.richTextBox1.Text = richTextBox1.Text;
             mp.Show();
         }
@@ -583,8 +381,9 @@ namespace ExcelTest
             }
             int TabIndex = tabControl1.SelectedIndex;
             int grade = cb_grade.SelectedIndex;
-            if (TabIndex == 1) {
+            if (TabIndex == 1)
-                MessageBox.Show("칸채우기가 아닌 편집창에서 저장해주세요!");
+            {
+                MessageBox.Show("[칸채우기]가 아닌 [마크 편집] 탭에서 저장해주세요!");
                 return;
             }
             if (grade == 3) {
@@ -1525,7 +1324,7 @@ namespace ExcelTest
 
             MarcCopySelect copySelect = new MarcCopySelect(this);
             copySelect.MarcFormRowIndex = row;
-            copySelect.Init(isbn);
+            copySelect.Init("isbn", isbn);
             copySelect.Show();
         }
 
@@ -3488,7 +3287,7 @@ namespace ExcelTest
                 MessageBox.Show("데이터가 올바르지않습니다.\n245d를 확인해주세요.");
             }
         }
-        #region
+        #region 기본표목 생성 서브 함수
 
         /// <summary>
         /// 245d에서 " 역할어,"를 잘라내는 함수

unimarc/unimarc/마크/Marc.designer.cs

@@ -2545,7 +2545,7 @@
             this.Controls.Add(this.label98);
             this.Controls.Add(this.label1);
             this.Name = "Marc";
-            this.Text = "마크 작성";
+            this.Text = "마크 작업";
             this.Load += new System.EventHandler(this.Marc_Load);
             ((System.ComponentModel.ISupportInitialize)(this.List_Book)).EndInit();
             this.panel3.ResumeLayout(false);

unimarc/unimarc/마크/MarcCopySelect.Designer.cs

@@ -29,22 +29,23 @@ namespace UniMarc.마크
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
             this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.compidx = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.user = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.date = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tag008 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.marc = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.btn_ShowDeleteMarc = new System.Windows.Forms.Button();
+            this.btn_Close = new System.Windows.Forms.Button();
+            this.btn_Delete = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.panel3 = new System.Windows.Forms.Panel();
-            this.btn_Delete = new System.Windows.Forms.Button();
-            this.btn_Close = new System.Windows.Forms.Button();
-            this.btn_ShowDeleteMarc = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -56,18 +57,19 @@ namespace UniMarc.마크
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
             this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.idx,
             this.compidx,
+            this.isbn,
             this.user,
             this.date,
             this.grade,
@@ -78,10 +80,11 @@ namespace UniMarc.마크
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.ReadOnly = true;
             this.dataGridView1.RowTemplate.Height = 23;
-            this.dataGridView1.Size = new System.Drawing.Size(720, 106);
+            this.dataGridView1.Size = new System.Drawing.Size(809, 106);
             this.dataGridView1.TabIndex = 0;
             this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
             this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
+            this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
             // 
             // idx
             // 
@@ -99,6 +102,12 @@ namespace UniMarc.마크
             this.compidx.Visible = false;
             this.compidx.Width = 40;
             // 
+            // isbn
+            // 
+            this.isbn.HeaderText = "ISBN";
+            this.isbn.Name = "isbn";
+            this.isbn.ReadOnly = true;
+            // 
             // user
             // 
             this.user.HeaderText = "수정자";
@@ -143,59 +152,9 @@ namespace UniMarc.마크
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(720, 33);
+            this.panel1.Size = new System.Drawing.Size(809, 33);
             this.panel1.TabIndex = 1;
             // 
-            // panel2
-            // 
-            this.panel2.Controls.Add(this.dataGridView1);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel2.Location = new System.Drawing.Point(0, 33);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(720, 106);
-            this.panel2.TabIndex = 2;
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.BackColor = System.Drawing.Color.LightGray;
-            this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.richTextBox1.Font = new System.Drawing.Font("굴림체", 11.25F);
-            this.richTextBox1.Location = new System.Drawing.Point(0, 0);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(720, 540);
-            this.richTextBox1.TabIndex = 0;
-            this.richTextBox1.Text = "";
-            // 
-            // panel3
-            // 
-            this.panel3.Controls.Add(this.richTextBox1);
-            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel3.Location = new System.Drawing.Point(0, 139);
-            this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(720, 540);
-            this.panel3.TabIndex = 3;
-            // 
-            // btn_Delete
-            // 
-            this.btn_Delete.Location = new System.Drawing.Point(561, 4);
-            this.btn_Delete.Name = "btn_Delete";
-            this.btn_Delete.Size = new System.Drawing.Size(75, 23);
-            this.btn_Delete.TabIndex = 0;
-            this.btn_Delete.Text = "마크 삭제";
-            this.btn_Delete.UseVisualStyleBackColor = true;
-            this.btn_Delete.Click += new System.EventHandler(this.btn_Delete_Click);
-            // 
-            // btn_Close
-            // 
-            this.btn_Close.Location = new System.Drawing.Point(639, 4);
-            this.btn_Close.Name = "btn_Close";
-            this.btn_Close.Size = new System.Drawing.Size(75, 23);
-            this.btn_Close.TabIndex = 0;
-            this.btn_Close.Text = "닫   기";
-            this.btn_Close.UseVisualStyleBackColor = true;
-            this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
-            // 
             // btn_ShowDeleteMarc
             // 
             this.btn_ShowDeleteMarc.Location = new System.Drawing.Point(462, 4);
@@ -206,11 +165,61 @@ namespace UniMarc.마크
             this.btn_ShowDeleteMarc.UseVisualStyleBackColor = true;
             this.btn_ShowDeleteMarc.Click += new System.EventHandler(this.btn_ShowDeleteMarc_Click);
             // 
+            // btn_Close
+            // 
+            this.btn_Close.Location = new System.Drawing.Point(639, 4);
+            this.btn_Close.Name = "btn_Close";
+            this.btn_Close.Size = new System.Drawing.Size(75, 23);
+            this.btn_Close.TabIndex = 0;
+            this.btn_Close.Text = "닫   기";
+            this.btn_Close.UseVisualStyleBackColor = true;
+            this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
+            // 
+            // btn_Delete
+            // 
+            this.btn_Delete.Location = new System.Drawing.Point(561, 4);
+            this.btn_Delete.Name = "btn_Delete";
+            this.btn_Delete.Size = new System.Drawing.Size(75, 23);
+            this.btn_Delete.TabIndex = 0;
+            this.btn_Delete.Text = "마크 삭제";
+            this.btn_Delete.UseVisualStyleBackColor = true;
+            this.btn_Delete.Click += new System.EventHandler(this.btn_Delete_Click);
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.dataGridView1);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel2.Location = new System.Drawing.Point(0, 33);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(809, 106);
+            this.panel2.TabIndex = 2;
+            // 
+            // richTextBox1
+            // 
+            this.richTextBox1.BackColor = System.Drawing.Color.LightGray;
+            this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.richTextBox1.Font = new System.Drawing.Font("굴림체", 11.25F);
+            this.richTextBox1.Location = new System.Drawing.Point(0, 0);
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.Size = new System.Drawing.Size(809, 540);
+            this.richTextBox1.TabIndex = 0;
+            this.richTextBox1.Text = "";
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.richTextBox1);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel3.Location = new System.Drawing.Point(0, 139);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(809, 540);
+            this.panel3.TabIndex = 3;
+            // 
             // MarcCopySelect
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(720, 679);
+            this.ClientSize = new System.Drawing.Size(809, 679);
             this.Controls.Add(this.panel3);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
@@ -230,16 +239,17 @@ namespace UniMarc.마크
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Button btn_Close;
+        private System.Windows.Forms.Button btn_Delete;
+        private System.Windows.Forms.Button btn_ShowDeleteMarc;
         private System.Windows.Forms.DataGridViewTextBoxColumn idx;
         private System.Windows.Forms.DataGridViewTextBoxColumn compidx;
+        private System.Windows.Forms.DataGridViewTextBoxColumn isbn;
         private System.Windows.Forms.DataGridViewTextBoxColumn user;
         private System.Windows.Forms.DataGridViewTextBoxColumn date;
         private System.Windows.Forms.DataGridViewTextBoxColumn grade;
         private System.Windows.Forms.DataGridViewTextBoxColumn tag008;
         private System.Windows.Forms.DataGridViewTextBoxColumn marc;
-        private System.Windows.Forms.Panel panel3;
-        private System.Windows.Forms.Button btn_Close;
-        private System.Windows.Forms.Button btn_Delete;
-        private System.Windows.Forms.Button btn_ShowDeleteMarc;
     }
 }

unimarc/unimarc/마크/MarcCopySelect.cs

@@ -16,6 +16,7 @@ namespace UniMarc.마크
     {
         Helper_DB db = new Helper_DB();
         Marc m;
+        AddMarc am;
         public int MarcFormRowIndex;
 
         public MarcCopySelect()
@@ -29,16 +30,22 @@ namespace UniMarc.마크
             m = _m;
         }
 
-        public void Init(string isbn)
+        public MarcCopySelect(AddMarc _am)
+        {
+            InitializeComponent();
+            am = _am;
+        }
+
+        public void Init(string search_col, string search_Target)
         {
             db.DBcon();
                           // 0 1 2 3 4 5
-            string Area = "`idx`, `compidx`, `user`, `date`, `grade`, `008tag`, " +
+            string Area = "`idx`, `compidx`, `ISBN`, `user`, `date`, `grade`, `008tag`, " +
                           // 6 7 8 9 10 11
                           "`marc`, `marc_chk`, `marc1`, `marc_chk1`, `marc2`, `marc_chk2`";
             string Table = "Marc";
 
-            string Query = string.Format("SELECT {0} FROM {1} WHERE isbn = \"{2}\";", Area, Table, isbn);
+            string Query = string.Format("SELECT {0} FROM {1} WHERE `{2}` = \"{3}\";", Area, Table, search_col, search_Target);
             string Result = db.DB_Send_CMD_Search(Query);
             string[] GridData = Result.Split('|');
 
@@ -47,50 +54,47 @@ namespace UniMarc.마크
 
         private void InputGrid(string[] Value)
         {
-            string[] Grid = {
+            string[] Grid = { "", "", "", "", "", "", "", "" };
-                "", "", "", "", "", "", ""
-            };
-
             string[] MarcData = { "", "", "", "", "", "" };
-
+        
             for (int a = 0; a < Value.Length; a++)
             {
-                if (a % 12 == 0)    Grid[0] = Value[a];       // idx
+                if (a % 13 == 0)    Grid[0] = Value[a];       // idx
-                if (a % 12 == 1)    Grid[1] = Value[a];       // compidx
+                if (a % 13 == 1)    Grid[1] = Value[a];       // compidx
-                if (a % 12 == 2)    Grid[2] = Value[a];       // user
+                if (a % 13 == 2)    Grid[2] = Value[a];       // isbn
-                if (a % 12 == 3)    Grid[3] = Value[a];       // date
+                if (a % 13 == 3)    Grid[3] = Value[a];       // user
-                if (a % 12 == 4)    Grid[4] = ChangeGrade(Value[a]);       // grade
+                if (a % 13 == 4)    Grid[4] = Value[a];       // date
-                if (a % 12 == 5)    Grid[5] = Value[a];       // 008tag
+                if (a % 13 == 5)    Grid[5] = ChangeGrade(Value[a]);       // grade
-                if (a % 12 == 6)    MarcData[0] = Value[a];   // marc
+                if (a % 13 == 6)    Grid[6] = Value[a];       // 008tag
-                if (a % 12 == 7)    MarcData[1] = Value[a];   // marc_chk
+                if (a % 13 == 7)    MarcData[0] = Value[a];   // marc
-                if (a % 12 == 8)    MarcData[2] = Value[a];   // marc1
+                if (a % 13 == 8)    MarcData[1] = Value[a];   // marc_chk
-                if (a % 12 == 9)    MarcData[3] = Value[a];   // marc_chk1
+                if (a % 13 == 9)    MarcData[2] = Value[a];   // marc1
-                if (a % 12 == 10)   MarcData[4] = Value[a];   // marc2
+                if (a % 13 == 10)   MarcData[3] = Value[a];   // marc_chk1
-                if (a % 12 == 11) { MarcData[5] = Value[a];   // marc_chk2
+                if (a % 13 == 11)   MarcData[4] = Value[a];   // marc2
-                    Grid[6] = RealMarc(MarcData);
+                if (a % 13 == 12) { MarcData[5] = Value[a];   // marc_chk2
+                    Grid[7] = RealMarc(MarcData);
                     dataGridView1.Rows.Add(Grid);
                 }
             }
-
+        
             for (int a = 0; a < dataGridView1.Rows.Count; a++)
             {
                 string compidx = dataGridView1.Rows[a].Cells["compidx"].Value.ToString();
                 string grade = dataGridView1.Rows[a].Cells["grade"].Value.ToString();
                 string savedate = dataGridView1.Rows[a].Cells["date"].Value.ToString();
-
+        
                 bool isMyData = true;
-
+        
                 if (compidx != Properties.Settings.Default.compidx) { 
                     isMyData = false;
                     string FindCompCmd = string.Format("SELECT `comp_name` FROM `Comp` WHERE `idx` = {0}", compidx);
                     dataGridView1.Rows[a].Cells["user"].Value = db.DB_Send_CMD_Search(FindCompCmd).Replace("|", "");
                     dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.LightGray;
                 }
-
+        
                 dataGridView1.Rows[a].DefaultCellStyle.ForeColor = SetGradeColor(grade, isMyData);
                 SaveDataCheck(savedate, a);
             }
-            
         }
 
         private string ChangeGrade(string Grade)
@@ -129,13 +133,10 @@ namespace UniMarc.마크
             {
                 case "A":
                     return Color.Blue;
-
                 case "B":
                     return Color.Black;
-
                 case "C":
                     return Color.Gray;
-
                 case "D":
                     return Color.Red;
 
@@ -243,7 +244,11 @@ namespace UniMarc.마크
         private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
             int row = e.RowIndex;
+            SelectMarc(row);
+        }
 
+        void SelectMarc(int row)
+        {
             string[] GridData = {
                 dataGridView1.Rows[row].Cells["idx"].Value.ToString(),
                 dataGridView1.Rows[row].Cells["compidx"].Value.ToString(),
@@ -254,7 +259,14 @@ namespace UniMarc.마크
                 dataGridView1.Rows[row].Cells["marc"].Value.ToString()
             };
 
-            m.SelectMarc_Sub(MarcFormRowIndex, GridData);
+            if (m != null)
+                m.SelectMarc_Sub(MarcFormRowIndex, GridData);
+            if (am != null)
+            {
+                string Marc = richTextBox1.Text;
+                string isbn = dataGridView1.Rows[row].Cells["isbn"].Value.ToString();
+                am.SelectMarc_Sub(Marc, isbn, GridData);
+            }
 
             this.Close();
         }
@@ -332,5 +344,18 @@ namespace UniMarc.마크
             ShowDeleteMarc showDeleteMarc = new ShowDeleteMarc();
             showDeleteMarc.Show();
         }
+
+        private void dataGridView1_KeyDown(object sender, KeyEventArgs e)
+        {
+
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (dataGridView1.CurrentCell.RowIndex < 0)
+                    return;
+
+                int row = dataGridView1.CurrentCell.RowIndex;
+                SelectMarc(row);
+            }
+        }
     }
 }

unimarc/unimarc/마크/MarcCopySelect.resx

@@ -123,6 +123,9 @@
   <metadata name="compidx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="isbn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="user.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

unimarc/unimarc/마크/Marc_Preview.cs

@@ -13,12 +13,11 @@ namespace UniMarc.마크
 {
     public partial class Marc_Preview : Form
     {
-        /// <summary>
+        public string isbn;
-        /// isbn / 도서명 / 저자 / 출판사 / 가격
+        AddMarc am;
-        /// </summary>
-        public string[] book_data;
         Marc mac;
-        public Marc_Preview(Marc _mac)
+
+        public Marc_Preview()
         {
             InitializeComponent();
         }
@@ -31,7 +30,7 @@ namespace UniMarc.마크
 
         private void btn_Search_Click(object sender, EventArgs e)
         {
-            string Search = book_data[0];
+            string Search = isbn;
 
             KyoBo(Search);
             NationalLibrary(Search);
@@ -104,7 +103,10 @@ namespace UniMarc.마크
 
         private void btn_Save_Click(object sender, EventArgs e)
         {
-            mac.richTextBox1.Text = richTextBox1.Text;
+            if (mac != null)
+                mac.richTextBox1.Text = richTextBox1.Text;
+            else if (am != null)
+                am.richTextBox1.Text = richTextBox1.Text;
         }
 
         /// <summary>

unimarc/unimarc/마크/Marc_memo.cs

@@ -14,11 +14,17 @@ namespace UniMarc.마크
     public partial class Marc_memo : Form
     {
         Marc marc;
+        AddMarc am;
         public Marc_memo(Marc _marc)
         {
             InitializeComponent();
             marc = _marc;
         }
+        public Marc_memo(AddMarc _am)
+        {
+            InitializeComponent();
+            am = _am;
+        }
 
         private void Marc_memo_Load(object sender, EventArgs e)
         {
@@ -51,10 +57,15 @@ namespace UniMarc.마크
                 }
             }
             catch { }
+
             richTextBox1.Text = "";
-            marc.richTextBox1.Text = result.Replace("↔", "");
+
+            if (marc != null)
+                marc.richTextBox1.Text = result.Replace("↔", "");
+            else if (am != null)
+                am.richTextBox1.Text = result.Replace("↔", "");
         }
-        #region
+        #region UniMarc 양식에 맞춰 변경
         string Hana(string text)
         {
             string[] arr = text.Split('\n');

unimarc/unimarc/마크/findNchange.cs

@@ -20,8 +20,15 @@ namespace ExcelTest
         string find = "";
         string change = "";
         String_Text st = new String_Text();
+        AddMarc am;
         Marc mac;
         Marc_memo mmm;
+
+        public findNchange(AddMarc _am)
+        {
+            InitializeComponent();
+            am = _am;
+        }
         public findNchange(Marc _mac)
         {
             InitializeComponent();
@@ -59,6 +66,10 @@ namespace ExcelTest
                 st.Color_change("▼", mac.richTextBox1);
                 st.Color_change("▲", mac.richTextBox1);
             }
+            if (am != null) {
+                st.Color_change("▼", am.richTextBox1);
+                st.Color_change("▲", am.richTextBox1);
+            }
             Close();
         }
 
@@ -70,12 +81,10 @@ namespace ExcelTest
 
         public void textChange(string ftext, string ctext)
         {
-            if (mac != null) {
+            if (mac != null) mac.richTextBox1.Text = mac.richTextBox1.Text.Replace(ftext, ctext);
-                mac.richTextBox1.Text = mac.richTextBox1.Text.Replace(ftext, ctext);
+            if (mmm != null) mmm.richTextBox1.Text = mmm.richTextBox1.Text.Replace(ftext, ctext);
-            }
+            if (am != null) am.richTextBox1.Text = am.richTextBox1.Text.Replace(ftext, ctext);
-            if (mmm != null) {
+            
-                mmm.richTextBox1.Text = mmm.richTextBox1.Text.Replace(ftext, ctext);
-            }
         }
 
         private void textBox1_Click(object sender, EventArgs e)

unimarc/unimarc/편의기능/Quick_menu.cs

@@ -77,7 +77,7 @@ namespace WindowsFormsApp1.Convenience
                 "매출 조회", "매출 집계", "파트타임 관리"
             };
             string[] Marc = {
-                "마크 목록", "소장자료검색", "마크 정리", "ISBN 조회", "반입",
+                "마크 추가", "마크 목록", "소장자료검색", "마크 정리", "ISBN 조회", "반입",
                 "반출", "복본 조사", "DLS 복본 조사", "마크 수집", "전집관리",
                 "검수", "저자기호", "DLS 조회 입력", "서류작성",
                 "마크통계", "장비관리"
@@ -227,7 +227,7 @@ namespace WindowsFormsApp1.Convenience
                 "매출 조회", "매출 집계", "파트타임 관리"
             };
             string[] Marc = {
-                "마크 목록", "소장자료검색", "마크 정리", "복본 조사", "ISBN 조회",
+                "마크 추가", "마크 목록", "소장자료검색", "마크 정리", "복본 조사", "ISBN 조회",
                 "반입", "반출", 
                 "전집관리", "저자기호", "DLS 복본 조사", "DLS 조회 입력",
                 "마크통계"