=====* ISBN_Check [0.0109] 버전관리 시작 *=====

1. ISBN조회에서 검색조건중 ISBN이 없음
ㄴ> 완료

2. ISBN조회에서 수동으로 내용 바꾸기 불가능, 붙여넣기등
ㄴ> 완료

3. 마크목록에서 줄 추가, 삭제, 내용수정(대체를 그자리에 넣는경우 필요)기능

   1) 저장시마다 008 늘어남 오류
      저장시 필수태그 없으면 오류체크문구뜨게
      040태그 삭제
      저장한사람 누구인지 저장일시 분초까지

4. 마크편집창 (칸채우기)

   1) 245d에서 100(기본표목) 반영할것.

   2) 메모장이랑 칸채우기 왔다갔다 하면 653이 650으로 저장 됩니다!

   3) 기본표목 245d로 생성 안됨, 저자도치체크가능하게끔

   4) 440v - 2개인 경우가 문제되므로 후에 - 를 ◐로 바꿀것
      나중에 반출시에 ◐를 다시 - 로 되돌리도록(일괄처리구현시 기본에 넣기) -나중개발

   5) 100태그 제곱으로 늘어나는 버그.

5. DLS조회+DLS입력, 마크정리+반출 각각 통합

6. 소장자료검색 필터에 날짜와 작성자, 등급필터추가, 원래있던 조건에 도서명 등말고도 총서명추가
ㄴ> Marc DB의 총서명 컬럼 불러오면 될듯.

7. 소장자료검색에서 더블클릭시 Search_Infor_Sub에서 -> 마크편집폼으로 전환.

8. 마크편집
    저장시각, 작성자, 비고, 등급 표시 필요함.

9. 복본조사

    1) 복본조사쪽 지연시간은 따로 피드백해드리면되는지?

    2) 불용어랑, 괄호처리 옵션
       ㄴ> 특수문자, 괄호안의 문자제거.

    3) DLS복본조사 항목에 총서명(2개)추가

10. 저자기호 일괄로 만들기

11. 목록병합작업(흩어져서 작업한 것이나, 추가분등 합쳐서 작업하기 편하게 + 도서관쪽에서 마크 반입 안했을 때 복본체크 위하기도함)
    -> 마크 정리에서 병합기능을 추가할것.
    -> 마크 정리에서 선택한 셀 체크박스 반전시킬것. True->False / False->True

unimarc/unimarc/Login.Designer.cs

@@ -34,12 +34,13 @@
             this.button2 = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
-            this.button3 = new System.Windows.Forms.Button();
+            this.label3 = new System.Windows.Forms.Label();
+            this.chk_Save = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // ID_text
             // 
-            this.ID_text.Location = new System.Drawing.Point(199, 73);
+            this.ID_text.Location = new System.Drawing.Point(190, 57);
             this.ID_text.Name = "ID_text";
             this.ID_text.Size = new System.Drawing.Size(100, 21);
             this.ID_text.TabIndex = 1;
@@ -47,7 +48,7 @@
             // 
             // PW_text
             // 
-            this.PW_text.Location = new System.Drawing.Point(199, 100);
+            this.PW_text.Location = new System.Drawing.Point(190, 84);
             this.PW_text.Name = "PW_text";
             this.PW_text.PasswordChar = '●';
             this.PW_text.Size = new System.Drawing.Size(100, 21);
@@ -56,7 +57,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(172, 149);
+            this.button1.Location = new System.Drawing.Point(157, 138);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 23);
             this.button1.TabIndex = 3;
@@ -66,7 +67,7 @@
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(267, 149);
+            this.button2.Location = new System.Drawing.Point(252, 138);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(75, 23);
             this.button2.TabIndex = 4;
@@ -77,7 +78,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(145, 77);
+            this.label1.Location = new System.Drawing.Point(136, 61);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(41, 12);
             this.label1.TabIndex = 2;
@@ -86,28 +87,41 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(139, 104);
+            this.label2.Location = new System.Drawing.Point(130, 88);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(53, 12);
             this.label2.TabIndex = 2;
             this.label2.Text = "비밀번호";
             // 
-            // button3
+            // label3
             // 
-            this.button3.Location = new System.Drawing.Point(378, 92);
+            this.label3.AutoSize = true;
-            this.button3.Name = "button3";
+            this.label3.BackColor = System.Drawing.SystemColors.Control;
-            this.button3.Size = new System.Drawing.Size(89, 23);
+            this.label3.Location = new System.Drawing.Point(77, 61);
-            this.button3.TabIndex = 5;
+            this.label3.Name = "label3";
-            this.button3.Text = "관리자 로그인";
+            this.label3.Size = new System.Drawing.Size(33, 12);
-            this.button3.UseVisualStyleBackColor = true;
+            this.label3.TabIndex = 5;
-            this.button3.Click += new System.EventHandler(this.button3_Click);
+            this.label3.Text = "       ";
+            this.label3.Click += new System.EventHandler(this.label3_Click);
+            // 
+            // chk_Save
+            // 
+            this.chk_Save.AutoSize = true;
+            this.chk_Save.Location = new System.Drawing.Point(193, 111);
+            this.chk_Save.Name = "chk_Save";
+            this.chk_Save.Size = new System.Drawing.Size(95, 16);
+            this.chk_Save.TabIndex = 6;
+            this.chk_Save.Text = "ID / PW 저장";
+            this.chk_Save.UseVisualStyleBackColor = true;
             // 
             // login
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(498, 239);
+            this.ClientSize = new System.Drawing.Size(480, 219);
-            this.Controls.Add(this.button3);
+            this.ControlBox = false;
+            this.Controls.Add(this.chk_Save);
+            this.Controls.Add(this.label3);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.button2);
@@ -131,6 +145,7 @@
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Button button3;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.CheckBox chk_Save;
     }
 }

unimarc/unimarc/Login.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.IO;
 
 namespace WindowsFormsApp1
 {
@@ -22,9 +23,10 @@ namespace WindowsFormsApp1
         {
             this.ActiveControl = ID_text;
 
-            // 삭제대상.
+            if (CreateFile()) {
-            ID_text.Text = "sh";
+                chk_Save.Checked = true;
-            PW_text.Text = "123";
+                ReadFile();
+            }
 
             db.DBcon();
         }
@@ -38,7 +40,12 @@ namespace WindowsFormsApp1
             ((Main)(this.Owner)).User_Name = ID_text.Text;
             if (db_res == "") { return; }
             if (ID_text.Text == result[1]) {
-                if (PW_text.Text == result[2]) {
+                if (PW_text.Text == result[2])
+                {
+                    if (chk_Save.Checked)
+                        if (!CreateFile())
+                            WriteFile();
+
                     this.DialogResult = DialogResult.OK;
                     this.Close();
                 }
@@ -53,6 +60,48 @@ namespace WindowsFormsApp1
             }
         }
 
+        #region AutoLogin
+        /// <summary>
+        /// 파일이 있는지 확인하고 없으면 생성
+        /// </summary>
+        /// <returns>생성시 false</returns>
+        private bool CreateFile()
+        {
+            string path = Application.StartupPath + "\\AutoLogin.txt";
+
+            if (!File.Exists(path))
+            {
+                return false;
+            }
+            return true;
+        }
+
+        private void WriteFile()
+        {
+            string path = Application.StartupPath + "\\AutoLogin.txt";
+            string contents = string.Format("ID={0}\nPW={1}", ID_text.Text, PW_text.Text);
+
+            File.WriteAllText(path, contents);
+
+            // StreamWriter writer;
+            // writer = File.AppendText(path);
+            // writer.Write(string.Format("ID={0}\nPW={1}", ID_text.Text, PW_text.Text));
+            // writer.Close();
+        }
+
+        private void ReadFile()
+        {
+            string LoginData = File.ReadAllText(Application.StartupPath + "\\AutoLogin.txt");
+            string[] Ary = LoginData.Split('\n');
+            
+            if (Ary.Length < 1)
+                return;
+
+            ID_text.Text = Ary[0].Replace("ID=", "");
+            PW_text.Text = Ary[1].Replace("PW=", "");
+        }
+        #endregion
+
         private void button2_Click(object sender, EventArgs e)
         {
             this.Close();
@@ -70,11 +119,15 @@ namespace WindowsFormsApp1
             if (e.KeyCode == Keys.Escape) { this.Close(); }
         }
 
-        private void button3_Click(object sender, EventArgs e)
+        /// <summary>
+        /// //TODO: 삭제대상
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void label3_Click(object sender, EventArgs e)
         {
-            ID_text.Text = "admin";
+            ID_text.Text = "sh";
-            PW_text.Text = "admin";
+            PW_text.Text = "123";
-            button1_Click(null, null);
         }
     }
 }

unimarc/unimarc/Main.cs

@@ -868,6 +868,7 @@ namespace WindowsFormsApp1
                 Mac_check_ISBN.MdiParent = this;
                 Mac_check_ISBN.WindowState = FormWindowState.Maximized;
                 Mac_check_ISBN.FormClosed += (o, ea) => Mac_check_ISBN = null;
+                Mac_check_ISBN.tb_list_name.Enabled = true;
                 Mac_check_ISBN.Show();
             }
         }

unimarc/unimarc/bin/Debug/AutoLogin.txt

@@ -0,0 +1,2 @@
+ID=sh
+PW=123

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

@@ -419,6 +419,7 @@ namespace WindowsFormsApp1.Delivery
             {
                 Check_ISBN isbn = new Check_ISBN(this);
                 isbn.list_name = dataGridView2.Rows[e.RowIndex].Cells["list_name"].Value.ToString();
+                isbn.DataLoad();
                 isbn.Show();
             }
         }

unimarc/unimarc/납품관리/List_Lookup.Designer.cs

@@ -28,10 +28,10 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(List_Lookup));
             this.label1 = new System.Windows.Forms.Label();
             this.cb_stat = new System.Windows.Forms.ComboBox();
@@ -39,7 +39,6 @@
             this.cb_search = new System.Windows.Forms.ComboBox();
             this.tb_search = new System.Windows.Forms.TextBox();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.panel2 = new System.Windows.Forms.Panel();
             this.tb_clt = new System.Windows.Forms.TextBox();
             this.label3 = new System.Windows.Forms.Label();
             this.btn_print = new System.Windows.Forms.Button();
@@ -79,13 +78,19 @@
             this.label11 = new System.Windows.Forms.Label();
             this.printDocument1 = new System.Drawing.Printing.PrintDocument();
             this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
-            this.button1 = new System.Windows.Forms.Button();
             this.printDialog1 = new System.Windows.Forms.PrintDialog();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.panel6 = new System.Windows.Forms.Panel();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.panel7 = new System.Windows.Forms.Panel();
             this.panel1.SuspendLayout();
-            this.panel2.SuspendLayout();
             this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.panel4.SuspendLayout();
+            this.panel5.SuspendLayout();
+            this.panel6.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.panel7.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
@@ -135,30 +140,19 @@
             // 
             // panel1
             // 
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Controls.Add(this.cb_stat);
             this.panel1.Controls.Add(this.tb_search);
             this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.cb_search);
             this.panel1.Controls.Add(this.label2);
-            this.panel1.Location = new System.Drawing.Point(12, 12);
+            this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(342, 35);
             this.panel1.TabIndex = 3;
             // 
-            // panel2
-            // 
-            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel2.Controls.Add(this.tb_clt);
-            this.panel2.Controls.Add(this.label3);
-            this.panel2.Location = new System.Drawing.Point(357, 12);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(184, 35);
-            this.panel2.TabIndex = 4;
-            // 
             // tb_clt
             // 
-            this.tb_clt.Location = new System.Drawing.Point(44, 6);
+            this.tb_clt.Location = new System.Drawing.Point(61, 6);
             this.tb_clt.Name = "tb_clt";
             this.tb_clt.Size = new System.Drawing.Size(134, 21);
             this.tb_clt.TabIndex = 2;
@@ -167,7 +161,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(3, 10);
+            this.label3.Location = new System.Drawing.Point(20, 10);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(41, 12);
             this.label3.TabIndex = 0;
@@ -175,7 +169,7 @@
             // 
             // btn_print
             // 
-            this.btn_print.Location = new System.Drawing.Point(979, 51);
+            this.btn_print.Location = new System.Drawing.Point(981, 6);
             this.btn_print.Name = "btn_print";
             this.btn_print.Size = new System.Drawing.Size(75, 25);
             this.btn_print.TabIndex = 5;
@@ -185,7 +179,7 @@
             // 
             // btn_close
             // 
-            this.btn_close.Location = new System.Drawing.Point(1141, 51);
+            this.btn_close.Location = new System.Drawing.Point(1143, 6);
             this.btn_close.Name = "btn_close";
             this.btn_close.Size = new System.Drawing.Size(75, 25);
             this.btn_close.TabIndex = 5;
@@ -195,7 +189,7 @@
             // 
             // btn_lookup
             // 
-            this.btn_lookup.Location = new System.Drawing.Point(1060, 51);
+            this.btn_lookup.Location = new System.Drawing.Point(1062, 6);
             this.btn_lookup.Name = "btn_lookup";
             this.btn_lookup.Size = new System.Drawing.Size(75, 25);
             this.btn_lookup.TabIndex = 5;
@@ -205,7 +199,6 @@
             // 
             // panel3
             // 
-            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel3.Controls.Add(this.cb_list_name);
             this.panel3.Controls.Add(this.textBox7);
             this.panel3.Controls.Add(this.textBox6);
@@ -216,7 +209,7 @@
             this.panel3.Controls.Add(this.cb_export);
             this.panel3.Controls.Add(this.cb_import);
             this.panel3.Controls.Add(this.cb_charge);
-            this.panel3.Location = new System.Drawing.Point(544, 12);
+            this.panel3.Location = new System.Drawing.Point(540, 0);
             this.panel3.Name = "panel3";
             this.panel3.Size = new System.Drawing.Size(672, 35);
             this.panel3.TabIndex = 7;
@@ -229,6 +222,7 @@
             this.cb_list_name.Name = "cb_list_name";
             this.cb_list_name.Size = new System.Drawing.Size(185, 20);
             this.cb_list_name.TabIndex = 1;
+            this.cb_list_name.SelectedIndexChanged += new System.EventHandler(this.cb_list_name_SelectedIndexChanged);
             // 
             // textBox7
             // 
@@ -313,14 +307,14 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.idx,
@@ -338,31 +332,32 @@
             this.order,
             this.Column2,
             this.Column3});
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle6;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dataGridView1.Location = new System.Drawing.Point(10, 80);
+            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridView1.Location = new System.Drawing.Point(0, 0);
             this.dataGridView1.Name = "dataGridView1";
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
             this.dataGridView1.RowHeadersVisible = false;
             this.dataGridView1.RowHeadersWidth = 21;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle8;
+            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle4;
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dataGridView1.Size = new System.Drawing.Size(1206, 547);
+            this.dataGridView1.Size = new System.Drawing.Size(1229, 571);
             this.dataGridView1.TabIndex = 8;
             this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
             // 
@@ -464,16 +459,17 @@
             this.panel4.Controls.Add(this.lbl_pay);
             this.panel4.Controls.Add(this.lbl_count);
             this.panel4.Controls.Add(this.label11);
-            this.panel4.Location = new System.Drawing.Point(10, 633);
+            this.panel4.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel4.Location = new System.Drawing.Point(0, 645);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(1206, 26);
+            this.panel4.Size = new System.Drawing.Size(1229, 26);
             this.panel4.TabIndex = 9;
             // 
             // lbl_total
             // 
             this.lbl_total.AutoSize = true;
             this.lbl_total.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.lbl_total.Location = new System.Drawing.Point(723, 5);
+            this.lbl_total.Location = new System.Drawing.Point(889, 5);
             this.lbl_total.Name = "lbl_total";
             this.lbl_total.Size = new System.Drawing.Size(50, 13);
             this.lbl_total.TabIndex = 0;
@@ -483,7 +479,7 @@
             // 
             this.lbl_pay.AutoSize = true;
             this.lbl_pay.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.lbl_pay.Location = new System.Drawing.Point(509, 5);
+            this.lbl_pay.Location = new System.Drawing.Point(603, 5);
             this.lbl_pay.Name = "lbl_pay";
             this.lbl_pay.Size = new System.Drawing.Size(50, 13);
             this.lbl_pay.TabIndex = 0;
@@ -493,7 +489,7 @@
             // 
             this.lbl_count.AutoSize = true;
             this.lbl_count.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.lbl_count.Location = new System.Drawing.Point(288, 5);
+            this.lbl_count.Location = new System.Drawing.Point(317, 5);
             this.lbl_count.Name = "lbl_count";
             this.lbl_count.Size = new System.Drawing.Size(50, 13);
             this.lbl_count.TabIndex = 0;
@@ -511,6 +507,7 @@
             // 
             // printDocument1
             // 
+            this.printDocument1.BeginPrint += new System.Drawing.Printing.PrintEventHandler(this.printDocument1_BeginPrint);
             this.printDocument1.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printDocument1_tempPage);
             // 
             // printPreviewDialog1
@@ -521,48 +518,77 @@
             this.printPreviewDialog1.Enabled = true;
             this.printPreviewDialog1.Icon = ((System.Drawing.Icon)(resources.GetObject("printPreviewDialog1.Icon")));
             this.printPreviewDialog1.Name = "printPreviewDialog1";
+            this.printPreviewDialog1.UseAntiAlias = true;
             this.printPreviewDialog1.Visible = false;
             // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(898, 51);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 10;
-            this.button1.Text = "button1";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
             // printDialog1
             // 
             this.printDialog1.UseEXDialog = true;
             // 
+            // panel5
+            // 
+            this.panel5.Controls.Add(this.panel6);
+            this.panel5.Controls.Add(this.panel1);
+            this.panel5.Controls.Add(this.panel3);
+            this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel5.Location = new System.Drawing.Point(0, 0);
+            this.panel5.Name = "panel5";
+            this.panel5.Size = new System.Drawing.Size(1229, 34);
+            this.panel5.TabIndex = 10;
+            // 
+            // panel6
+            // 
+            this.panel6.Controls.Add(this.tb_clt);
+            this.panel6.Controls.Add(this.label3);
+            this.panel6.Location = new System.Drawing.Point(341, 0);
+            this.panel6.Name = "panel6";
+            this.panel6.Size = new System.Drawing.Size(200, 34);
+            this.panel6.TabIndex = 8;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.btn_print);
+            this.panel2.Controls.Add(this.btn_close);
+            this.panel2.Controls.Add(this.btn_lookup);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel2.Location = new System.Drawing.Point(0, 34);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(1229, 40);
+            this.panel2.TabIndex = 1;
+            // 
+            // panel7
+            // 
+            this.panel7.Controls.Add(this.dataGridView1);
+            this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel7.Location = new System.Drawing.Point(0, 74);
+            this.panel7.Name = "panel7";
+            this.panel7.Size = new System.Drawing.Size(1229, 571);
+            this.panel7.TabIndex = 11;
+            // 
             // List_Lookup
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1229, 671);
-            this.Controls.Add(this.button1);
+            this.Controls.Add(this.panel7);
-            this.Controls.Add(this.panel4);
-            this.Controls.Add(this.dataGridView1);
-            this.Controls.Add(this.panel3);
-            this.Controls.Add(this.btn_lookup);
-            this.Controls.Add(this.btn_close);
-            this.Controls.Add(this.btn_print);
             this.Controls.Add(this.panel2);
-            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.panel5);
+            this.Controls.Add(this.panel4);
             this.Name = "List_Lookup";
             this.Text = "목록조회";
             this.Load += new System.EventHandler(this.List_Lookup_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            this.panel2.ResumeLayout(false);
-            this.panel2.PerformLayout();
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
+            this.panel5.ResumeLayout(false);
+            this.panel6.ResumeLayout(false);
+            this.panel6.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel7.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -575,7 +601,6 @@
         private System.Windows.Forms.ComboBox cb_search;
         private System.Windows.Forms.TextBox tb_search;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Button btn_print;
         private System.Windows.Forms.Button btn_close;
@@ -599,6 +624,8 @@
         private System.Windows.Forms.Label label11;
         private System.Drawing.Printing.PrintDocument printDocument1;
         private System.Windows.Forms.PrintPreviewDialog printPreviewDialog1;
+        public System.Windows.Forms.TextBox tb_clt;
+        private System.Windows.Forms.PrintDialog printDialog1;
         private System.Windows.Forms.DataGridViewTextBoxColumn idx;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn num;
@@ -614,8 +641,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn order;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        public System.Windows.Forms.TextBox tb_clt;
+        private System.Windows.Forms.Panel panel5;
-        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Panel panel6;
-        private System.Windows.Forms.PrintDialog printDialog1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Panel panel7;
     }
 }

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

@@ -20,6 +20,7 @@ namespace WindowsFormsApp1.Delivery
         public string call_base;
         public int grididx;
         public string compidx;
+        string list_Date;
         public List_Lookup()
         {
             InitializeComponent();
@@ -39,6 +40,7 @@ namespace WindowsFormsApp1.Delivery
         private void List_Lookup_Load(object sender, EventArgs e)
         {
             db.DBcon();
+
             string[] combo_list = { "진행", "완료" };
             cb_stat.Items.AddRange(combo_list);
             cb_stat.SelectedIndex = 0;
@@ -55,6 +57,11 @@ namespace WindowsFormsApp1.Delivery
             cb_export.Items.AddRange(combo_export);
             cb_export.SelectedIndex = 0;
 
+            Init();
+        }
+
+        public void Init()
+        {
             mk_combo_list_name();
             mk_charge();
         }
@@ -81,11 +88,9 @@ namespace WindowsFormsApp1.Delivery
         }
         #endregion
         int cnt = 0, pageNo = 1;
-        PrinterSettings ps = new PrinterSettings();
         private void btn_print_Click(object sender, EventArgs e)    // 인쇄 기능
         {
-            if (dataGridView1.Rows.Count < 1)
+            if (dataGridView1.Rows.Count < 1) {
-            {
                 MessageBox.Show("인쇄할 목록이 없습니다!");
                 return;
             }
@@ -96,7 +101,7 @@ namespace WindowsFormsApp1.Delivery
             printDocument1.DefaultPageSettings.Margins.Bottom = 10;
 
             // 용지 방향    가로(true), 세로(false)
-            printDocument1.DefaultPageSettings.Landscape = true;
+            printDocument1.DefaultPageSettings.Landscape = false;
 
             // 용지 크기
             printDocument1.DefaultPageSettings.PaperSize = 
@@ -113,22 +118,15 @@ namespace WindowsFormsApp1.Delivery
             }
         }
 
-        private void button1_Click(object sender, EventArgs e)
+        private void printDocument1_BeginPrint(object sender, PrintEventArgs e)
         {
-            string x = ps.DefaultPageSettings.PrintableArea.ToString();
+            cnt = 0;
-            string y = ps.DefaultPageSettings.PrintableArea.ToString();
+            pageNo = 1;
-            string landscape = ps.DefaultPageSettings.Landscape.ToString();
-            string size = ps.DefaultPageSettings.PaperSize.ToString();
-
-            string msg = string.Format("x:{0}\n, y:{1}\n, 가로:{2}\n, 사이즈:{3}\n", x, y, landscape, size);
-            MessageBox.Show(msg);
         }
 
         private void printDocument1_tempPage(object sender, PrintPageEventArgs e)
         {
             PrintGrid(dataGridView1, e);
-            cnt = 0;
-            pageNo = 1;
         }
 
         private void PrintGrid(DataGridView gridView, PrintPageEventArgs e)
@@ -148,26 +146,40 @@ namespace WindowsFormsApp1.Delivery
             // 시작점 x좌표
             int startWidth = 10;
             // 시작점 y좌표
-            int startHeight = 140;
+            int startHeight = 80;
 
             // datagrid 1개의 컬럼 하나의 높이
-            int avgHeight = gridView.Rows[0].Height;
+            // int avgHeight = gridView.Rows[0].Height;
+            int avgHeight = 25;
 
             int temp = 0;   // row개수 세어줄 것. cnt역할.
 
-            g.DrawString("목록 조회", new Font("Arial", 20, FontStyle.Bold), Brushes.Black, dialogWidth / 2, 40);
+            string Title = cb_list_name.Text;
-            g.DrawString("인쇄일: " + DateTime.Now.ToString("yyyy/MM/dd"), new Font("Arial", 13), Brushes.Black, dialogWidth - 20, 80);
+
-            g.DrawString("페이지번호: " + pageNo, new Font("Arial", 13), Brushes.Black, dialogWidth - 20, 100);
+            g.DrawString(Title, new Font("Arial", 20, FontStyle.Bold), Brushes.Black, 10, 10);
+            g.DrawString("목록일자: " + list_Date, new Font("Arial", 13), Brushes.Black, dialogWidth - 20, 45);
+            g.DrawString("페이지번호: " + pageNo, new Font("Arial", 13), Brushes.Black, dialogWidth - 20, 1150);
 
             for (int a = 0; a < gridView.ColumnCount; a++)      // columnCount는 일정
             {
-                if (!gridView.Columns[a].Visible) { continue; }
+                if (!gridView.Columns[a].Visible)
-                if (a == 0)
+                    continue;
+                if (gridView.Columns[a].Name == "Column1" || gridView.Columns[a].Name == "stat" ||
+                    gridView.Columns[a].Name == "gubun" || gridView.Columns[a].Name == "order")
+                    continue;
+
+                if (a == 2)
                 {
                     width = 0;
                     width1 = gridView.Columns[a].Width + 15;
                 }
-                else if (a >= 1 && a < gridView.ColumnCount - 1)
+                else if (gridView.Columns[a].Name == "etc")
+                {
+                    int etcWidth = 250;
+                    width = gridView.Columns[a - 1].Width - 5;
+                    width1 = etcWidth - 5;
+                }
+                else if (a < gridView.ColumnCount - 1)
                 {
                     width = gridView.Columns[a - 1].Width + 15;
                     width1 = gridView.Columns[a].Width + 15;
@@ -192,13 +204,24 @@ namespace WindowsFormsApp1.Delivery
                 startWidth = 10;
                 for (int b = 0; b < gridView.ColumnCount; b++)
                 {
-                    if (!gridView.Columns[b].Visible) { continue; }
+                    if (!gridView.Columns[b].Visible) 
-                    if (b == 0)
+                        continue;
+                    if (gridView.Columns[b].Name == "Column1" || gridView.Columns[b].Name == "stat" ||
+                        gridView.Columns[b].Name == "gubun" || gridView.Columns[b].Name == "order")
+                        continue;
+
+                    if (b == 2)
                     {
                         width = 0;
                         width1 = gridView.Columns[b].Width + 15;
                     }
-                    else if (b >= 1 && b <= gridView.ColumnCount - 2)
+                    else if (gridView.Columns[b].Name == "etc")
+                    {
+                        int etcWidth = 250;
+                        width = gridView.Columns[b - 1].Width - 5;
+                        width1 = etcWidth - 5;
+                    }
+                    else if (b <= gridView.ColumnCount - 2)
                     {
                         width = gridView.Columns[b - 1].Width + 15;
                         width1 = gridView.Columns[b].Width + 15;
@@ -222,7 +245,7 @@ namespace WindowsFormsApp1.Delivery
                 temp++;
                 cnt++;
 
-                if (temp % 23 == 0)
+                if (temp % 40 == 0)
                 {
                     e.HasMorePages = true;
                     pageNo++;
@@ -383,11 +406,11 @@ namespace WindowsFormsApp1.Delivery
             {
                 ary_where[3] = string.Format("`list_name` = \"{0}\"", cb_list_name.Text);
             }
-            if (cb_import.SelectedItem.ToString() != "전체")
+            if (cb_import.SelectedIndex != 0)
             {
                 ary_where[4] = string.Format("`import` = \"{0}\"", cb_import.Text);
             }
-            if (cb_export.SelectedItem.ToString() != "전체")
+            if (cb_export.SelectedIndex != 0)
             {
                 ary_where[5] = string.Format("`export` = \"{0}\"", cb_export.Text);
             }
@@ -558,6 +581,14 @@ namespace WindowsFormsApp1.Delivery
             }
         }
 
+        private void cb_list_name_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string cmd = string.Format("SELECT {0} FROM {1} WHERE `list_name` = \"{2}\";",
+                "`date`", "Obj_List", cb_list_name.SelectedItem.ToString());
+            string res = db.DB_Send_CMD_Search(cmd);
+            list_Date = res.Replace("|", "");
+        }
+
         private void tb_order_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)

unimarc/unimarc/납품관리/List_Lookup.resx

@@ -163,7 +163,7 @@
     <value>True</value>
   </metadata>
   <metadata name="printDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1, -5</value>
+    <value>3, -2</value>
   </metadata>
   <metadata name="printPreviewDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>125, -3</value>

unimarc/unimarc/납품관리/List_aggregation.Designer.cs

@@ -511,7 +511,7 @@
             // 
             this.lbl_send_n.AutoSize = true;
             this.lbl_send_n.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.lbl_send_n.Location = new System.Drawing.Point(327, 360);
+            this.lbl_send_n.Location = new System.Drawing.Point(327, 291);
             this.lbl_send_n.Name = "lbl_send_n";
             this.lbl_send_n.Size = new System.Drawing.Size(24, 13);
             this.lbl_send_n.TabIndex = 16;
@@ -533,7 +533,7 @@
             // 
             this.label27.AutoSize = true;
             this.label27.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.label27.Location = new System.Drawing.Point(306, 360);
+            this.label27.Location = new System.Drawing.Point(306, 291);
             this.label27.Name = "label27";
             this.label27.Size = new System.Drawing.Size(13, 13);
             this.label27.TabIndex = 16;

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

@@ -35,21 +35,31 @@ namespace WindowsFormsApp1.Delivery
             // 작업명 - 배송방법까진 수정이 가능하여야함. 3,4,5,6 + 체크 추가
             for (int a = 0; a < 16; a++)
             {
-                if(a==2 || a == 4 || a == 5 || a == 6 || a == 15) {
+                if (a == 2 || a == 4 || a == 5 || a == 6 || a == 15)
                     dataGridView1.Columns[a].ReadOnly = false;
-                }
+
-                else { dataGridView1.Columns[a].ReadOnly = true; }
+                else
+                    dataGridView1.Columns[a].ReadOnly = true;
             }
             string[] state = { "진행", "완료", "전체" };
             combo_state.Items.AddRange(state);
             combo_state.SelectedIndex = 0;
 
-            string[] years = {"2009", "2010", "2011", "2012", "2013",
+            #region 연도삽입
-                              "2014", "2015", "2016", "2017", "2018",
+            int Years = DateTime.Now.Year;
-                              "2019", "2020", "2021"};
+
+            List<string> Year = new List<string>();
+            while (Years != 2009)
+            {
+                string AddYear = Years.ToString();
+                Year.Add(AddYear);
+                Years--;
+            }
+            string[] years = Year.ToArray();
             combo_year.Items.AddRange(years);
-            combo_year.SelectedIndex = 11;
+            combo_year.SelectedIndex = 0;
             combo_year.Visible = false;
+            #endregion
 
             combo_user.Items.Add("전체");
             string cmd = db.self_Made_Cmd("SELECT `name` FROM `User_Data` WHERE `affil` = '" + main.toolStripLabel2.Text + "';");
@@ -59,7 +69,7 @@ namespace WindowsFormsApp1.Delivery
                 if (a == user_name.Length - 1) { break; }
                 combo_user.Items.Add(user_name[a]);
             }
-            combo_user.SelectedItem = main.botUserLabel.Text;
+            combo_user.SelectedIndex = 0;
         }
         public void btn_lookup_Click(object sender, EventArgs e)   // 조회
         {
@@ -69,6 +79,7 @@ namespace WindowsFormsApp1.Delivery
             string searchdb = "`list_name`, `date`, `date_res`, `charge`, `work_name`, " +
                               "`work_way`, `send_way`, `total`, `stock_money`, `vol`, " +
                               "`stock`, `unstock`, `list_num`, `chk_marc`, `clt`";
+
             List<string> search_L_tbl = new List<string>();
             List<string> search_L_col = new List<string>();
 
@@ -454,6 +465,7 @@ namespace WindowsFormsApp1.Delivery
         {
             Check_ISBN isbn = new Check_ISBN(this);
             isbn.list_name = dataGridView1.Rows[row].Cells["list_name"].Value.ToString();
+            isbn.DataLoad();
             isbn.Show();
         }
         private void btn_date_Click(object sender, EventArgs e)     // 일정
@@ -570,8 +582,10 @@ namespace WindowsFormsApp1.Delivery
             if (e.ColumnIndex != 2 || e.ColumnIndex != 4 || e.ColumnIndex != 5 || 
                 e.ColumnIndex != 6 || e.ColumnIndex != 15)
             {
-                List_Lookup list_l = new List_Lookup(this);
+                List_Lookup list_l = new List_Lookup(this)
-                list_l.call_base = dataGridView1.Rows[e.RowIndex].Cells["list_name"].Value.ToString();
+                {
+                    call_base = dataGridView1.Rows[e.RowIndex].Cells["list_name"].Value.ToString()
+                };
                 list_l.MdiParent = main;
                 list_l.WindowState = FormWindowState.Maximized;
                 list_l.Show();
@@ -585,24 +599,26 @@ namespace WindowsFormsApp1.Delivery
 
         private void lbl_l_y_Click(object sender, EventArgs e)
         {
-            if(((Label)sender).Name == "lbl_l_y") {
+            if (((Label)sender).Name == "lbl_l_y") {
                 lbl_l_y.Font = new Font(this.Font, FontStyle.Bold);
                 lbl_l_n.Font = new Font(this.Font, FontStyle.Regular);
             }
-            if(((Label)sender).Name == "lbl_l_n") {
+
+            if (((Label)sender).Name == "lbl_l_n") {
                 lbl_l_y.Font = new Font(this.Font, FontStyle.Regular);
                 lbl_l_n.Font = new Font(this.Font, FontStyle.Bold);
             }
-            if(((Label)sender).Name == "lbl_send_y")
+
-            {
+            if (((Label)sender).Name == "lbl_send_y") {
                 lbl_send_y.Font = new Font(this.Font, FontStyle.Bold);
                 lbl_send_n.Font = new Font(this.Font, FontStyle.Regular);
             }
-            if (((Label)sender).Name == "lbl_send_n")
+
-            {
+            if (((Label)sender).Name == "lbl_send_n") {
                 lbl_send_y.Font = new Font(this.Font, FontStyle.Regular);
                 lbl_send_n.Font = new Font(this.Font, FontStyle.Bold);
             }
+
         }
     }
 }

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

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using WindowsFormsApp1.Account;
+using WindowsFormsApp1.Mac;
 
 namespace WindowsFormsApp1.Delivery
 {
@@ -16,12 +17,14 @@ namespace WindowsFormsApp1.Delivery
         Order_input oin;
         Purchase_Book pb;
         Remit_reg2 rem2;
+        Check_ISBN isbn;
         Helper_DB db = new Helper_DB();
 
         int grididx = 0;
         public int[] oin_grid_idx = { 0, 0 };
         public string Where_Open;
         public string searchText;
+        public bool OnlyMarc = false;
         string compidx;
 
         public Order_input_Search(Order_input o_in)
@@ -44,6 +47,14 @@ namespace WindowsFormsApp1.Delivery
             compidx = pb.compidx;
             searchText = pb.tb_purchase.Text;
         }
+        public Order_input_Search(Check_ISBN _isbn)
+        {
+            InitializeComponent();
+            isbn = _isbn;
+            compidx = isbn.compidx;
+            searchText = isbn.tb_list_name.Text;
+        }
+
         public Order_input_Search()
         {
             InitializeComponent();
@@ -54,16 +65,22 @@ namespace WindowsFormsApp1.Delivery
             db.DBcon();
             if (Where_Open == "book_list")
             {
-                if (searchText == "")
+                string table = "Obj_List";
+                string Area = "`list_name`, `charge`, `date`, `date_res`";
+                cmd = string.Format("SELECT {0} FROM {1} WHERE `comp_num` = {2} AND `state` = \"진행\"", Area, table, compidx);
+                if (searchText != "")
                 {
-                    cmd = db.DB_Contains("Obj_List", compidx,
+                    cmd += " AND `list_name` like \"%" + searchText + "%\"";
-                        "", "", "`list_name`, `charge`, `date`, `date_res`");
+                    // cmd = db.DB_Contains("Obj_List", compidx,
+                    //     "", "", "`list_name`, `charge`, `date`, `date_res`");
                 }
-                else
+                if (OnlyMarc)
                 {
-                    cmd = db.DB_Contains("Obj_List", compidx,
+                    cmd += " AND `chk_marc` > 0";
-                        "list_name", searchText, "`list_name`, `charge`, `date`, `date_res`");
+                    // cmd = db.DB_Contains("Obj_List", compidx,
+                    //     "list_name", searchText, "`list_name`, `charge`, `date`, `date_res`");
                 }
+                cmd += ";";
                 db_res = db.DB_Send_CMD_Search(cmd);
                 made_grid(db_res);
                 this.Text = "목록 검색";
@@ -114,7 +131,11 @@ namespace WindowsFormsApp1.Delivery
             if (e.KeyCode == Keys.Up) { grididx--; }
             if (e.KeyCode == Keys.Down) { grididx++; }
 
-            if (e.KeyCode == Keys.Enter) { dataGridView1_CellDoubleClick(null, null); }
+            if (e.KeyCode == Keys.Enter) {
+                if (dataGridView1.Rows.Count == 0)
+                    return;
+                dataGridView1_CellDoubleClick(null, null);
+            }
             if (e.KeyCode == Keys.Escape) { Close(); }
         }
         private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
@@ -131,6 +152,11 @@ namespace WindowsFormsApp1.Delivery
                 rem2.tb_purchase.Text = dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString();
                 rem2.mk_base(rem2.tb_purchase.Text);
             }
+            else if (isbn != null) {
+                string listName = dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString();
+                isbn.tb_list_name.Text = listName;
+                isbn.DataLoad(listName);
+            }
             Close();
         }
         private void oin_result()

unimarc/unimarc/마크/Check_ISBN.Designer.cs

@@ -32,6 +32,19 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.btn_lookup = new System.Windows.Forms.Button();
+            this.cb_filter = new System.Windows.Forms.ComboBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.tb_list_name = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.btn_Save = new System.Windows.Forms.Button();
+            this.btn_Close = new System.Windows.Forms.Button();
+            this.label3 = new System.Windows.Forms.Label();
+            this.cb_api = new System.Windows.Forms.ComboBox();
+            this.progressBar1 = new System.Windows.Forms.ProgressBar();
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.btn_yes24 = new System.Windows.Forms.Button();
+            this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.num = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -52,18 +65,6 @@
             this.sold_out = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.image = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.api_data = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btn_lookup = new System.Windows.Forms.Button();
-            this.cb_filter = new System.Windows.Forms.ComboBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.tb_list_name = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.btn_Save = new System.Windows.Forms.Button();
-            this.btn_Close = new System.Windows.Forms.Button();
-            this.label3 = new System.Windows.Forms.Label();
-            this.cb_api = new System.Windows.Forms.ComboBox();
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.btn_yes24 = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -81,6 +82,7 @@
             this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.idx,
             this.num,
             this.isbn,
             this.book_name,
@@ -122,6 +124,123 @@
             this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
             this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
             // 
+            // btn_lookup
+            // 
+            this.btn_lookup.Location = new System.Drawing.Point(706, 7);
+            this.btn_lookup.Name = "btn_lookup";
+            this.btn_lookup.Size = new System.Drawing.Size(99, 23);
+            this.btn_lookup.TabIndex = 1;
+            this.btn_lookup.Text = "ISBN 자동 조회";
+            this.btn_lookup.UseVisualStyleBackColor = true;
+            this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click);
+            // 
+            // cb_filter
+            // 
+            this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cb_filter.FormattingEnabled = true;
+            this.cb_filter.Location = new System.Drawing.Point(516, 8);
+            this.cb_filter.Name = "cb_filter";
+            this.cb_filter.Size = new System.Drawing.Size(161, 20);
+            this.cb_filter.TabIndex = 2;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(16, 12);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(41, 12);
+            this.label1.TabIndex = 3;
+            this.label1.Text = "목록명";
+            // 
+            // tb_list_name
+            // 
+            this.tb_list_name.Enabled = false;
+            this.tb_list_name.Location = new System.Drawing.Point(59, 8);
+            this.tb_list_name.Name = "tb_list_name";
+            this.tb_list_name.Size = new System.Drawing.Size(213, 21);
+            this.tb_list_name.TabIndex = 4;
+            this.tb_list_name.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_list_name_KeyDown);
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(457, 12);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(57, 12);
+            this.label2.TabIndex = 3;
+            this.label2.Text = "검색 조건";
+            // 
+            // btn_Save
+            // 
+            this.btn_Save.Location = new System.Drawing.Point(815, 7);
+            this.btn_Save.Name = "btn_Save";
+            this.btn_Save.Size = new System.Drawing.Size(99, 23);
+            this.btn_Save.TabIndex = 1;
+            this.btn_Save.Text = "전 체  저 장";
+            this.btn_Save.UseVisualStyleBackColor = true;
+            this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
+            // 
+            // btn_Close
+            // 
+            this.btn_Close.Location = new System.Drawing.Point(1033, 7);
+            this.btn_Close.Name = "btn_Close";
+            this.btn_Close.Size = new System.Drawing.Size(99, 23);
+            this.btn_Close.TabIndex = 1;
+            this.btn_Close.Text = "닫    기";
+            this.btn_Close.UseVisualStyleBackColor = true;
+            this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(278, 12);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(57, 12);
+            this.label3.TabIndex = 5;
+            this.label3.Text = "검색 엔진";
+            // 
+            // cb_api
+            // 
+            this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cb_api.FormattingEnabled = true;
+            this.cb_api.Location = new System.Drawing.Point(337, 8);
+            this.cb_api.Name = "cb_api";
+            this.cb_api.Size = new System.Drawing.Size(93, 20);
+            this.cb_api.TabIndex = 6;
+            this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged);
+            // 
+            // progressBar1
+            // 
+            this.progressBar1.Location = new System.Drawing.Point(1166, 7);
+            this.progressBar1.Name = "progressBar1";
+            this.progressBar1.Size = new System.Drawing.Size(219, 23);
+            this.progressBar1.TabIndex = 7;
+            // 
+            // richTextBox1
+            // 
+            this.richTextBox1.Location = new System.Drawing.Point(12, 589);
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.Size = new System.Drawing.Size(1608, 123);
+            this.richTextBox1.TabIndex = 8;
+            this.richTextBox1.Text = "";
+            // 
+            // btn_yes24
+            // 
+            this.btn_yes24.Location = new System.Drawing.Point(924, 7);
+            this.btn_yes24.Name = "btn_yes24";
+            this.btn_yes24.Size = new System.Drawing.Size(99, 23);
+            this.btn_yes24.TabIndex = 1;
+            this.btn_yes24.Text = "예스 양식 반출";
+            this.btn_yes24.UseVisualStyleBackColor = true;
+            this.btn_yes24.Click += new System.EventHandler(this.btn_yes24_Click);
+            // 
+            // idx
+            // 
+            this.idx.HeaderText = "idx";
+            this.idx.Name = "idx";
+            this.idx.Visible = false;
+            this.idx.Width = 50;
+            // 
             // num
             // 
             this.num.HeaderText = "번호";
@@ -231,115 +350,6 @@
             this.api_data.Name = "api_data";
             this.api_data.Visible = false;
             // 
-            // btn_lookup
-            // 
-            this.btn_lookup.Location = new System.Drawing.Point(706, 7);
-            this.btn_lookup.Name = "btn_lookup";
-            this.btn_lookup.Size = new System.Drawing.Size(99, 23);
-            this.btn_lookup.TabIndex = 1;
-            this.btn_lookup.Text = "ISBN 자동 조회";
-            this.btn_lookup.UseVisualStyleBackColor = true;
-            this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click);
-            // 
-            // cb_filter
-            // 
-            this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_filter.FormattingEnabled = true;
-            this.cb_filter.Location = new System.Drawing.Point(516, 8);
-            this.cb_filter.Name = "cb_filter";
-            this.cb_filter.Size = new System.Drawing.Size(161, 20);
-            this.cb_filter.TabIndex = 2;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(16, 12);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 12);
-            this.label1.TabIndex = 3;
-            this.label1.Text = "목록명";
-            // 
-            // tb_list_name
-            // 
-            this.tb_list_name.Enabled = false;
-            this.tb_list_name.Location = new System.Drawing.Point(59, 8);
-            this.tb_list_name.Name = "tb_list_name";
-            this.tb_list_name.Size = new System.Drawing.Size(199, 21);
-            this.tb_list_name.TabIndex = 4;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(457, 12);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(57, 12);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "검색 조건";
-            // 
-            // btn_Save
-            // 
-            this.btn_Save.Location = new System.Drawing.Point(815, 7);
-            this.btn_Save.Name = "btn_Save";
-            this.btn_Save.Size = new System.Drawing.Size(99, 23);
-            this.btn_Save.TabIndex = 1;
-            this.btn_Save.Text = "전 체  저 장";
-            this.btn_Save.UseVisualStyleBackColor = true;
-            this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
-            // 
-            // btn_Close
-            // 
-            this.btn_Close.Location = new System.Drawing.Point(1033, 7);
-            this.btn_Close.Name = "btn_Close";
-            this.btn_Close.Size = new System.Drawing.Size(99, 23);
-            this.btn_Close.TabIndex = 1;
-            this.btn_Close.Text = "닫    기";
-            this.btn_Close.UseVisualStyleBackColor = true;
-            this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(278, 12);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(57, 12);
-            this.label3.TabIndex = 5;
-            this.label3.Text = "검색 엔진";
-            // 
-            // cb_api
-            // 
-            this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_api.FormattingEnabled = true;
-            this.cb_api.Location = new System.Drawing.Point(337, 8);
-            this.cb_api.Name = "cb_api";
-            this.cb_api.Size = new System.Drawing.Size(93, 20);
-            this.cb_api.TabIndex = 6;
-            this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged);
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Location = new System.Drawing.Point(1166, 7);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(219, 23);
-            this.progressBar1.TabIndex = 7;
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.Location = new System.Drawing.Point(12, 589);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(1608, 123);
-            this.richTextBox1.TabIndex = 8;
-            this.richTextBox1.Text = "";
-            // 
-            // btn_yes24
-            // 
-            this.btn_yes24.Location = new System.Drawing.Point(924, 7);
-            this.btn_yes24.Name = "btn_yes24";
-            this.btn_yes24.Size = new System.Drawing.Size(99, 23);
-            this.btn_yes24.TabIndex = 1;
-            this.btn_yes24.Text = "예스 양식 반출";
-            this.btn_yes24.UseVisualStyleBackColor = true;
-            this.btn_yes24.Click += new System.EventHandler(this.btn_yes24_Click);
-            // 
             // Check_ISBN
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -372,7 +382,6 @@
         private System.Windows.Forms.Button btn_lookup;
         private System.Windows.Forms.ComboBox cb_filter;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox tb_list_name;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Button btn_Save;
         private System.Windows.Forms.Button btn_Close;
@@ -381,6 +390,9 @@
         private System.Windows.Forms.ProgressBar progressBar1;
         public System.Windows.Forms.DataGridView dataGridView1;
         private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.Button btn_yes24;
+        public System.Windows.Forms.TextBox tb_list_name;
+        private System.Windows.Forms.DataGridViewTextBoxColumn idx;
         private System.Windows.Forms.DataGridViewTextBoxColumn num;
         private System.Windows.Forms.DataGridViewTextBoxColumn isbn;
         private System.Windows.Forms.DataGridViewTextBoxColumn book_name;
@@ -401,6 +413,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn sold_out;
         private System.Windows.Forms.DataGridViewTextBoxColumn image;
         private System.Windows.Forms.DataGridViewTextBoxColumn api_data;
-        private System.Windows.Forms.Button btn_yes24;
     }
 }

unimarc/unimarc/마크/Check_ISBN.cs

@@ -45,8 +45,13 @@ namespace WindowsFormsApp1.Mac
         }
 
         private void Check_ISBN_Load(object sender, EventArgs e)
+        {
+        }
+
+        public void DataLoad()
         {
             tb_list_name.Text = list_name;
+            cb_api.Items.Clear();
 
             string[] list_combo = { "알라딘", "네이버", "다음" };
             cb_api.Items.AddRange(list_combo);
@@ -63,6 +68,28 @@ namespace WindowsFormsApp1.Mac
             string[] data = db_res.Split('|');
             made_Grid(data);
         }
+
+        public void DataLoad(string ListName)
+        {
+            dataGridView1.Rows.Clear();
+
+            list_name = ListName;
+
+            string[] list_combo = { "알라딘", "네이버", "다음" };
+            cb_api.Items.AddRange(list_combo);
+
+            db.DBcon();
+            string[] search_tbl = { "compidx", "list_name" };
+            string[] search_col = { compidx, ListName };
+            string search_data = "`idx`, `header`, `num`, `isbn_marc`, `book_name`, `author`, `book_comp`, " +
+                                 "`count`, `pay`, `total`, `import`, `price`, " +
+                                 "`etc`, `pubDate`, `persent`, `category`, `image_url`, `set_book_name`";
+
+            string cmd = db.More_DB_Search("Obj_List_Book", search_tbl, search_col, search_data);
+            string db_res = db.DB_Send_CMD_Search(cmd);
+            string[] data = db_res.Split('|');
+            made_Grid(data);
+        }
         #region Load_Sub
         void made_Grid(string[] data)
         {
@@ -72,29 +99,30 @@ namespace WindowsFormsApp1.Mac
             string[] grid = { "", "", "", "", "",
                               "", "", "", "", "",
                               "", "", "", "", "",
-                              "", "", "", "" };
+                              "", "", "", "", "" };
 
-            int sdc = 17; // search_data_count
+            int sdc = 18; // search_data_count
             for (int a = 0; a < data.Length; a++)
             {
-                if (a % sdc == 1) { grid[0] = data[a - 1] + " " + data[a]; }  // 번호
+                if (a % sdc ==  0) { grid[ 0] = data[a]; }                      // idx
-                if (a % sdc == 2) { grid[1] = data[a]; }                    // isbn
+                if (a % sdc ==  2) { grid[ 1] = data[a - 1] + " " + data[a]; }  // 번호
-                if (a % sdc == 3) { grid[2] = data[a]; }                    // 도서명
+                if (a % sdc ==  3) { grid[ 2] = data[a]; }                      // isbn
-                if (a % sdc == 4) { grid[4] = data[a]; }                    // 저자
+                if (a % sdc ==  4) { grid[ 3] = data[a]; }                      // 도서명
-                if (a % sdc == 5) { grid[6] = data[a]; }                    // 출판사
+                if (a % sdc ==  5) { grid[ 5] = data[a]; }                      // 저자
-                if (a % sdc == 6) { grid[8] = data[a]; }                    // 수량
+                if (a % sdc ==  6) { grid[ 7] = data[a]; }                      // 출판사
-                if (a % sdc == 7) { grid[9] = data[a]; }                    // 단가
+                if (a % sdc ==  7) { grid[ 9] = data[a]; }                      // 수량
-                if (a % sdc == 8) { grid[10] = data[a]; }                   // 합계
+                if (a % sdc ==  8) { grid[10] = data[a]; }                      // 단가
-                if (a % sdc == 9) { grid[11] = data[a]; }                   // 상태
+                if (a % sdc ==  9) { grid[11] = data[a]; }                      // 합계
-                if (a % sdc == 10) { grid[12] = data[a]; }                  // 정가
+                if (a % sdc == 10) { grid[12] = data[a]; }                      // 상태
-                if (a % sdc == 11) { grid[13] = data[a]; }                  // 비고
+                if (a % sdc == 11) { grid[13] = data[a]; }                      // 정가
-                if (a % sdc == 12) { grid[14] = data[a]; }                  // 발행일
+                if (a % sdc == 12) { grid[14] = data[a]; }                      // 비고
-                if (a % sdc == 13) { grid[15] = data[a]; }                  // %
+                if (a % sdc == 13) { grid[15] = data[a]; }                      // 발행일
-                if (a % sdc == 14) { grid[16] = data[a]; }                  // 도서분류
+                if (a % sdc == 14) { grid[16] = data[a]; }                      // %
-                if (a % sdc == 15) { grid[18] = data[a]; }                  // 도서 URL
+                if (a % sdc == 15) { grid[17] = data[a]; }                      // 도서분류
-                if (a % sdc == 16) {
+                if (a % sdc == 16) { grid[19] = data[a]; }                      // 도서 URL
+                if (a % sdc == 17) {
                     if (data[a] != "") {
-                        grid[2] = data[a];
+                        grid[3] = data[a];
                     }
                     dataGridView1.Rows.Add(grid);
                 }
@@ -179,7 +207,6 @@ namespace WindowsFormsApp1.Mac
         {
             string temp = string.Empty;
             string type = string.Empty;
-            string query = string.Empty;
 
             // 도서명 / 저자 / 출판사 / isbn / 정가
             // 발행일 / 도서분류 / 재고
@@ -190,28 +217,42 @@ namespace WindowsFormsApp1.Mac
             switch (cb_filter.SelectedIndex)
             {
                 case 0:
-                    type = "Keyword";
-                    break;
-                case 1:
                     type = "Title";
                     break;
-                case 2:
+                case 1:
                     type = "Author";
                     break;
-                case 3:
+                case 2:
                     type = "Publisher";
                     break;
+                case 3:
+                    type = "ISBN13";
+                    break;
             }
-            for (int a = 0; a < dataGridView1.Rows.Count - 1; a++) 
+            for (int a = 0; a < dataGridView1.Rows.Count; a++) 
             {
                 progressBar1.PerformStep();
-                if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.Yellow) 
-                    continue;
 
-                else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray)
+                // if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.Yellow)
-                    gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
+                //     continue;
+                // else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray)
+                //     gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
 
-                query = Aladin_Set_query(type, a);
+                string isbn = gridview.Rows[a].Cells["isbn"].Value.ToString();
+                if (cb_filter.SelectedIndex == 3) {
+                    if (!CheckData(isbn))
+                        continue;
+                    else
+                        gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
+                }
+                else {
+                    if (CheckData(isbn))
+                        continue;
+                    else
+                        gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
+                }
+
+                string query = Aladin_Set_query(type, a);
                 insert_Aladin(api.Aladin(query, type, param), a);
             }
         }
@@ -219,10 +260,6 @@ namespace WindowsFormsApp1.Mac
         {
             string result = string.Empty;
 
-            if (type == "Keyword")
-                result = dataGridView1.Rows[idx].Cells["book_name"].Value.ToString() +
-                         dataGridView1.Rows[idx].Cells["author"].Value.ToString();
-
             if (type == "Title")
                 result = dataGridView1.Rows[idx].Cells["book_name"].Value.ToString();
 
@@ -232,6 +269,9 @@ namespace WindowsFormsApp1.Mac
             if (type == "Publisher")
                 result = dataGridView1.Rows[idx].Cells["book_comp"].Value.ToString();
 
+            if (type == "ISBN13")
+                result = dataGridView1.Rows[idx].Cells["isbn"].Value.ToString();
+
             return result;
         }
         private void Naver_API(DataGridView gridview)
@@ -250,9 +290,14 @@ namespace WindowsFormsApp1.Mac
                 L_Array.Clear();
                 progressBar1.PerformStep();
 
-                if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.Yellow)
+                // if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.Yellow)
+                //     continue;
+                // else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray)
+                //     gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
+                string isbn = gridview.Rows[a].Cells["isbn"].Value.ToString();
+                if (CheckData(isbn))
                     continue;
-                else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray)
+                else
                     gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
 
                 #region 필터적용
@@ -323,9 +368,16 @@ namespace WindowsFormsApp1.Mac
             for(int a = 0; a < gridview.Rows.Count; a++)
             {
                 progressBar1.PerformStep();
-                if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.Yellow)
+                string isbn = gridview.Rows[a].Cells["isbn"].Value.ToString();
+
+                // if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.Yellow)
+                //     continue;
+                // else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray)
+                //     gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
+
+                if (CheckData(isbn))
                     continue;
-                else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray)
+                else
                     gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
 
                 switch (cb_filter.SelectedIndex)
@@ -347,6 +399,15 @@ namespace WindowsFormsApp1.Mac
                 insert_Daum(result, a);
             }
         }
+
+        bool CheckData(string isbn)
+        {
+            if (isbn == null)
+                return false;
+            if (isbn == "")
+                return false;
+            return true;
+        }
         void insert_Aladin(string data, int row)
         {
             if (row > 0) { dataGridView1.Rows[row - 1].Selected = false; }
@@ -374,7 +435,58 @@ namespace WindowsFormsApp1.Mac
             if (insert.Length > 10) {
                 return;
             }
+            if (cb_filter.SelectedItem.ToString() == "별치조사")
+                input_api_aladin(insert, row, newstring);
             input_api(insert, row, newstring);
+
+            /*
+            if (row > 0) { dataGridView1.Rows[row - 1].Selected = false; }
+            dataGridView1.Rows[row].Selected = true;
+
+            string[] insert = data.Split('|');
+
+            if (data == "") { return; }
+
+            // pubDate형 보기편하게 DateTime형으로 재정리
+            string newstring = "";
+            try
+            {
+                newstring = String.Format("{0:yyyy/MM/dd}",
+                    DateTime.Parse(insert[5].Remove(insert[5].IndexOf(" G"))));
+            }
+            catch (Exception ex) { MessageBox.Show(data); }
+
+            for (int a = 0; a < insert.Length; a++)
+            {
+                if (a % 8 == 6) { insert[a] = Aladin_CategorySort(insert[a]); }
+            }
+
+            dataGridView1.Rows[row].Cells["Column1"].Value += string.Join("|", insert) + "|";
+            dataGridView1.Rows[row].DefaultCellStyle.BackColor = Color.LightGray;
+            if (cb_filter.SelectedItem.ToString() == "별치조사")
+                input_api_aladin(insert, row, newstring);
+            input_api(insert, row, newstring);*/
+        }
+        string Aladin_CategorySort(string insert)
+        {
+            // 도서 분류 필요한 데이터로 재정리
+            int top = insert.IndexOf('>');
+            int mid = insert.IndexOf('>', top + 1);
+            int bot = insert.IndexOf('>', mid + 1);
+
+            if (bot < 0) { insert = insert.Substring(top + 1); }
+            else { insert = insert.Substring(top + 1, bot - top - 1); }
+
+            return insert;
+        }
+        void input_api_aladin(string[] value, int idx, string date)
+        {
+            dataGridView1.Rows[idx].Cells["search_book_name"].Value = value[0];
+            dataGridView1.Rows[idx].Cells["search_author"].Value = value[1];
+            dataGridView1.Rows[idx].Cells["search_book_comp"].Value = value[2];
+            dataGridView1.Rows[idx].Cells["price"].Value = value[4];
+            dataGridView1.Rows[idx].Cells["pubDate"].Value = date;
+            dataGridView1.Rows[idx].Cells["category"].Value = value[6];
         }
         void insert_Naver(string value, int row)
         {
@@ -529,19 +641,24 @@ namespace WindowsFormsApp1.Mac
         }
         private void btn_Save_Click(object sender, EventArgs e)
         {
+            string[] Edit_tbl = { "isbn", "price", "pubDate", "category", "image_url" };
             for (int a = 0; a < dataGridView1.Rows.Count; a++)
             {
-                if (dataGridView1.Rows[a].Cells["isbn"].Value.ToString() == "") { continue; }
+                if (dataGridView1.Rows[a].Cells["isbn"].Value == null) continue;
-                string[] Edit_tbl = { "isbn", "price", "pubDate", "category", "image_url" };
+                if (dataGridView1.Rows[a].Cells["isbn"].Value.ToString() == "") continue;
+
+                if (main != null)
+                    Edit_tbl[0] = "isbn_marc";
+                else
+                    Edit_tbl[0] = "isbn";
+
                 string[] Edit_Col = { dataGridView1.Rows[a].Cells["isbn"].Value.ToString(),
                                       dataGridView1.Rows[a].Cells["price"].Value.ToString(),
                                       dataGridView1.Rows[a].Cells["pubDate"].Value.ToString(),
                                       dataGridView1.Rows[a].Cells["category"].Value.ToString(),
                                       dataGridView1.Rows[a].Cells["image"].Value.ToString() };
-                string[] Search_tbl = { "book_name", "author", "book_comp", "list_name", "compidx" };
+                string[] Search_tbl = { "idx", "list_name", "compidx" };
-                string[] Search_col = { dataGridView1.Rows[a].Cells["book_name"].Value.ToString(),
+                string[] Search_col = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(),
-                                        dataGridView1.Rows[a].Cells["author"].Value.ToString(),
-                                        dataGridView1.Rows[a].Cells["book_comp"].Value.ToString(),
                                         list_name, compidx };
 
                 if (dataGridView1.Rows[a].Cells["etc"].Value.ToString().Contains("세트분할"))
@@ -571,6 +688,8 @@ namespace WindowsFormsApp1.Mac
         }
         private void dataGridView1_KeyDown(object sender, KeyEventArgs e)
         {
+            Skill_Grid sg = new Skill_Grid();
+            sg.Excel_to_DataGridView(sender, e);
             if (e.KeyCode == Keys.Enter) { dataGridView1_CellDoubleClick(null, null); rowidx++; }
             if(e.KeyCode== Keys.Insert)
             {
@@ -612,7 +731,7 @@ namespace WindowsFormsApp1.Mac
         {
             cb_filter.Items.Clear();
             if (cb_api.SelectedIndex == 0) {
-                string[] aladin = { "도서명 + 저자", "도서명", "저자", "출판사" };
+                string[] aladin = { "도서명", "저자", "출판사", "별치조사" };
                 cb_filter.Items.AddRange(aladin);
             }
             else if (cb_api.SelectedIndex == 1) {
@@ -653,5 +772,18 @@ namespace WindowsFormsApp1.Mac
             Check_ISBN_Yes24 yes = new Check_ISBN_Yes24(this);
             yes.Show();
         }
+
+        private void tb_list_name_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                Order_input_Search search = new Order_input_Search(this);
+                search.Where_Open = "book_list";
+                search.searchText = tb_list_name.Text;
+                search.OnlyMarc = true;
+                search.TopMost = true;
+                search.Show();
+            }
+        }
     }
 }

unimarc/unimarc/마크/Check_ISBN.resx

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

unimarc/unimarc/마크/Check_ISBN_Sub.cs

@@ -71,7 +71,14 @@ namespace WindowsFormsApp1.마크
         private string change_Date_type(string date)
         {
             if (Call_API == "알라딘")
-                return String.Format("{0:yyyy/MM/dd}", DateTime.Parse(date.Remove(date.IndexOf(" G"))));
+            {
+                try
+                {
+                    return String.Format("{0:yyyy/MM/dd}",
+                    DateTime.Parse(date.Remove(date.IndexOf(" G"))));
+                }
+                catch { return date; }
+            }
             else if (Call_API == "네이버")
             {
                 if (date.Length < 5) 

unimarc/unimarc/마크/DLS_Copy.cs

@@ -148,17 +148,18 @@ namespace WindowsFormsApp1.Mac
             }
 
             bool isISBN = rBtn_ISBN.Checked;
-            SearchCopy(isISBN);
+            if (!SearchCopy(isISBN))
+                return;
 
             MessageBox.Show("완료되었습니다.");
         }
         #region SearchClick_Sub
 
-        private void SearchCopy(bool isISBN)
+        private bool SearchCopy(bool isISBN)
         {
-            if (!webBrowser1.Url.AbsoluteUri.Contains("collectionFormMA")) {
+                if (!webBrowser1.Url.AbsoluteUri.Contains("collectionFormMA")) {
                 MessageBox.Show("자료관리 창이 아닙니다!");
-                return;
+                return false;
             }
 
             int count = dataGridView1.Rows.Count;
@@ -176,6 +177,7 @@ namespace WindowsFormsApp1.Mac
                 }
                 dataGridView1.Rows[a].Cells["Check"].Value = Check;
             }
+            return true;
         }
         /// <summary>
         /// 도서명 필터로 DLS복본 검색

unimarc/unimarc/마크/DLS_Copy.cs.rej

@@ -0,0 +1,9 @@
+diff a/unimarc/unimarc/마크/DLS_Copy.cs b/unimarc/unimarc/마크/DLS_Copy.cs	(rejected hunks)
+@@ -91,6 +91,7 @@
+             while (!isWebComplite)
+             {
+                 Delay(1000);
++                if (tb_URL.Text.Contains("/r/newReading/member/loginForm.jsp"))
+                 {
+                     isWebComplite = true;
+                     break;

unimarc/unimarc/마크/Mac_Input.cs

@@ -126,11 +126,20 @@ namespace WindowsFormsApp1.Mac
         }
         private void btn_db_save_Click(object sender, EventArgs e)
         {
+            string Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            string user = main.User;
             string compidx = UniMarc.Properties.Settings.Default.compidx;
             string table = "Marc";
-            string[] col = { "ISBN", "서명", "총서명", "저자", "출판사", "가격", "marc", "marc_chk", "compidx", "grade" };
+            string[] GridCol = { "isbn", "book_name", "series", "author", "book_comp", "price" };
+
+            string[] col = { "ISBN", "서명", "총서명", "저자", "출판사", "가격", "marc", "marc_chk", "compidx", "grade", "date", "user" };
             for(int a = 0; a < dataGridView1.Rows.Count; a++)
             {
+                foreach (string colName in GridCol)
+                {
+                    if (dataGridView1.Rows[a].Cells[colName].Value == null)
+                        dataGridView1.Rows[a].Cells[colName].Value = "";
+                }
                 string Marc = dataGridView1.Rows[a].Cells["Marc"].Value.ToString();
                 Marc = Marc.Replace(@"'", "'");
                 Marc = Marc.Replace(@"""", "\"\"");
@@ -142,11 +151,13 @@ namespace WindowsFormsApp1.Mac
                                       dataGridView1.Rows[a].Cells["author"].Value.ToString(),
                                       dataGridView1.Rows[a].Cells["book_comp"].Value.ToString(),
                                       dataGridView1.Rows[a].Cells["price"].Value.ToString(),
-                                      Marc, "1", compidx, "4" };
+                                      Marc, "1", compidx, "3", Time, user };
+
+                    // string Incmd = db.DB_INSERT_DUPLICATE(table, col, data);
                     string Incmd = db.DB_INSERT(table, col, data);
                     db.DB_Send_CMD_reVoid(Incmd);
                 }
-                catch(Exception ex) { MessageBox.Show(ex.Message); }
+                catch (Exception ex) { MessageBox.Show(ex.Message); }
             }
             MessageBox.Show("DB 저장 완료!");
         }

unimarc/unimarc/마크/Mac_Output.cs

@@ -191,7 +191,7 @@ namespace WindowsFormsApp1.Mac
             if (saveFileDialog.ShowDialog() == DialogResult.OK)
             {
                 FileName = saveFileDialog.FileName;
-                File.WriteAllText(FileName, Marc_data);
+                File.WriteAllText(FileName, Marc_data, Encoding.Default);
             }
         }
 

unimarc/unimarc/마크/Marc.resx

@@ -156,6 +156,12 @@
   <metadata name="colCheck.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>
+  <metadata name="SaveDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <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>
@@ -195,4 +201,82 @@
         giAIgiAIgiAIgiAIAilPT/8BzuZT5uV+S2QAAAAASUVORK5CYII=
 </value>
   </data>
+  <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="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="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="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="jisi.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MarcValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

unimarc/unimarc/마크/Marc_FillBlank.cs

@@ -12,14 +12,206 @@ namespace UniMarc
 {
     public partial class Marc_FillBlank : Form
     {
-        public Marc_FillBlank()
+        public string ISBN;
+        ExcelTest.Marc marc;
+
+        public Marc_FillBlank(ExcelTest.Marc _marc)
         {
             InitializeComponent();
+            marc = _marc;
         }
 
         private void Marc_FillBlank_Load(object sender, EventArgs e)
         {
+            string url = string.Format(
+                "https://nl.go.kr/kolisnet/search/searchResultAllList.do?" +
+                "tab=ALL&" +
+                "historyYn=Y&" +
+                "keywordType1=total&" +
+                "keyword1={0}&" +
+                "bookFilter=BKGM&" +
+                "bookFilter=YON&" +
+                "bookFilter=BKDM&" +
+                "bookFilter=NK&" +
+                "bookFilter=NP&" +
+                "bookFilter=OT", ISBN);
 
+            webBrowser1.Navigate(url);
+        }
+
+        private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
+        {
+            tb_URL.Text = webBrowser1.Url.AbsoluteUri;
+            if (this.webBrowser1.ReadyState == WebBrowserReadyState.Complete)
+            {
+                if (tb_URL.Text.Contains(ISBN))
+                    InitCrowling();
+
+                if (tb_URL.Text.Contains("searchResultEditonList"))
+                    SearchResultEditonList();
+
+                if (tb_URL.Text.Contains("searchResultDetail"))
+                    SearchResultDetail();
+
+                if (tb_URL.Text.Contains("searchResultMarc"))
+                    SearchResultMarc();
+            }
+        }
+        #region Completed SUB
+
+        /// <summary>
+        /// 코리스에서 ISBN검색이 된 목록 중 맨 첫번째만 클릭해주는 함수.
+        /// </summary>
+        private void InitCrowling()
+        {
+            string resultCount = "";
+
+            HtmlElementCollection span = webBrowser1.Document.GetElementsByTagName("span");
+            foreach (HtmlElement Search in span)
+            {
+                if (Search.GetAttribute("className") == "result_count")
+                {
+                    resultCount = Search.InnerText;
+                    break;
+                }
+            }
+
+            if (resultCount.Contains("0"))
+            {
+                MessageBox.Show("검색결과가 없습니다.");
+                this.Close();
+                return;
+            }
+
+            HtmlElementCollection div = webBrowser1.Document.GetElementsByTagName("div");
+            foreach (HtmlElement SearchDiv in div)
+            {
+                if (SearchDiv.GetAttribute("className") == "resultBookInfo")
+                {
+                    SearchDiv.Children[0].Children[0].InvokeMember("click");
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 도서의 상세 정보를 보여주는 페이지로 들어가는 함수
+        /// </summary>
+        private void SearchResultEditonList()
+        {
+            HtmlElementCollection span = webBrowser1.Document.GetElementsByTagName("span");
+            foreach (HtmlElement Search in span)
+            {
+                if (Search.GetAttribute("className") == "bookName")
+                {
+                    Search.Children[0].InvokeMember("click");
+                    break;
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// 마크 보기 버튼을 클릭
+        /// </summary>
+        private void SearchResultDetail()
+        {
+            HtmlElementCollection a = webBrowser1.Document.GetElementsByTagName("a");
+            foreach (HtmlElement Search in a)
+            {
+                if (Search.Id == "marcViewBtn")
+                {
+                    Search.InvokeMember("click");
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 해당하는 마크 따오기
+        /// </summary>
+        private void SearchResultMarc()
+        {
+            string Text = "";
+
+            HtmlElementCollection TableName = webBrowser1.Document.GetElementsByTagName("table");
+            foreach (HtmlElement SearchTable in TableName)
+            {
+                if (SearchTable.GetAttribute("className") == "tbl")
+                {
+                    HtmlElementCollection tdName = webBrowser1.Document.GetElementsByTagName("td");
+                    foreach (HtmlElement SearchTd in tdName)
+                    {
+                        string Td = SearchTd.InnerText;
+
+                        if (Td is null)
+                            Td = "";
+
+                        if (Td.Contains("▲"))
+                            Text += SearchTd.InnerText + "\n";
+                        else
+                            Text += SearchTd.InnerText + "\t";
+                    }
+                }
+            }
+            richTextBox1.Text = SplitText(Text);
+        }
+
+        private string SplitText(string Text)
+        {
+            string result = "";
+
+            string[] Line = Text.Split('\n');
+            for(int a = 0; a < Line.Length - 1; a++)
+            {
+                string[] Tag = Line[a].Split('\t');
+                int Length = Tag.Length;
+                result += Tag[Length - 3] + "\t" + Tag[Length - 2] + "\t" + Tag[Length - 1] + "\n";
+            }
+
+            return result;
+        }
+        #endregion
+
+        private void btn_Back_Click(object sender, EventArgs e)
+        {
+            webBrowser1.GoBack();
+        }
+
+        private void btn_Forward_Click(object sender, EventArgs e)
+        {
+            webBrowser1.GoForward();
+        }
+
+        private void btn_Close_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void tb_URL_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                string url = tb_URL.Text;
+                webBrowser1.Navigate(url);
+            }
+        }
+
+        private void btn_Move_Click(object sender, EventArgs e)
+        {
+            marc.TextReset();
+            // 종단기호 제거
+            string Text = richTextBox1.Text.Replace("▲", "");
+
+            string[] SplitLine = Text.Split('\n');
+            foreach (string Line in SplitLine)
+            {
+                if (Line == "") break;
+
+                // [0]:태그번호, [1]:지시기호, [2]:마크내용
+                string[] SplitTag = Line.Split('\t');
+                marc.InputTotal(SplitTag);
+            }
         }
     }
 }

unimarc/unimarc/마크/Marc_FillBlank.resx

@@ -123,12 +123,6 @@
   <metadata name="text490v.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="text505n.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -141,36 +135,6 @@
   <metadata name="text505e.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <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="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="text440v.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column13.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="text440a.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -219,34 +183,4 @@
   <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

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

@@ -28,14 +28,15 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.btn_Excel = new System.Windows.Forms.Button();
             this.panel3 = new System.Windows.Forms.Panel();
             this.cb_authorType = new System.Windows.Forms.ComboBox();
             this.cb_divType = new System.Windows.Forms.ComboBox();
@@ -75,7 +76,6 @@
             this.search_tag = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.checkBox1 = new System.Windows.Forms.CheckBox();
-            this.btn_Excel = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
@@ -98,6 +98,16 @@
             this.panel1.Size = new System.Drawing.Size(1464, 36);
             this.panel1.TabIndex = 0;
             // 
+            // btn_Excel
+            // 
+            this.btn_Excel.Location = new System.Drawing.Point(838, 6);
+            this.btn_Excel.Name = "btn_Excel";
+            this.btn_Excel.Size = new System.Drawing.Size(75, 23);
+            this.btn_Excel.TabIndex = 8;
+            this.btn_Excel.Text = "엑셀반출";
+            this.btn_Excel.UseVisualStyleBackColor = true;
+            this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click);
+            // 
             // panel3
             // 
             this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -245,14 +255,14 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle8.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)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.idx,
@@ -278,7 +288,6 @@
             this.search_tag,
             this.colCheck});
             this.dataGridView1.Location = new System.Drawing.Point(13, 57);
-            this.dataGridView1.MultiSelect = false;
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.Size = new System.Drawing.Size(1463, 611);
@@ -304,8 +313,8 @@
             // 
             // reg_num
             // 
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.reg_num.DefaultCellStyle = dataGridViewCellStyle9;
+            this.reg_num.DefaultCellStyle = dataGridViewCellStyle2;
             this.reg_num.FillWeight = 130.9363F;
             this.reg_num.HeaderText = "등록번호";
             this.reg_num.Name = "reg_num";
@@ -313,8 +322,8 @@
             // 
             // class_code
             // 
-            dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.class_code.DefaultCellStyle = dataGridViewCellStyle10;
+            this.class_code.DefaultCellStyle = dataGridViewCellStyle3;
             this.class_code.FillWeight = 76.41504F;
             this.class_code.HeaderText = "분류";
             this.class_code.Name = "class_code";
@@ -322,8 +331,8 @@
             // 
             // author_code
             // 
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.author_code.DefaultCellStyle = dataGridViewCellStyle11;
+            this.author_code.DefaultCellStyle = dataGridViewCellStyle4;
             this.author_code.FillWeight = 77.02635F;
             this.author_code.HeaderText = "저자기호";
             this.author_code.Name = "author_code";
@@ -331,8 +340,8 @@
             // 
             // volume
             // 
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.volume.DefaultCellStyle = dataGridViewCellStyle12;
+            this.volume.DefaultCellStyle = dataGridViewCellStyle5;
             this.volume.FillWeight = 38.80909F;
             this.volume.HeaderText = "V";
             this.volume.Name = "volume";
@@ -341,8 +350,8 @@
             // 
             // copy
             // 
-            dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.copy.DefaultCellStyle = dataGridViewCellStyle13;
+            this.copy.DefaultCellStyle = dataGridViewCellStyle6;
             this.copy.FillWeight = 40.14827F;
             this.copy.HeaderText = "C";
             this.copy.Name = "copy";
@@ -351,8 +360,8 @@
             // 
             // prefix
             // 
-            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.prefix.DefaultCellStyle = dataGridViewCellStyle14;
+            this.prefix.DefaultCellStyle = dataGridViewCellStyle7;
             this.prefix.FillWeight = 41.51828F;
             this.prefix.HeaderText = "F";
             this.prefix.Name = "prefix";
@@ -476,16 +485,6 @@
             this.checkBox1.UseVisualStyleBackColor = true;
             this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
             // 
-            // btn_Excel
-            // 
-            this.btn_Excel.Location = new System.Drawing.Point(852, 6);
-            this.btn_Excel.Name = "btn_Excel";
-            this.btn_Excel.Size = new System.Drawing.Size(75, 23);
-            this.btn_Excel.TabIndex = 8;
-            this.btn_Excel.Text = "엑셀반출";
-            this.btn_Excel.UseVisualStyleBackColor = true;
-            this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click);
-            // 
             // Marc_Plan
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

unimarc/unimarc/홈/Home_User_manage.cs

@@ -30,6 +30,7 @@ namespace WindowsFormsApp1.Home
         private void Form1_Load(object sender, EventArgs e)
         {
             _DB.DBcon();
+            tb_Affil.Text = comp_name;
             tb_Affil.Enabled = false;
             btn_lookup_Click(null, null);
         }