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

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

1. 로그인
ㄴ> 로그인에 버전별로 업데이트 내역을 볼수있음.

2. DLS
ㄴ> DLS 검색에서 거래처도 같이 검색되던 버그 수정완료.

3. 마크 편집
ㄴ> 마지막 편집날짜가 14일내인 경우 노란색으로 표출되지않는 버그 수정

4. 코리스 마크 가져오기
ㄴ> 마크를 가져오지않던 버그 수정.

5. 매크로
ㄴ> 440a가 괄호 시작일 경우 지시기호 [10] 아니면 [00] 추가
ㄴ> 440 태그 삭제 추가

6. 마크 정리
ㄴ> 검색태그 내 단어 검색 기능 추가.
ㄴ> 검색태그 변경시 적용이 제대로 되지 않던 버그 수정.

7. 미리보기
ㄴ> 교보에서 익스플로러 지원을 끊은 관계로 알라딘으로 대체

unimarc/unimarc/Login.Designer.cs

@@ -36,28 +36,39 @@
             this.label2 = new System.Windows.Forms.Label();
             this.chk_Save = new System.Windows.Forms.CheckBox();
             this.lbl_IP = new System.Windows.Forms.Label();
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.Version = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Content = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.panel1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.panel3.SuspendLayout();
             this.SuspendLayout();
             // 
             // ID_text
             // 
-            this.ID_text.Location = new System.Drawing.Point(190, 57);
+            this.ID_text.Location = new System.Drawing.Point(324, 356);
             this.ID_text.Name = "ID_text";
-            this.ID_text.Size = new System.Drawing.Size(100, 21);
+            this.ID_text.Size = new System.Drawing.Size(144, 21);
             this.ID_text.TabIndex = 1;
             this.ID_text.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ID_text_KeyDown);
             // 
             // PW_text
             // 
-            this.PW_text.Location = new System.Drawing.Point(190, 84);
+            this.PW_text.Location = new System.Drawing.Point(324, 383);
             this.PW_text.Name = "PW_text";
             this.PW_text.PasswordChar = '●';
-            this.PW_text.Size = new System.Drawing.Size(100, 21);
+            this.PW_text.Size = new System.Drawing.Size(144, 21);
             this.PW_text.TabIndex = 2;
             this.PW_text.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PW_text_KeyDown);
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(157, 138);
+            this.button1.Location = new System.Drawing.Point(298, 434);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 23);
             this.button1.TabIndex = 3;
@@ -67,7 +78,7 @@
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(252, 138);
+            this.button2.Location = new System.Drawing.Point(393, 434);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(75, 23);
             this.button2.TabIndex = 4;
@@ -78,25 +89,25 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(136, 61);
+            this.label1.Location = new System.Drawing.Point(298, 360);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 12);
+            this.label1.Size = new System.Drawing.Size(16, 12);
             this.label1.TabIndex = 2;
-            this.label1.Text = "아이디";
+            this.label1.Text = "ID";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(130, 88);
+            this.label2.Location = new System.Drawing.Point(295, 387);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(53, 12);
+            this.label2.Size = new System.Drawing.Size(23, 12);
             this.label2.TabIndex = 2;
-            this.label2.Text = "비밀번호";
+            this.label2.Text = "PW";
             // 
             // chk_Save
             // 
             this.chk_Save.AutoSize = true;
-            this.chk_Save.Location = new System.Drawing.Point(193, 111);
+            this.chk_Save.Location = new System.Drawing.Point(339, 410);
             this.chk_Save.Name = "chk_Save";
             this.chk_Save.Size = new System.Drawing.Size(95, 16);
             this.chk_Save.TabIndex = 6;
@@ -106,21 +117,97 @@
             // lbl_IP
             // 
             this.lbl_IP.AutoSize = true;
-            this.lbl_IP.Location = new System.Drawing.Point(12, 198);
+            this.lbl_IP.Location = new System.Drawing.Point(9, 7);
             this.lbl_IP.Name = "lbl_IP";
             this.lbl_IP.Size = new System.Drawing.Size(40, 12);
             this.lbl_IP.TabIndex = 2;
             this.lbl_IP.Text = "IPv4 : ";
             // 
+            // dataGridView1
+            // 
+            this.dataGridView1.AllowUserToAddRows = false;
+            this.dataGridView1.AllowUserToDeleteRows = false;
+            this.dataGridView1.AllowUserToResizeColumns = false;
+            this.dataGridView1.AllowUserToResizeRows = false;
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.ColumnHeadersVisible = false;
+            this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Version,
+            this.Content});
+            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridView1.Location = new System.Drawing.Point(0, 0);
+            this.dataGridView1.MultiSelect = false;
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.ReadOnly = true;
+            this.dataGridView1.RowHeadersVisible = false;
+            this.dataGridView1.RowTemplate.Height = 23;
+            this.dataGridView1.Size = new System.Drawing.Size(100, 463);
+            this.dataGridView1.TabIndex = 0;
+            this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
+            // 
+            // richTextBox1
+            // 
+            this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.richTextBox1.Location = new System.Drawing.Point(0, 0);
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.Size = new System.Drawing.Size(378, 348);
+            this.richTextBox1.TabIndex = 0;
+            this.richTextBox1.Text = "";
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.lbl_IP);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel1.Location = new System.Drawing.Point(0, 463);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(480, 27);
+            this.panel1.TabIndex = 7;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.dataGridView1);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(100, 463);
+            this.panel2.TabIndex = 8;
+            // 
+            // panel3
+            // 
+            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel3.Controls.Add(this.richTextBox1);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel3.Location = new System.Drawing.Point(100, 0);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(380, 350);
+            this.panel3.TabIndex = 9;
+            // 
+            // Version
+            // 
+            this.Version.HeaderText = "버전";
+            this.Version.Name = "Version";
+            this.Version.ReadOnly = true;
+            this.Version.Width = 80;
+            // 
+            // Content
+            // 
+            this.Content.HeaderText = "내용";
+            this.Content.Name = "Content";
+            this.Content.ReadOnly = true;
+            this.Content.Visible = false;
+            // 
             // login
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(480, 219);
+            this.ClientSize = new System.Drawing.Size(480, 490);
             this.ControlBox = false;
+            this.Controls.Add(this.panel3);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.panel1);
             this.Controls.Add(this.chk_Save);
             this.Controls.Add(this.label2);
-            this.Controls.Add(this.lbl_IP);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.button2);
             this.Controls.Add(this.button1);
@@ -130,6 +217,11 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "로그인";
             this.Load += new System.EventHandler(this.login_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel3.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -145,5 +237,12 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.CheckBox chk_Save;
         private System.Windows.Forms.Label lbl_IP;
+        private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.DataGridView dataGridView1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Version;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Content;
     }
 }

unimarc/unimarc/Login.cs

@@ -34,6 +34,21 @@ namespace WindowsFormsApp1
                 ReadFile();
             }
             db.DBcon();
+            MakeVersionData();
+        }
+
+        private void MakeVersionData()
+        {
+            string[] Res_Ary = db.DB_Send_CMD_Search("SELECT `version`, `content` FROM `Update` ORDER BY `idx` DESC;").Split('|');
+            string[] Grid = { "", "" };
+            for (int a = 0; a < Res_Ary.Length; a++)
+            {
+                if (a % 2 == 0) Grid[0] = "Ver." + Res_Ary[a];
+                if (a % 2 == 1) {
+                    Grid[1]=Res_Ary[a];
+                    dataGridView1.Rows.Add(Grid);
+                }
+            }
         }
 
         private void Login_Click(object sender, EventArgs e)
@@ -165,5 +180,12 @@ namespace WindowsFormsApp1
             if (e.KeyCode == Keys.Enter) { Login_Click(null, null); }
             if (e.KeyCode == Keys.Escape) { this.Close(); }
         }
+
+        private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.RowIndex < 0) return;
+
+            richTextBox1.Text = dataGridView1.Rows[e.RowIndex].Cells["Content"].Value.ToString();
+        }
     }
 }

unimarc/unimarc/Login.resx

@@ -117,4 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="Version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Content.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

unimarc/unimarc/납품관리/Commodity_Search.cs

@@ -87,7 +87,11 @@ namespace WindowsFormsApp1.Delivery
             Helper_DB db = new Helper_DB();
             string Area = "`c_sangho`, `c_boss`, `c_tel`, `c_man`, `c_mantel`, `c_dlsArea`, `c_dlsID`, `c_dlsPW`";
             db.DBcon();
-            string dbcmd = db.DB_Contains("Client", compidx, "c_sangho", Clinet_name, Area);
+            string dbcmd;
+            if (dc != null || sl != null)
+                dbcmd = String.Format("SELECT {0} FROM `Client` WHERE campanyidx = {1} AND c_sangho LIKE \"%{2}%\" AND c_gu LIKE \"%학교%\" OR c_gu = \"유치원\";", Area, compidx, Clinet_name);
+            else
+                dbcmd = db.DB_Contains("Client", compidx, "c_sangho", Clinet_name, Area);
             string dbcon = db.DB_Send_CMD_Search(dbcmd);
             string[] res = dbcon.Split('|');
             string[] grid = { "", "", "", "", "", "", "", "" };

unimarc/unimarc/마크/Mac_List.cs

@@ -299,12 +299,12 @@ namespace WindowsFormsApp1.Mac
                 marc.MdiParent = main;
                 marc.WindowState = FormWindowState.Maximized;
                 marc.Show();
+                marc.input_list(
+                    dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(),
+                    dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx);
                 /// marc.input_list(
                 ///     dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(),
-                ///     dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx);
+                ///     dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString());
-                marc.input_list(
-                dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(),
-                dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString());
             }
             if (((DataGridView)sender).Columns[idx_col].Name == "check")
             {

unimarc/unimarc/마크/Marc.cs

@@ -163,7 +163,9 @@ namespace ExcelTest
             for (int a = 0; a < List_Book.Rows.Count; a++)
             {
                 string Grade = List_Book.Rows[a].Cells["grade"].Value.ToString();
+                string SaveDate = List_Book.Rows[a].Cells["SaveDate"].Value.ToString();
                 List_Book.Rows[a].DefaultCellStyle.ForeColor = SetGradeColor(Grade);
+                SaveDateCheck(SaveDate, a);
             }
 
         }
@@ -983,29 +985,6 @@ namespace ExcelTest
         }
         private string Make_Empty()
         {
-            // 입력일자 (00-05)
-            // 발행년유형 (6)
-            // 발행년1 (07-10)
-            // 발행년2 (11-14)
-            // 발행국 (15-17)
-
-            // 삽화표시 (18-21)
-            // 이용대상자수준 (22) v
-            // 개별자료형태 (23) v
-            // 내용형식1 (24) v
-            // 내용형식2 (25) v
-
-            // 한국대학부호 (26-27)
-            // 수정레코드 (28)
-            // 회의간행물 (29) c
-            // 기념논문집 (30) c
-            // 색인 (31)
-
-            // 목록전거 (32)
-            // 문학형식 (33) v
-            // 전기 (34) v
-            // 언어 (35-37) v
-            // 한국정부기관부호 (38-39)
             string yyMMdd = DateTime.Now.ToString("yyMMdd");
             string yyyy = DateTime.Now.ToString("yyyy");
             string Empty_008 = yyMMdd + "s" + yyyy + "                  000   kor  ▲";
@@ -1526,7 +1505,6 @@ namespace ExcelTest
 
         private void FillTextBox_KeyDown(object sender, KeyEventArgs e)
         {
-
             TextBox tb = sender as TextBox;
 
             if (e.KeyCode == Keys.F3)

unimarc/unimarc/마크/Marc_FillBlank.cs

@@ -238,22 +238,14 @@ namespace UniMarc
             isAll = false;
             marc.richTextBox1.Text = "";
 
+            if (!tb_URL.Text.Contains("searchResultMarc")) {
+                MessageBox.Show("코리스 마크가 있는곳으로 이동해주세요!");
+                return;
+            }
+            SearchResultMarc();
+
             string Text = richTextBox1.Text;
             marc.richTextBox1.Text = MakeMarc(Text);
-            // string[] SplitLine = Text.Split('\n');
-            // 
-            // foreach (string Line in SplitLine)
-            // {
-            //     if (Line == "") break;
-            // 
-            //     // [0]:태그번호, [1]:지시기호, [2]:마크내용
-            //     string[] SplitTag = Line.Split('\t');
-            //     SplitTag[3] = SplitTag[3].Replace("↔", "");
-            //     SplitTag[1] = SplitTag[1].PadRight(2, ' ');
-            //     //marc.richTextBox1.Text += string.Format("{0}\t{1}\t{2}\n", SplitTag[0], SplitTag[1], SplitTag[2]);
-            //     
-            //     // marc.InputTotal(SplitTag);
-            // }
         }
 
         private void btn_AllMove_Click(object sender, EventArgs e)

unimarc/unimarc/마크/Marc_Macro_Sub.cs

@@ -217,6 +217,8 @@ namespace UniMarc.마크
 
             if (idx == "48" && RoofTagNum == "245") return JiSi245(Content);
 
+            if (idx == "70" && RoofTagNum == "440") return JiSi440(Content);
+
             if (TargetTagNum == RoofTagNum) return RunCode.Substring(0, 2);
 
             #region 코드 간소화 작업진행중으로 주석처리 (나중에 삭제)
@@ -261,6 +263,22 @@ namespace UniMarc.마크
             return "00";
         }
 
+        /// <summary>
+        /// 440가 괄호 시작일 경우 [10], 괄호 시작이 아니면 [00]
+        /// </summary>
+        /// <param name="Content"></param>
+        /// <returns></returns>
+        string JiSi440(string Content)
+        {
+            if (Content.StartsWith("▼a"))
+            {
+                Content = Content.Replace("▼a", "");
+                if (Content.StartsWith("("))
+                    return "10";
+            }
+            return "00";
+        }
+
         #endregion
 
         #region IDX TAG NUM

unimarc/unimarc/마크/Marc_Plan.Designer.cs

@@ -28,16 +28,17 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc_Plan));
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel4 = new System.Windows.Forms.Panel();
+            this.btn_GearExcel = new System.Windows.Forms.Button();
             this.btn_ApplyMacro = new System.Windows.Forms.Button();
             this.btn_Save = new System.Windows.Forms.Button();
             this.btn_Excel = new System.Windows.Forms.Button();
@@ -133,7 +134,8 @@
             this.panel7 = new System.Windows.Forms.Panel();
             this.printDocument1 = new System.Drawing.Printing.PrintDocument();
             this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
-            this.btn_GearExcel = new System.Windows.Forms.Button();
+            this.tb_SearchChangeColor = new System.Windows.Forms.TextBox();
+            this.btn_ChangeColor = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             this.panel4.SuspendLayout();
             this.panel3.SuspendLayout();
@@ -146,9 +148,13 @@
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.btn_ClassSymbol);
             this.panel1.Controls.Add(this.panel4);
+            this.panel1.Controls.Add(this.btn_InputColorFix);
             this.panel1.Controls.Add(this.btn_Close);
+            this.panel1.Controls.Add(this.btn_InputAutoCopy);
             this.panel1.Controls.Add(this.btn_Select_List);
+            this.panel1.Controls.Add(this.chkBox_AllowDrop);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
@@ -169,6 +175,16 @@
             this.panel4.Size = new System.Drawing.Size(537, 29);
             this.panel4.TabIndex = 9;
             // 
+            // btn_GearExcel
+            // 
+            this.btn_GearExcel.Location = new System.Drawing.Point(455, 2);
+            this.btn_GearExcel.Name = "btn_GearExcel";
+            this.btn_GearExcel.Size = new System.Drawing.Size(77, 23);
+            this.btn_GearExcel.TabIndex = 12;
+            this.btn_GearExcel.Text = "장비용 엑셀";
+            this.btn_GearExcel.UseVisualStyleBackColor = true;
+            this.btn_GearExcel.Click += new System.EventHandler(this.btn_GearExcel_Click);
+            // 
             // btn_ApplyMacro
             // 
             this.btn_ApplyMacro.Location = new System.Drawing.Point(95, 2);
@@ -220,7 +236,7 @@
             // 
             // btn_Close
             // 
-            this.btn_Close.Location = new System.Drawing.Point(1104, 6);
+            this.btn_Close.Location = new System.Drawing.Point(1384, 6);
             this.btn_Close.Name = "btn_Close";
             this.btn_Close.Size = new System.Drawing.Size(86, 23);
             this.btn_Close.TabIndex = 5;
@@ -374,14 +390,14 @@
             this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
             this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.AppWorkspace;
+            dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.AppWorkspace;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle29.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29;
             this.dataGridView1.ColumnHeadersHeight = 25;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -439,8 +455,8 @@
             // 
             // reg_num
             // 
-            dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.reg_num.DefaultCellStyle = dataGridViewCellStyle16;
+            this.reg_num.DefaultCellStyle = dataGridViewCellStyle30;
             this.reg_num.FillWeight = 130.9363F;
             this.reg_num.HeaderText = "등록번호";
             this.reg_num.Name = "reg_num";
@@ -448,8 +464,8 @@
             // 
             // class_code
             // 
-            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.class_code.DefaultCellStyle = dataGridViewCellStyle17;
+            this.class_code.DefaultCellStyle = dataGridViewCellStyle31;
             this.class_code.FillWeight = 76.41504F;
             this.class_code.HeaderText = "분류";
             this.class_code.Name = "class_code";
@@ -457,8 +473,8 @@
             // 
             // author_code
             // 
-            dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.author_code.DefaultCellStyle = dataGridViewCellStyle18;
+            this.author_code.DefaultCellStyle = dataGridViewCellStyle32;
             this.author_code.FillWeight = 77.02635F;
             this.author_code.HeaderText = "저자기호";
             this.author_code.Name = "author_code";
@@ -466,8 +482,8 @@
             // 
             // volume
             // 
-            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.volume.DefaultCellStyle = dataGridViewCellStyle19;
+            this.volume.DefaultCellStyle = dataGridViewCellStyle33;
             this.volume.FillWeight = 38.80909F;
             this.volume.HeaderText = "V";
             this.volume.Name = "volume";
@@ -476,8 +492,8 @@
             // 
             // copy
             // 
-            dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.copy.DefaultCellStyle = dataGridViewCellStyle20;
+            this.copy.DefaultCellStyle = dataGridViewCellStyle34;
             this.copy.FillWeight = 40.14827F;
             this.copy.HeaderText = "C";
             this.copy.Name = "copy";
@@ -486,8 +502,8 @@
             // 
             // prefix
             // 
-            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.prefix.DefaultCellStyle = dataGridViewCellStyle21;
+            this.prefix.DefaultCellStyle = dataGridViewCellStyle35;
             this.prefix.FillWeight = 41.51828F;
             this.prefix.HeaderText = "F";
             this.prefix.Name = "prefix";
@@ -623,6 +639,8 @@
             // panel2
             // 
             this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel2.Controls.Add(this.btn_ChangeColor);
+            this.panel2.Controls.Add(this.tb_SearchChangeColor);
             this.panel2.Controls.Add(this.label1);
             this.panel2.Controls.Add(this.label2);
             this.panel2.Controls.Add(this.tb_ISBN);
@@ -630,15 +648,11 @@
             this.panel2.Controls.Add(this.tb_SearchTag);
             this.panel2.Location = new System.Drawing.Point(596, 3);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(412, 29);
+            this.panel2.Size = new System.Drawing.Size(761, 29);
             this.panel2.TabIndex = 8;
             // 
             // panel5
             // 
-            this.panel5.Controls.Add(this.btn_ClassSymbol);
-            this.panel5.Controls.Add(this.btn_InputColorFix);
-            this.panel5.Controls.Add(this.btn_InputAutoCopy);
-            this.panel5.Controls.Add(this.chkBox_AllowDrop);
             this.panel5.Controls.Add(this.panel3);
             this.panel5.Controls.Add(this.panel2);
             this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
@@ -649,7 +663,7 @@
             // 
             // btn_ClassSymbol
             // 
-            this.btn_ClassSymbol.Location = new System.Drawing.Point(1367, 7);
+            this.btn_ClassSymbol.Location = new System.Drawing.Point(1289, 6);
             this.btn_ClassSymbol.Name = "btn_ClassSymbol";
             this.btn_ClassSymbol.Size = new System.Drawing.Size(89, 23);
             this.btn_ClassSymbol.TabIndex = 13;
@@ -659,7 +673,7 @@
             // 
             // btn_InputColorFix
             // 
-            this.btn_InputColorFix.Location = new System.Drawing.Point(1272, 7);
+            this.btn_InputColorFix.Location = new System.Drawing.Point(1194, 6);
             this.btn_InputColorFix.Name = "btn_InputColorFix";
             this.btn_InputColorFix.Size = new System.Drawing.Size(89, 23);
             this.btn_InputColorFix.TabIndex = 12;
@@ -669,7 +683,7 @@
             // 
             // btn_InputAutoCopy
             // 
-            this.btn_InputAutoCopy.Location = new System.Drawing.Point(1177, 7);
+            this.btn_InputAutoCopy.Location = new System.Drawing.Point(1099, 6);
             this.btn_InputAutoCopy.Name = "btn_InputAutoCopy";
             this.btn_InputAutoCopy.Size = new System.Drawing.Size(89, 23);
             this.btn_InputAutoCopy.TabIndex = 11;
@@ -680,7 +694,7 @@
             // chkBox_AllowDrop
             // 
             this.chkBox_AllowDrop.AutoSize = true;
-            this.chkBox_AllowDrop.Location = new System.Drawing.Point(1023, 10);
+            this.chkBox_AllowDrop.Location = new System.Drawing.Point(947, 10);
             this.chkBox_AllowDrop.Name = "chkBox_AllowDrop";
             this.chkBox_AllowDrop.Size = new System.Drawing.Size(147, 16);
             this.chkBox_AllowDrop.TabIndex = 10;
@@ -1138,15 +1152,24 @@
             this.printPreviewDialog1.Name = "printPreviewDialog1";
             this.printPreviewDialog1.Visible = false;
             // 
-            // btn_GearExcel
+            // tb_SearchChangeColor
             // 
-            this.btn_GearExcel.Location = new System.Drawing.Point(455, 2);
+            this.tb_SearchChangeColor.Location = new System.Drawing.Point(420, 3);
-            this.btn_GearExcel.Name = "btn_GearExcel";
+            this.tb_SearchChangeColor.Name = "tb_SearchChangeColor";
-            this.btn_GearExcel.Size = new System.Drawing.Size(77, 23);
+            this.tb_SearchChangeColor.Size = new System.Drawing.Size(147, 21);
-            this.btn_GearExcel.TabIndex = 12;
+            this.tb_SearchChangeColor.TabIndex = 6;
-            this.btn_GearExcel.Text = "장비용 엑셀";
+            this.tb_SearchChangeColor.Text = "여러 개 입력시 , 로 구분";
-            this.btn_GearExcel.UseVisualStyleBackColor = true;
+            this.tb_SearchChangeColor.Click += new System.EventHandler(this.tb_SearchChangeColor_Click);
-            this.btn_GearExcel.Click += new System.EventHandler(this.btn_GearExcel_Click);
+            // 
+            // btn_ChangeColor
+            // 
+            this.btn_ChangeColor.Location = new System.Drawing.Point(573, 2);
+            this.btn_ChangeColor.Name = "btn_ChangeColor";
+            this.btn_ChangeColor.Size = new System.Drawing.Size(93, 23);
+            this.btn_ChangeColor.TabIndex = 7;
+            this.btn_ChangeColor.Text = "검색값 색 변경";
+            this.btn_ChangeColor.UseVisualStyleBackColor = true;
+            this.btn_ChangeColor.Click += new System.EventHandler(this.btn_ChangeColor_Click);
             // 
             // Marc_Plan
             // 
@@ -1161,6 +1184,7 @@
             this.Text = "마크 정리";
             this.Load += new System.EventHandler(this.Marc_Plan_Load);
             this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
             this.panel4.ResumeLayout(false);
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
@@ -1168,7 +1192,6 @@
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             this.panel5.ResumeLayout(false);
-            this.panel5.PerformLayout();
             this.panel6.ResumeLayout(false);
             this.panel6.PerformLayout();
             this.panel7.ResumeLayout(false);
@@ -1277,5 +1300,7 @@
         private System.Windows.Forms.Button btn_InputColorFix;
         private System.Windows.Forms.Button btn_ClassSymbol;
         private System.Windows.Forms.Button btn_GearExcel;
+        private System.Windows.Forms.Button btn_ChangeColor;
+        private System.Windows.Forms.TextBox tb_SearchChangeColor;
     }
 }

unimarc/unimarc/마크/Marc_Plan.cs

@@ -102,16 +102,16 @@ namespace WindowsFormsApp1.Mac
 
             for (int a = 0; a < ary.Length; a++)
             {
-                if (a % 16 == 0)  { Grid[0]  = ary[a]; }    // idx
+                if (a % 16 == 00) { Grid[00] = ary[a]; }    // idx
-                if (a % 16 == 1)  { Grid[1]  = ary[a]; }    // num
+                if (a % 16 == 01) { Grid[01] = ary[a]; }    // num
-                if (a % 16 == 2)  { Grid[2]  = ary[a]; }    // r_num
+                if (a % 16 == 02) { Grid[02] = ary[a]; }    // r_num
-                if (a % 16 == 3)  { Grid[3]  = ary[a]; }    // class_symbol
+                if (a % 16 == 03) { Grid[03] = ary[a]; }    // class_symbol
-                if (a % 16 == 4)  { Grid[4]  = ary[a]; }    // author_symbol
+                if (a % 16 == 04) { Grid[04] = ary[a]; }    // author_symbol
-                if (a % 16 == 5)  { Grid[9]  = ary[a]; }    // ISBN
+                if (a % 16 == 05) { Grid[09] = ary[a]; }    // ISBN
-                if (a % 16 == 6)  { Grid[10] = ary[a]; }    // book_name
+                if (a % 16 == 06) { Grid[10] = ary[a]; }    // book_name
-                if (a % 16 == 7)  { Grid[11] = ary[a]; }    // s_book_name1
+                if (a % 16 == 07) { Grid[11] = ary[a]; }    // s_book_name1
-                if (a % 16 == 8)  { Grid[12] = ary[a]; }    // s_book_num1
+                if (a % 16 == 08) { Grid[12] = ary[a]; }    // s_book_num1
-                if (a % 16 == 9)  { Grid[13] = ary[a]; }    // s_book_name2
+                if (a % 16 == 09) { Grid[13] = ary[a]; }    // s_book_name2
                 if (a % 16 == 10) { Grid[14] = ary[a]; }    // s_book_num2
                 if (a % 16 == 11) { Grid[15] = ary[a]; }    // author
                 if (a % 16 == 12) { Grid[16] = ary[a]; }    // book_comp
@@ -332,7 +332,8 @@ namespace WindowsFormsApp1.Mac
                     }
                     index++;
                 }
-                dataGridView1.Rows[a].Cells["marc"].Value = string.Join("\n", AryMarc);
+                String_Text st = new String_Text();
+                dataGridView1.Rows[a].Cells["marc"].Value = st.made_Ori_marc(string.Join("\n", AryMarc));
             }
 
             #region 보류
@@ -818,6 +819,7 @@ namespace WindowsFormsApp1.Mac
         /// 여러장 인쇄인지
         /// </summary>
         bool isMorePage;
+
         private void printDocument1_BeginPrint(object sender, System.Drawing.Printing.PrintEventArgs e)
         {
             Cnt = 0;
@@ -1050,7 +1052,7 @@ namespace WindowsFormsApp1.Mac
                 { "부모", "0" }, { "육아", "0" }, { "유아교육", "0" }, { "유아 육아", "0" },
                 { "어린이", "1" }, { "초등", "1" },
                 { "유아", "2" },
-                { "청소년", "3" }, { "고등학", "3" }, { "고등학", "3" },
+                { "청소년", "3" }, { "중학", "3" }, { "고등학", "3" },
                 { "전집", "4" }, { "컴퓨터", "4" }, { "종교", "4" }, { "문학론", "4" },
                 { "소설", "5" }
             };
@@ -1149,7 +1151,6 @@ namespace WindowsFormsApp1.Mac
         {
             if (dataGridView1.RowCount <= 0) return;
 
-            Excel_text et = new Excel_text();
             Marc_Plan_GearExcel gear = new Marc_Plan_GearExcel();
 
             string[,] Content = new string[dataGridView1.RowCount, 6];
@@ -1166,8 +1167,37 @@ namespace WindowsFormsApp1.Mac
             gear.Content = Content;
             gear.ListName = btn_Select_List.Text;
             gear.Show();
-
-            // et.Mk_Excel(Title, Content);
         }
+
+        private void tb_SearchChangeColor_Click(object sender, EventArgs e)
+        {
+            tb_SearchChangeColor.Text = "";
+        }
+
+        private void btn_ChangeColor_Click(object sender, EventArgs e)
+        {
+            if (dataGridView1.RowCount < 0) return;
+            for (int a = 0; a < dataGridView1.RowCount; a++)
+            {
+                dataGridView1.Rows[a].Cells["Search_Tag"].Style.BackColor = Color.White;
+            }
+
+            string[] SearchArray = tb_SearchChangeColor.Text.Split(',');
+
+            for (int a = 0; a < dataGridView1.RowCount; a++)
+            {
+                string Target = dataGridView1.Rows[a].Cells["Search_Tag"].Value.ToString();
+                foreach (string t in SearchArray)
+                {
+                    if (t == "") continue;
+
+                    if (Target.IndexOf(t.TrimStart().TrimEnd()) > -1) {
+                        dataGridView1.Rows[a].Cells["Search_Tag"].Style.BackColor = Color.Yellow;
+                        break;
+                    }
+                }
+            }
+        }
+
     }
 }

unimarc/unimarc/마크/Marc_Preview.Designer.cs

@@ -38,7 +38,7 @@ namespace UniMarc.마크
             this.btn_Save = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
             this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.KyoBoPage = new System.Windows.Forms.TabPage();
+            this.AladinPage = new System.Windows.Forms.TabPage();
             this.NLPage = new System.Windows.Forms.TabPage();
             this.webBrowser2 = new System.Windows.Forms.WebBrowser();
             this.KolisPage = new System.Windows.Forms.TabPage();
@@ -48,7 +48,7 @@ namespace UniMarc.마크
             this.panel3.SuspendLayout();
             this.panel2.SuspendLayout();
             this.tabControl1.SuspendLayout();
-            this.KyoBoPage.SuspendLayout();
+            this.AladinPage.SuspendLayout();
             this.NLPage.SuspendLayout();
             this.KolisPage.SuspendLayout();
             this.SuspendLayout();
@@ -132,7 +132,7 @@ namespace UniMarc.마크
             // 
             // tabControl1
             // 
-            this.tabControl1.Controls.Add(this.KyoBoPage);
+            this.tabControl1.Controls.Add(this.AladinPage);
             this.tabControl1.Controls.Add(this.NLPage);
             this.tabControl1.Controls.Add(this.KolisPage);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -142,16 +142,16 @@ namespace UniMarc.마크
             this.tabControl1.Size = new System.Drawing.Size(1316, 961);
             this.tabControl1.TabIndex = 3;
             // 
-            // KyoBoPage
+            // AladinPage
             // 
-            this.KyoBoPage.Controls.Add(this.webBrowser1);
+            this.AladinPage.Controls.Add(this.webBrowser1);
-            this.KyoBoPage.Location = new System.Drawing.Point(4, 22);
+            this.AladinPage.Location = new System.Drawing.Point(4, 22);
-            this.KyoBoPage.Name = "KyoBoPage";
+            this.AladinPage.Name = "AladinPage";
-            this.KyoBoPage.Padding = new System.Windows.Forms.Padding(3);
+            this.AladinPage.Padding = new System.Windows.Forms.Padding(3);
-            this.KyoBoPage.Size = new System.Drawing.Size(1308, 935);
+            this.AladinPage.Size = new System.Drawing.Size(1308, 935);
-            this.KyoBoPage.TabIndex = 0;
+            this.AladinPage.TabIndex = 0;
-            this.KyoBoPage.Text = "교보";
+            this.AladinPage.Text = "알라딘";
-            this.KyoBoPage.UseVisualStyleBackColor = true;
+            this.AladinPage.UseVisualStyleBackColor = true;
             // 
             // NLPage
             // 
@@ -208,7 +208,7 @@ namespace UniMarc.마크
             this.panel3.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
             this.tabControl1.ResumeLayout(false);
-            this.KyoBoPage.ResumeLayout(false);
+            this.AladinPage.ResumeLayout(false);
             this.NLPage.ResumeLayout(false);
             this.KolisPage.ResumeLayout(false);
             this.ResumeLayout(false);
@@ -221,7 +221,7 @@ namespace UniMarc.마크
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.TabControl tabControl1;
-        private System.Windows.Forms.TabPage KyoBoPage;
+        private System.Windows.Forms.TabPage AladinPage;
         private System.Windows.Forms.TabPage NLPage;
         private System.Windows.Forms.WebBrowser webBrowser2;
         public System.Windows.Forms.RichTextBox richTextBox1;

unimarc/unimarc/마크/Marc_Preview.cs

@@ -24,7 +24,7 @@ namespace UniMarc.마크
 
         private void Mac_Preview_Load(object sender, EventArgs e)
         {
-            // webBrowser1.Navigate("http://www.kyobobook.co.kr/index.laf");
+            webBrowser1.Navigate("https://www.aladin.co.kr/");
             webBrowser2.Navigate("https://www.nl.go.kr/");
         }
 
@@ -32,33 +32,33 @@ namespace UniMarc.마크
         {
             string Search = isbn;
 
-            // KyoBo(Search);
+            Aladin(Search);
             NationalLibrary(Search);
             Kolis(Search);
         }
 
         /// <summary>
-        /// 교보 접속
+        /// 알라딘 접속
         /// </summary>
-        private void KyoBo(string Search)
+        private void Aladin(string Search)
         {
             Delay(3000);
 
             HtmlElementCollection search = webBrowser1.Document.GetElementsByTagName("input");
             foreach (HtmlElement SearchBox in search)
             {
-                if (SearchBox.Id == "searchKeyword")
+                if (SearchBox.Id == "SearchWord")
                     SearchBox.InvokeMember("click");
             }
 
-            webBrowser1.Document.GetElementById("searchKeyword").SetAttribute("value", Search);
+            webBrowser1.Document.GetElementById("SearchWord").SetAttribute("value", Search);
 
             Delay(500);
 
             HtmlElementCollection button = webBrowser1.Document.GetElementsByTagName("input");
             foreach (HtmlElement SearchButton in button)
             {
-                if (SearchButton.GetAttribute("className") == "btn_search")
+                if (SearchButton.GetAttribute("className") == "searchBtn")
                     SearchButton.InvokeMember("click");
             }
         }

unimarc/unimarc/마크/Zoom_Picture.Designer.cs

@@ -31,11 +31,11 @@ namespace UniMarc.마크
         {
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.btn_Preview = new System.Windows.Forms.Button();
             this.btn_Close = new System.Windows.Forms.Button();
-            this.webBrowser1 = new System.Windows.Forms.WebBrowser();
             this.btn_Photo = new System.Windows.Forms.Button();
+            this.btn_Preview = new System.Windows.Forms.Button();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.webBrowser1 = new System.Windows.Forms.WebBrowser();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -63,14 +63,25 @@ namespace UniMarc.마크
             this.panel1.Size = new System.Drawing.Size(544, 40);
             this.panel1.TabIndex = 1;
             // 
-            // panel2
+            // btn_Close
             // 
-            this.panel2.Controls.Add(this.pictureBox1);
+            this.btn_Close.Location = new System.Drawing.Point(459, 8);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.btn_Close.Name = "btn_Close";
-            this.panel2.Location = new System.Drawing.Point(0, 40);
+            this.btn_Close.Size = new System.Drawing.Size(75, 23);
-            this.panel2.Name = "panel2";
+            this.btn_Close.TabIndex = 0;
-            this.panel2.Size = new System.Drawing.Size(544, 671);
+            this.btn_Close.Text = "닫    기";
-            this.panel2.TabIndex = 2;
+            this.btn_Close.UseVisualStyleBackColor = true;
+            this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
+            // 
+            // btn_Photo
+            // 
+            this.btn_Photo.Location = new System.Drawing.Point(297, 8);
+            this.btn_Photo.Name = "btn_Photo";
+            this.btn_Photo.Size = new System.Drawing.Size(75, 23);
+            this.btn_Photo.TabIndex = 0;
+            this.btn_Photo.Text = "사진보기";
+            this.btn_Photo.UseVisualStyleBackColor = true;
+            this.btn_Photo.Click += new System.EventHandler(this.btn_Photo_Click);
             // 
             // btn_Preview
             // 
@@ -82,15 +93,14 @@ namespace UniMarc.마크
             this.btn_Preview.UseVisualStyleBackColor = true;
             this.btn_Preview.Click += new System.EventHandler(this.btn_Preview_Click);
             // 
-            // btn_Close
+            // panel2
             // 
-            this.btn_Close.Location = new System.Drawing.Point(459, 8);
+            this.panel2.Controls.Add(this.pictureBox1);
-            this.btn_Close.Name = "btn_Close";
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btn_Close.Size = new System.Drawing.Size(75, 23);
+            this.panel2.Location = new System.Drawing.Point(0, 40);
-            this.btn_Close.TabIndex = 0;
+            this.panel2.Name = "panel2";
-            this.btn_Close.Text = "닫    기";
+            this.panel2.Size = new System.Drawing.Size(544, 671);
-            this.btn_Close.UseVisualStyleBackColor = true;
+            this.panel2.TabIndex = 2;
-            this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
             // 
             // webBrowser1
             // 
@@ -101,16 +111,6 @@ namespace UniMarc.마크
             this.webBrowser1.Size = new System.Drawing.Size(544, 711);
             this.webBrowser1.TabIndex = 3;
             // 
-            // btn_Photo
-            // 
-            this.btn_Photo.Location = new System.Drawing.Point(297, 8);
-            this.btn_Photo.Name = "btn_Photo";
-            this.btn_Photo.Size = new System.Drawing.Size(75, 23);
-            this.btn_Photo.TabIndex = 0;
-            this.btn_Photo.Text = "사진보기";
-            this.btn_Photo.UseVisualStyleBackColor = true;
-            this.btn_Photo.Click += new System.EventHandler(this.btn_Photo_Click);
-            // 
             // Zoom_Picture
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

unimarc/unimarc/마크/Zoom_Picture.cs

@@ -18,9 +18,11 @@ namespace UniMarc.마크
         {
             InitializeComponent();
         }
+
         private void Zoom_Picture_Load(object sender, EventArgs e)
         {
             pictureBox1.ImageLocation = url;
+            pictureBox1.MouseWheel += new MouseEventHandler(MouseWheelEvent);
 
             string PreViewURL =
                 string.Format("http://preview.kyobobook.co.kr/preview.jsp?siteGb=INK&ejkGb=KOR&barcode={0}&loginYn=N&orderClick=JAW",
@@ -29,6 +31,15 @@ namespace UniMarc.마크
             webBrowser1.Navigate(PreViewURL);
         }
 
+        private void MouseWheelEvent(object sender, MouseEventArgs e)
+        {
+            if (e.Delta > 0)
+                pictureBox1.Size = new Size((int)(pictureBox1.Size.Width * 1.2), (int)(pictureBox1.Size.Height * 1.2));
+            else if (e.Delta < 0)
+                pictureBox1.Size = new Size((int)(pictureBox1.Size.Width * 0.8), (int)(pictureBox1.Size.Height * 0.8));
+
+        }
+
         private void Zoom_Picture_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Escape) { this.Close(); }
@@ -43,14 +54,12 @@ namespace UniMarc.마크
         {
             // 1300, 750
             this.Size = new Size(1300, 750);
-
             panel2.Visible = false;
         }
 
         private void btn_Photo_Click(object sender, EventArgs e)
         {
             this.Size = new Size(560, 750);
-
             panel2.Visible = true;
         }
     }

unimarc/unimarc/홈/Transaction_manage.cs

@@ -408,9 +408,7 @@ namespace WindowsFormsApp1.Home
         private void MakeInsertCommend(DataGridView dgv, int gridNum, string idx)
         {
             int LoopCount = 0;
-            string m1;
+            string m1, m2, m3;
-            string m2;
-            string m3;
             for (int a = 0; a < dgv.Rows.Count; a++)
             {
                 if (dgv.Rows[a].Cells[0].Value == null) dgv.Rows[a].Cells[0].Value = "";