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

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

   저장시마다 008 늘어남 오류 - 완료
   저장시 필수태그 없으면 오류체크문구뜨게 - 완료
   저장한사람 누구인지 저장일시 분초까지 - 완료
   해당 목록명 상단 표출 - 완료
   선택 도서 ISBN 상단 표출 - 완료

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

   245d에서 100(기본표목) 반영할것. - 완료
   메모장이랑 칸채우기 왔다갔다 하면 653이 650으로 저장 됩니다! - 버그 수정완
   기본표목 245d로 생성 안됨, 저자도치체크가능하게끔 - 완료
   100태그 제곱으로 늘어나는 버그. - 버그 수정완
   245b 여러개로 표출 - 완료

3. DLS조회+DLS입력  - 통합됨.

4. 복본조사 탭 삭제, 복본조사가 DLS와 마크작업으로 분리되어 들어가게 됨.

5. 주문관리
   작업명단 검색 필터 적용
   주문서작성시 [ISBN, 납품처, 납품처 + ISBN] 선택기능 추가
   주문완료시 Grid 체크 해제, 주문 일자 자동 표출
   목록수량 수정불가능하게 수정, 대신 주문수량 수정되게 변경

6. 목록집계
   완료일자 수정기능 추가

ExcelTest/ExcelTest/Marc.resx

@@ -129,6 +129,36 @@
   <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>
   <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -153,6 +183,18 @@
   <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column12.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="dataGridViewTextBoxColumn2.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>
@@ -177,12 +219,48 @@
   <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>
+  <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="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="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>
+  <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="text505n.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -216,4 +294,25 @@
   <metadata name="Column20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

unimarc/unimarc/Main.Designer.cs

@@ -68,13 +68,11 @@
             this.마크목록 = new System.Windows.Forms.ToolStripMenuItem();
             this.소장자료검색 = new System.Windows.Forms.ToolStripMenuItem();
             this.마크정리 = new System.Windows.Forms.ToolStripMenuItem();
+            this.복본조사1 = new System.Windows.Forms.ToolStripMenuItem();
             this.iSBN조회 = new System.Windows.Forms.ToolStripMenuItem();
             this.반입및반출 = new System.Windows.Forms.ToolStripMenuItem();
             this.마크반입 = new System.Windows.Forms.ToolStripMenuItem();
             this.마크반출 = new System.Windows.Forms.ToolStripMenuItem();
-            this.복본조사 = new System.Windows.Forms.ToolStripMenuItem();
-            this.복본조사1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.dLS복본조사 = new System.Windows.Forms.ToolStripMenuItem();
             this.부가기능 = new System.Windows.Forms.ToolStripMenuItem();
             this.마크수집 = new System.Windows.Forms.ToolStripMenuItem();
             this.전집관리 = new System.Windows.Forms.ToolStripMenuItem();
@@ -82,7 +80,7 @@
             this.저자기호 = new System.Windows.Forms.ToolStripMenuItem();
             this.DLS = new System.Windows.Forms.ToolStripMenuItem();
             this.DLS조회 = new System.Windows.Forms.ToolStripMenuItem();
-            this.DLS입력 = new System.Windows.Forms.ToolStripMenuItem();
+            this.dLS복본조사 = new System.Windows.Forms.ToolStripMenuItem();
             this.마크기타 = new System.Windows.Forms.ToolStripMenuItem();
             this.서류작성 = new System.Windows.Forms.ToolStripMenuItem();
             this.마크통계 = new System.Windows.Forms.ToolStripMenuItem();
@@ -161,28 +159,28 @@
             // 사업체정보
             // 
             this.사업체정보.Name = "사업체정보";
-            this.사업체정보.Size = new System.Drawing.Size(180, 22);
+            this.사업체정보.Size = new System.Drawing.Size(175, 22);
             this.사업체정보.Text = "사업체 정보";
             this.사업체정보.Click += new System.EventHandler(this.사용자정보ToolStripMenuItem_Click);
             // 
             // 사용자관리
             // 
             this.사용자관리.Name = "사용자관리";
-            this.사용자관리.Size = new System.Drawing.Size(180, 22);
+            this.사용자관리.Size = new System.Drawing.Size(175, 22);
             this.사용자관리.Text = "사용자 관리";
             this.사용자관리.Click += new System.EventHandler(this.사용자관리ToolStripMenuItem_Click);
             // 
             // 납품거래처관리
             // 
             this.납품거래처관리.Name = "납품거래처관리";
-            this.납품거래처관리.Size = new System.Drawing.Size(180, 22);
+            this.납품거래처관리.Size = new System.Drawing.Size(175, 22);
             this.납품거래처관리.Text = "납품 / 거래처 관리";
             this.납품거래처관리.Click += new System.EventHandler(this.납품거래처관리ToolStripMenuItem_Click);
             // 
             // 주문처관리
             // 
             this.주문처관리.Name = "주문처관리";
-            this.주문처관리.Size = new System.Drawing.Size(180, 22);
+            this.주문처관리.Size = new System.Drawing.Size(175, 22);
             this.주문처관리.Text = "주문처 관리";
             this.주문처관리.Click += new System.EventHandler(this.주문처관리ToolStripMenuItem_Click);
             // 
@@ -190,14 +188,14 @@
             // 
             this.비밀번호변경.Enabled = false;
             this.비밀번호변경.Name = "비밀번호변경";
-            this.비밀번호변경.Size = new System.Drawing.Size(180, 22);
+            this.비밀번호변경.Size = new System.Drawing.Size(175, 22);
             this.비밀번호변경.Text = "비밀번호 변경";
             this.비밀번호변경.Click += new System.EventHandler(this.비밀번호변경ToolStripMenuItem_Click);
             // 
             // 도서정보관리
             // 
             this.도서정보관리.Name = "도서정보관리";
-            this.도서정보관리.Size = new System.Drawing.Size(180, 22);
+            this.도서정보관리.Size = new System.Drawing.Size(175, 22);
             this.도서정보관리.Text = "도서정보 관리";
             this.도서정보관리.Click += new System.EventHandler(this.도서정보관리ToolStripMenuItem_Click);
             // 
@@ -205,7 +203,7 @@
             // 
             this.사용대장.Enabled = false;
             this.사용대장.Name = "사용대장";
-            this.사용대장.Size = new System.Drawing.Size(180, 22);
+            this.사용대장.Size = new System.Drawing.Size(175, 22);
             this.사용대장.Text = "사용대장";
             this.사용대장.Click += new System.EventHandler(this.사용대장ToolStripMenuItem_Click);
             // 
@@ -226,49 +224,49 @@
             // 목록등록
             // 
             this.목록등록.Name = "목록등록";
-            this.목록등록.Size = new System.Drawing.Size(180, 22);
+            this.목록등록.Size = new System.Drawing.Size(166, 22);
             this.목록등록.Text = "물품등록";
             this.목록등록.Click += new System.EventHandler(this.물품등록ToolStripMenuItem_Click);
             // 
             // 목록조회
             // 
             this.목록조회.Name = "목록조회";
-            this.목록조회.Size = new System.Drawing.Size(180, 22);
+            this.목록조회.Size = new System.Drawing.Size(166, 22);
             this.목록조회.Text = "목록조회";
             this.목록조회.Click += new System.EventHandler(this.목록등록편의ToolStripMenuItem_Click);
             // 
             // 목록집계
             // 
             this.목록집계.Name = "목록집계";
-            this.목록집계.Size = new System.Drawing.Size(180, 22);
+            this.목록집계.Size = new System.Drawing.Size(166, 22);
             this.목록집계.Text = "목록집계";
             this.목록집계.Click += new System.EventHandler(this.목록집계ToolStripMenuItem_Click);
             // 
             // 주문입력
             // 
             this.주문입력.Name = "주문입력";
-            this.주문입력.Size = new System.Drawing.Size(180, 22);
+            this.주문입력.Size = new System.Drawing.Size(166, 22);
             this.주문입력.Text = "주문입력";
             this.주문입력.Click += new System.EventHandler(this.주문입력ToolStripMenuItem_Click);
             // 
             // 입고작업
             // 
             this.입고작업.Name = "입고작업";
-            this.입고작업.Size = new System.Drawing.Size(180, 22);
+            this.입고작업.Size = new System.Drawing.Size(166, 22);
             this.입고작업.Text = "입고작업";
             this.입고작업.Click += new System.EventHandler(this.매입ToolStripMenuItem_Click);
             // 
             // 재고입력및조회
             // 
             this.재고입력및조회.Name = "재고입력및조회";
-            this.재고입력및조회.Size = new System.Drawing.Size(180, 22);
+            this.재고입력및조회.Size = new System.Drawing.Size(166, 22);
             this.재고입력및조회.Text = "재고입력 및 조회";
             this.재고입력및조회.Click += new System.EventHandler(this.재고입력및조회ToolStripMenuItem_Click);
             // 
             // 반품처리
             // 
             this.반품처리.Name = "반품처리";
-            this.반품처리.Size = new System.Drawing.Size(180, 22);
+            this.반품처리.Size = new System.Drawing.Size(166, 22);
             this.반품처리.Text = "반품처리";
             this.반품처리.Click += new System.EventHandler(this.반품처리ToolStripMenuItem_Click);
             // 
@@ -287,14 +285,14 @@
             // 송금내역조회
             // 
             this.송금내역조회.Name = "송금내역조회";
-            this.송금내역조회.Size = new System.Drawing.Size(180, 22);
+            this.송금내역조회.Size = new System.Drawing.Size(154, 22);
             this.송금내역조회.Text = "송금 내역 조회";
             this.송금내역조회.Click += new System.EventHandler(this.송금내역조회ToolStripMenuItem_Click);
             // 
             // 송금등록
             // 
             this.송금등록.Name = "송금등록";
-            this.송금등록.Size = new System.Drawing.Size(180, 22);
+            this.송금등록.Size = new System.Drawing.Size(154, 22);
             this.송금등록.Text = "송금 등록";
             this.송금등록.Click += new System.EventHandler(this.송금등록ToolStripMenuItem_Click);
             // 
@@ -305,20 +303,20 @@
             this.매입장부,
             this.매입미결제ToolStripMenuItem});
             this.매입.Name = "매입";
-            this.매입.Size = new System.Drawing.Size(180, 22);
+            this.매입.Size = new System.Drawing.Size(154, 22);
             this.매입.Text = "매입";
             // 
             // 매입집계
             // 
             this.매입집계.Name = "매입집계";
-            this.매입집계.Size = new System.Drawing.Size(180, 22);
+            this.매입집계.Size = new System.Drawing.Size(138, 22);
             this.매입집계.Text = "매입 집계";
             this.매입집계.Click += new System.EventHandler(this.매입집계ToolStripMenuItem_Click);
             // 
             // 매입장부
             // 
             this.매입장부.Name = "매입장부";
-            this.매입장부.Size = new System.Drawing.Size(180, 22);
+            this.매입장부.Size = new System.Drawing.Size(138, 22);
             this.매입장부.Text = "매입 장부";
             this.매입장부.Click += new System.EventHandler(this.매입장부ToolStripMenuItem1_Click);
             // 
@@ -326,7 +324,7 @@
             // 
             this.매입미결제ToolStripMenuItem.Enabled = false;
             this.매입미결제ToolStripMenuItem.Name = "매입미결제ToolStripMenuItem";
-            this.매입미결제ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.매입미결제ToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.매입미결제ToolStripMenuItem.Text = "매입 미결제";
             this.매입미결제ToolStripMenuItem.Click += new System.EventHandler(this.매입미결제ToolStripMenuItem_Click);
             // 
@@ -338,41 +336,41 @@
             this.매출조회,
             this.매출집계});
             this.매출.Name = "매출";
-            this.매출.Size = new System.Drawing.Size(180, 22);
+            this.매출.Size = new System.Drawing.Size(154, 22);
             this.매출.Text = "매출";
             // 
             // 매출입력
             // 
             this.매출입력.Name = "매출입력";
-            this.매출입력.Size = new System.Drawing.Size(180, 22);
+            this.매출입력.Size = new System.Drawing.Size(126, 22);
             this.매출입력.Text = "매출 입력";
             this.매출입력.Click += new System.EventHandler(this.매출입력ToolStripMenuItem1_Click);
             // 
             // 매출입금
             // 
             this.매출입금.Name = "매출입금";
-            this.매출입금.Size = new System.Drawing.Size(180, 22);
+            this.매출입금.Size = new System.Drawing.Size(126, 22);
             this.매출입금.Text = "매출 입금";
             this.매출입금.Click += new System.EventHandler(this.매출입금toolStripMenuItem1_Click_1);
             // 
             // 매출조회
             // 
             this.매출조회.Name = "매출조회";
-            this.매출조회.Size = new System.Drawing.Size(180, 22);
+            this.매출조회.Size = new System.Drawing.Size(126, 22);
             this.매출조회.Text = "매출 조회";
             this.매출조회.Click += new System.EventHandler(this.매출장부ToolStripMenuItem_Click);
             // 
             // 매출집계
             // 
             this.매출집계.Name = "매출집계";
-            this.매출집계.Size = new System.Drawing.Size(180, 22);
+            this.매출집계.Size = new System.Drawing.Size(126, 22);
             this.매출집계.Text = "매출 집계";
             this.매출집계.Click += new System.EventHandler(this.매출입금ToolStripMenuItem1_Click);
             // 
             // 파트타임관리
             // 
             this.파트타임관리.Name = "파트타임관리";
-            this.파트타임관리.Size = new System.Drawing.Size(180, 22);
+            this.파트타임관리.Size = new System.Drawing.Size(154, 22);
             this.파트타임관리.Text = "파트타임 관리";
             this.파트타임관리.Click += new System.EventHandler(this.파트타임관리ToolStripMenuItem_Click);
             // 
@@ -382,7 +380,6 @@
             this.마크설정,
             this.마크작업,
             this.반입및반출,
-            this.복본조사,
             this.부가기능,
             this.DLS,
             this.마크기타});
@@ -404,28 +401,28 @@
             // 단축키설정
             // 
             this.단축키설정.Name = "단축키설정";
-            this.단축키설정.Size = new System.Drawing.Size(180, 22);
+            this.단축키설정.Size = new System.Drawing.Size(138, 22);
             this.단축키설정.Text = "단축키";
             this.단축키설정.Click += new System.EventHandler(this.단축키설정ToolStripMenuItem_Click);
             // 
             // 매크로문구
             // 
             this.매크로문구.Name = "매크로문구";
-            this.매크로문구.Size = new System.Drawing.Size(180, 22);
+            this.매크로문구.Size = new System.Drawing.Size(138, 22);
             this.매크로문구.Text = "매크로 문구";
             this.매크로문구.Click += new System.EventHandler(this.매크로문구설정ToolStripMenuItem_Click);
             // 
             // 불용어
             // 
             this.불용어.Name = "불용어";
-            this.불용어.Size = new System.Drawing.Size(180, 22);
+            this.불용어.Size = new System.Drawing.Size(138, 22);
             this.불용어.Text = "불용어";
             this.불용어.Click += new System.EventHandler(this.불용어ToolStripMenuItem_Click);
             // 
             // 작업지시서
             // 
             this.작업지시서.Name = "작업지시서";
-            this.작업지시서.Size = new System.Drawing.Size(180, 22);
+            this.작업지시서.Size = new System.Drawing.Size(138, 22);
             this.작업지시서.Text = "작업지시서";
             this.작업지시서.Click += new System.EventHandler(this.작업지시서ToolStripMenuItem_Click);
             // 
@@ -435,6 +432,7 @@
             this.마크목록,
             this.소장자료검색,
             this.마크정리,
+            this.복본조사1,
             this.iSBN조회});
             this.마크작업.Name = "마크작업";
             this.마크작업.Size = new System.Drawing.Size(180, 22);
@@ -443,28 +441,35 @@
             // 마크목록
             // 
             this.마크목록.Name = "마크목록";
-            this.마크목록.Size = new System.Drawing.Size(180, 22);
+            this.마크목록.Size = new System.Drawing.Size(146, 22);
             this.마크목록.Text = "마크 목록";
             this.마크목록.Click += new System.EventHandler(this.마크목록ToolStripMenuItem_Click);
             // 
             // 소장자료검색
             // 
             this.소장자료검색.Name = "소장자료검색";
-            this.소장자료검색.Size = new System.Drawing.Size(180, 22);
+            this.소장자료검색.Size = new System.Drawing.Size(146, 22);
             this.소장자료검색.Text = "소장자료검색";
             this.소장자료검색.Click += new System.EventHandler(this.소장자료검색ToolStripMenuItem_Click);
             // 
             // 마크정리
             // 
             this.마크정리.Name = "마크정리";
-            this.마크정리.Size = new System.Drawing.Size(180, 22);
+            this.마크정리.Size = new System.Drawing.Size(146, 22);
             this.마크정리.Text = "마크 정리";
             this.마크정리.Click += new System.EventHandler(this.마크정리ToolStripMenuItem_Click);
             // 
+            // 복본조사1
+            // 
+            this.복본조사1.Name = "복본조사1";
+            this.복본조사1.Size = new System.Drawing.Size(180, 22);
+            this.복본조사1.Text = "복본조사";
+            this.복본조사1.Click += new System.EventHandler(this.복본조사ToolStripMenuItem1_Click);
+            // 
             // iSBN조회
             // 
             this.iSBN조회.Name = "iSBN조회";
-            this.iSBN조회.Size = new System.Drawing.Size(180, 22);
+            this.iSBN조회.Size = new System.Drawing.Size(146, 22);
             this.iSBN조회.Text = "ISBN 조회";
             this.iSBN조회.Click += new System.EventHandler(this.iSBN조회ToolStripMenuItem_Click);
             // 
@@ -480,40 +485,17 @@
             // 마크반입
             // 
             this.마크반입.Name = "마크반입";
-            this.마크반입.Size = new System.Drawing.Size(180, 22);
+            this.마크반입.Size = new System.Drawing.Size(98, 22);
             this.마크반입.Text = "반입";
             this.마크반입.Click += new System.EventHandler(this.반입ToolStripMenuItem_Click);
             // 
             // 마크반출
             // 
             this.마크반출.Name = "마크반출";
-            this.마크반출.Size = new System.Drawing.Size(180, 22);
+            this.마크반출.Size = new System.Drawing.Size(98, 22);
             this.마크반출.Text = "반출";
             this.마크반출.Click += new System.EventHandler(this.반출ToolStripMenuItem_Click);
             // 
-            // 복본조사
-            // 
-            this.복본조사.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.복본조사1,
-            this.dLS복본조사});
-            this.복본조사.Name = "복본조사";
-            this.복본조사.Size = new System.Drawing.Size(180, 22);
-            this.복본조사.Text = "복본 조사";
-            // 
-            // 복본조사1
-            // 
-            this.복본조사1.Name = "복본조사1";
-            this.복본조사1.Size = new System.Drawing.Size(180, 22);
-            this.복본조사1.Text = "복본조사";
-            this.복본조사1.Click += new System.EventHandler(this.복본조사ToolStripMenuItem1_Click);
-            // 
-            // dLS복본조사
-            // 
-            this.dLS복본조사.Name = "dLS복본조사";
-            this.dLS복본조사.Size = new System.Drawing.Size(180, 22);
-            this.dLS복본조사.Text = "DLS 복본조사";
-            this.dLS복본조사.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click);
-            // 
             // 부가기능
             // 
             this.부가기능.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -528,28 +510,28 @@
             // 마크수집
             // 
             this.마크수집.Name = "마크수집";
-            this.마크수집.Size = new System.Drawing.Size(180, 22);
+            this.마크수집.Size = new System.Drawing.Size(122, 22);
             this.마크수집.Text = "마크수집";
             this.마크수집.Click += new System.EventHandler(this.마크수집ToolStripMenuItem_Click);
             // 
             // 전집관리
             // 
             this.전집관리.Name = "전집관리";
-            this.전집관리.Size = new System.Drawing.Size(180, 22);
+            this.전집관리.Size = new System.Drawing.Size(122, 22);
             this.전집관리.Text = "전집관리";
             this.전집관리.Click += new System.EventHandler(this.전집관리ToolStripMenuItem1_Click);
             // 
             // 검수
             // 
             this.검수.Name = "검수";
-            this.검수.Size = new System.Drawing.Size(180, 22);
+            this.검수.Size = new System.Drawing.Size(122, 22);
             this.검수.Text = "검수";
             this.검수.Click += new System.EventHandler(this.검수ToolStripMenuItem_Click);
             // 
             // 저자기호
             // 
             this.저자기호.Name = "저자기호";
-            this.저자기호.Size = new System.Drawing.Size(180, 22);
+            this.저자기호.Size = new System.Drawing.Size(122, 22);
             this.저자기호.Text = "저자기호";
             this.저자기호.Click += new System.EventHandler(this.저자기호ToolStripMenuItem_Click);
             // 
@@ -557,7 +539,7 @@
             // 
             this.DLS.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.DLS조회,
-            this.DLS입력});
+            this.dLS복본조사});
             this.DLS.Name = "DLS";
             this.DLS.Size = new System.Drawing.Size(180, 22);
             this.DLS.Text = "DLS";
@@ -566,15 +548,15 @@
             // 
             this.DLS조회.Name = "DLS조회";
             this.DLS조회.Size = new System.Drawing.Size(180, 22);
-            this.DLS조회.Text = "DLS 조회";
+            this.DLS조회.Text = "DLS_조회/입력";
             this.DLS조회.Click += new System.EventHandler(this.dLS조회ToolStripMenuItem_Click);
             // 
-            // DLS입력
+            // dLS복본조사
             // 
-            this.DLS입력.Name = "DLS입력";
+            this.dLS복본조사.Name = "dLS복본조사";
-            this.DLS입력.Size = new System.Drawing.Size(180, 22);
+            this.dLS복본조사.Size = new System.Drawing.Size(180, 22);
-            this.DLS입력.Text = "DLS 입력";
+            this.dLS복본조사.Text = "DLS 복본조사";
-            this.DLS입력.Click += new System.EventHandler(this.dLS입력ToolStripMenuItem_Click_1);
+            this.dLS복본조사.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click);
             // 
             // 마크기타
             // 
@@ -589,21 +571,21 @@
             // 서류작성
             // 
             this.서류작성.Name = "서류작성";
-            this.서류작성.Size = new System.Drawing.Size(180, 22);
+            this.서류작성.Size = new System.Drawing.Size(122, 22);
             this.서류작성.Text = "서류작성";
             this.서류작성.Click += new System.EventHandler(this.서류작성ToolStripMenuItem_Click);
             // 
             // 마크통계
             // 
             this.마크통계.Name = "마크통계";
-            this.마크통계.Size = new System.Drawing.Size(180, 22);
+            this.마크통계.Size = new System.Drawing.Size(122, 22);
             this.마크통계.Text = "마크통계";
             this.마크통계.Click += new System.EventHandler(this.마크통계ToolStripMenuItem_Click);
             // 
             // 장비관리
             // 
             this.장비관리.Name = "장비관리";
-            this.장비관리.Size = new System.Drawing.Size(180, 22);
+            this.장비관리.Size = new System.Drawing.Size(122, 22);
             this.장비관리.Text = "장비관리";
             this.장비관리.Click += new System.EventHandler(this.장비관리ToolStripMenuItem1_Click);
             // 
@@ -991,7 +973,6 @@
         private System.Windows.Forms.ToolStripMenuItem 단축키설정;
         private System.Windows.Forms.ToolStripMenuItem 매크로문구;
         private System.Windows.Forms.ToolStripMenuItem 불용어;
-        private System.Windows.Forms.ToolStripMenuItem 복본조사;
         private System.Windows.Forms.ToolStripMenuItem 작업일지ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 편의기능ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 캘린더;
@@ -1040,13 +1021,10 @@
         private System.Windows.Forms.ToolStripMenuItem 저자기호;
         private System.Windows.Forms.ToolStripMenuItem DLS;
         private System.Windows.Forms.ToolStripMenuItem DLS조회;
-        private System.Windows.Forms.ToolStripMenuItem DLS입력;
         private System.Windows.Forms.ToolStripMenuItem 마크기타;
         private System.Windows.Forms.ToolStripMenuItem 서류작성;
         private System.Windows.Forms.ToolStripMenuItem 마크통계;
         private System.Windows.Forms.ToolStripMenuItem 장비관리;
-        private System.Windows.Forms.ToolStripMenuItem 복본조사1;
-        private System.Windows.Forms.ToolStripMenuItem dLS복본조사;
         private System.Windows.Forms.ToolStripMenuItem iSBN조회;
         private System.Windows.Forms.Button ShortCut12;
         private System.Windows.Forms.Button ShortCut11;
@@ -1056,5 +1034,7 @@
         public System.Windows.Forms.ToolStripLabel toolStripLabel2;
         private System.Windows.Forms.ToolStripMenuItem 파트타임관리;
         public System.Windows.Forms.ToolStripLabel botUserLabel;
+        private System.Windows.Forms.ToolStripMenuItem 복본조사1;
+        private System.Windows.Forms.ToolStripMenuItem dLS복본조사;
     }
 }

unimarc/unimarc/Main.cs

@@ -143,18 +143,18 @@ namespace WindowsFormsApp1
             string[] Marc = {
                 "마크 목록", "소장자료검색", "마크 정리", "ISBN 조회", "반입",
                 "반출", "복본 조사", "DLS 복본 조사", "마크 수집", "전집관리",
-                "검수", "저자기호", "DLS 조회", "DLS 입력", "서류작성",
+                "검수", "저자기호", "DLS 조회 입력", "서류작성",
                 "마크통계", "장비관리" };
             ToolStripMenuItem[] MarcT = {
                 마크목록, 소장자료검색, 마크정리, iSBN조회, 마크반입,
                 마크반출, 복본조사1, dLS복본조사, 마크수집, 전집관리,
-                검수, 저자기호, DLS조회, DLS입력, 서류작성,
+                검수, 저자기호, DLS조회, 서류작성,
                 마크통계, 장비관리
             };
             ToolStripMenuItem[] TempMarc = {
                 마크작업, 마크작업, 마크작업, 마크작업, 반입및반출,
-                반입및반출, 복본조사, 복본조사, 부가기능, 부가기능,
+                반입및반출, 마크작업, DLS, 부가기능, 부가기능,
-                부가기능, 부가기능, DLS, DLS, 마크기타,
+                부가기능, 부가기능, DLS, 마크기타,
                 마크기타, 마크기타
             };
 
@@ -206,7 +206,7 @@ namespace WindowsFormsApp1
         #endregion
 
         #region 권한별 잠금
-        private void isAccess()
+        public void isAccess()
         {
             string Area =
                  "`Div_ListInput`, `Div_ListLookup`, `Div_ListTotal`, `Div_OrderInput`, `Div_Inven`,"
@@ -214,8 +214,8 @@ namespace WindowsFormsApp1
 
                + "`Acc_SendMoneyList`, `Acc_SendMoneyInput`, `Acc_Buy`, `Acc_Sales`, `Acc_PartTime`,"
 
-               + "`Marc_Setup`, `Marc_Work`, `Marc_Input`, `Marc_CopyCheck`, `Marc_Option`,"
+               + "`Marc_Setup`, `Marc_Work`, `Marc_Input`, `Marc_Option`, `Marc_DLS`,"
-               + "`Marc_DLS`, `Marc_ETC`,"
+               + " `Marc_ETC`,"
 
                + "`Manage_User`, `Manage_Client`, `Manage_Purchase`, `Manage_Book`";
 
@@ -230,7 +230,7 @@ namespace WindowsFormsApp1
 
                 송금내역조회, 송금등록, 매입, 매출, 파트타임관리,
 
-                마크설정, 마크작업, 반입및반출, 복본조사, 부가기능, DLS, 마크기타,
+                마크설정, 마크작업, 반입및반출, 부가기능, DLS, 마크기타,
 
                 사용자관리, 납품거래처관리, 주문처관리, 도서정보관리
             };
@@ -238,9 +238,9 @@ namespace WindowsFormsApp1
             for (int a = 0; a < ary_res.Length; a++)
             {
                 if (ary_res[a] == "0")
-                {
                     menus[a].Enabled = false;
-                }
+                else if (ary_res[a] == "1")
+                    menus[a].Enabled = true;
             }
 
             ToolStripMenuItem[] Div = {
@@ -255,7 +255,7 @@ namespace WindowsFormsApp1
             IsMenuAccess(Acc, 회계ToolStripMenuItem);
 
             ToolStripMenuItem[] Marc = {
-                마크설정, 마크작업, 반입및반출, 복본조사, 부가기능, DLS, 마크기타
+                마크설정, 마크작업, 반입및반출, 부가기능, DLS, 마크기타
             };
             IsMenuAccess(Marc, 마크ToolStripMenuItem);
 
@@ -1343,6 +1343,5 @@ namespace WindowsFormsApp1
             }
         }
         #endregion
-
     }
 }

unimarc/unimarc/UniMarc.csproj

@@ -490,11 +490,11 @@
     <Compile Include="마크\Input_DLS.Designer.cs">
       <DependentUpon>Input_DLS.cs</DependentUpon>
     </Compile>
-    <Compile Include="마크\School_Lookup.cs">
+    <Compile Include="마크\DLS_Lookup.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="마크\School_Lookup.Designer.cs">
+    <Compile Include="마크\DLS_Lookup.Designer.cs">
-      <DependentUpon>School_Lookup.cs</DependentUpon>
+      <DependentUpon>DLS_Lookup.cs</DependentUpon>
     </Compile>
     <Compile Include="Email.cs" />
     <Compile Include="Helper_DB.cs" />
@@ -900,8 +900,8 @@
     <EmbeddedResource Include="마크\Input_DLS.resx">
       <DependentUpon>Input_DLS.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="마크\School_Lookup.resx">
+    <EmbeddedResource Include="마크\DLS_Lookup.resx">
-      <DependentUpon>School_Lookup.cs</DependentUpon>
+      <DependentUpon>DLS_Lookup.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="홈\Book_infor_manage.resx">
       <DependentUpon>Book_infor_manage.cs</DependentUpon>

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

@@ -1 +1 @@
-c82c6b940fca54ec1ecc77c09e6162b7a1aa9436
+7e389acb7eef955ad255f844c6635f1ef64cd635

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

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using WindowsFormsApp1.Account;
+using WindowsFormsApp1.DLS;
 using WindowsFormsApp1.Home;
 using WindowsFormsApp1.회계;
 
@@ -25,6 +26,8 @@ namespace WindowsFormsApp1.Delivery
         Sales_In_Pay sip;
         List_Lookup ll;
         Mac.DLS_Copy dc;
+        School_Lookup sl;
+
         public Commodity_Search(Purchase _pur)
         {
             InitializeComponent();
@@ -70,6 +73,11 @@ namespace WindowsFormsApp1.Delivery
             InitializeComponent();
             dc = _dc;
         }
+        public Commodity_Search(School_Lookup _sl)
+        {
+            InitializeComponent();
+            sl = _sl;
+        }
 
         #region 거래처 가져오는 폼의 코드
 
@@ -152,6 +160,7 @@ namespace WindowsFormsApp1.Delivery
             if (sip != null) { sip.tb_clt.Text = ""; compidx = sip.compidx; }
             if (ll != null) { ll.tb_clt.Text = ""; compidx = ll.compidx; }
             if (dc != null) { dc.tb_SearchClient.Text = ""; compidx = dc.compidx; }
+            if (sl != null) { sl.tb_SearchClient.Text = ""; compidx = sl.compidx; }
 
             return compidx;
         }
@@ -178,6 +187,13 @@ namespace WindowsFormsApp1.Delivery
                 dc.lbl_PW.Text = dataGridView1.Rows[idx].Cells["DLS_PW"].Value.ToString();
                 dc.lbl_Area.Text = dataGridView1.Rows[idx].Cells["DLS_Area"].Value.ToString();
             }
+            if (sl != null) { 
+                sl.tb_SearchClient.Text = value;
+                sl.lbl_Client.Text = value;
+                sl.lbl_ID.Text = dataGridView1.Rows[idx].Cells["DLS_ID"].Value.ToString();
+                sl.lbl_PW.Text = dataGridView1.Rows[idx].Cells["DLS_PW"].Value.ToString();
+                sl.lbl_Area.Text = dataGridView1.Rows[idx].Cells["DLS_Area"].Value.ToString();
+            }
         }
     }
 }

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

@@ -133,6 +133,8 @@ namespace WindowsFormsApp1.Delivery
             string cmd = db.DB_Select_Search("name", "User_Data", "name", tb_UserName.Text);
             if (db.DB_Send_CMD_Search(cmd) == "")
             { MessageBox.Show("담당자를 확인해주세요."); return; }
+
+            // TODO: 목록명, 목록일자로 구분
             cmd = db.DB_Search("Obj_List", "list_name", "[" + tb_dvy1.Text + "]" + tb_clt1.Text, "comp_num", comp_idx);
             if (db.DB_Send_CMD_Search(cmd) != "") 
             { MessageBox.Show("DB의 납품목록과 중복됩니다."); return; }

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

@@ -32,7 +32,7 @@ namespace WindowsFormsApp1.Delivery
         private void List_aggregation_Load(object sender, EventArgs e)
         {
             db.DBcon();
-            // 작업명 - 배송방법까진 수정이 가능하여야함. 3,4,5,6 + 체크 추가
+
             for (int a = 0; a < 16; a++)
             {
                 if (a == 2 || a == 4 || a == 5 || a == 6 || a == 15)
@@ -224,9 +224,9 @@ namespace WindowsFormsApp1.Delivery
         private void btn_save_Click(object sender, EventArgs e)     // 저장
         {
             string table = "Obj_List";
-            string[] Edit_col = { "work_name", "work_way", "send_way" };
+            string[] Edit_col = { "work_name", "work_way", "send_way", "date_res" };
-            string[] Search_col = { "list_name", "total" };
+            string[] Search_col = { "list_name", "date" };
-            string edit1, edit2, edit3;
+            string edit1, edit2, edit3, edit4;
             for (int a = 0; a < dataGridView1.Rows.Count; a++)
             {
                 if(dataGridView1.Rows[a].Cells["work_name"].Value.ToString() == null) { edit1 = ""; }
@@ -238,14 +238,18 @@ namespace WindowsFormsApp1.Delivery
                 if(dataGridView1.Rows[a].Cells["send_way"].Value.ToString() == null) { edit3 = ""; }
                 else { edit3 = dataGridView1.Rows[a].Cells["send_way"].Value.ToString(); }
 
-                string[] Edit_Data = { edit1, edit2, edit3 };
+                if(dataGridView1.Rows[a].Cells["date_res"].Value.ToString() == null) { edit4 = ""; }
+                else { edit4 = dataGridView1.Rows[a].Cells["date_res"].Value.ToString(); }
+
+                string[] Edit_Data = { edit1, edit2, edit3, edit4 };
                 string[] Search_Data = {
                     dataGridView1.Rows[a].Cells["list_name"].Value.ToString(),
-                    dataGridView1.Rows[a].Cells["total"].Value.ToString()
+                    dataGridView1.Rows[a].Cells["list_date"].Value.ToString()
                 };
                 string U_cmd = db.More_Update(table, Edit_col, Edit_Data, Search_col, Search_Data);
                 db.DB_Send_CMD_reVoid(U_cmd);
             }
+            MessageBox.Show("저장되었습니다.");
         }
         private void btn_process_Click(object sender, EventArgs e)  // 완료처리
         {
@@ -452,6 +456,8 @@ namespace WindowsFormsApp1.Delivery
             dataGridView1.Rows[row].Cells["work_name"].Value = tb_work_name.Text;
             dataGridView1.Rows[row].Cells["work_way"].Value = tb_work_way.Text;
             dataGridView1.Rows[row].Cells["send_way"].Value = tb_send_way.Text;
+            if (date_res_Value.Checked)
+                dataGridView1.Rows[row].Cells["date_res"].Value = date_res_Value.Value.ToString("yyyy-MM-dd");
         }
         private void btn_checkup_Click(object sender, EventArgs e)  // 검수작업 (내부 작업필요)
         {

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

@@ -28,9 +28,9 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.tb_search_order = new System.Windows.Forms.TextBox();
             this.cb_user = new System.Windows.Forms.ComboBox();
@@ -41,12 +41,12 @@
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
-            this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
+            this.dtp_orderBegin = new System.Windows.Forms.DateTimePicker();
             this.label7 = new System.Windows.Forms.Label();
-            this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
+            this.dtp_orderEnd = new System.Windows.Forms.DateTimePicker();
-            this.dateTimePicker3 = new System.Windows.Forms.DateTimePicker();
+            this.dtp_listEnd = new System.Windows.Forms.DateTimePicker();
             this.label8 = new System.Windows.Forms.Label();
-            this.dateTimePicker4 = new System.Windows.Forms.DateTimePicker();
+            this.dtp_listBegin = new System.Windows.Forms.DateTimePicker();
             this.label9 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
             this.tb_PS = new System.Windows.Forms.TextBox();
@@ -57,7 +57,6 @@
             this.btn_All_chk = new System.Windows.Forms.Button();
             this.btn_All_unchk = new System.Windows.Forms.Button();
             this.btn_Save = new System.Windows.Forms.Button();
-            this.button12 = new System.Windows.Forms.Button();
             this.cb_ordersend = new System.Windows.Forms.ComboBox();
             this.btn_order_send = new System.Windows.Forms.Button();
             this.btn_send_chk = new System.Windows.Forms.Button();
@@ -94,6 +93,8 @@
             this.btn_close = new System.Windows.Forms.Button();
             this.btn_Excel = new System.Windows.Forms.Button();
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+            this.lbl_OrderStat = new System.Windows.Forms.Label();
+            this.cb_OrderStat = new System.Windows.Forms.ComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -182,70 +183,74 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(400, 8);
+            this.label6.Location = new System.Drawing.Point(376, 8);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(41, 12);
             this.label6.TabIndex = 13;
             this.label6.Text = "주문일";
             // 
-            // dateTimePicker2
+            // dtp_orderBegin
             // 
-            this.dateTimePicker2.CustomFormat = "yyyy-MM-dd";
+            this.dtp_orderBegin.CustomFormat = "yyyy-MM-01";
-            this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtp_orderBegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dateTimePicker2.Location = new System.Drawing.Point(441, 4);
+            this.dtp_orderBegin.Location = new System.Drawing.Point(417, 4);
-            this.dateTimePicker2.Name = "dateTimePicker2";
+            this.dtp_orderBegin.Name = "dtp_orderBegin";
-            this.dateTimePicker2.Size = new System.Drawing.Size(85, 21);
+            this.dtp_orderBegin.Size = new System.Drawing.Size(87, 21);
-            this.dateTimePicker2.TabIndex = 15;
+            this.dtp_orderBegin.TabIndex = 15;
             // 
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(529, 8);
+            this.label7.Location = new System.Drawing.Point(506, 8);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(14, 12);
             this.label7.TabIndex = 16;
             this.label7.Text = "~";
             // 
-            // dateTimePicker1
+            // dtp_orderEnd
             // 
-            this.dateTimePicker1.CustomFormat = "yyyy-MM-dd";
+            this.dtp_orderEnd.CustomFormat = "yyyy-MM-dd";
-            this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtp_orderEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dateTimePicker1.Location = new System.Drawing.Point(545, 4);
+            this.dtp_orderEnd.Location = new System.Drawing.Point(522, 4);
-            this.dateTimePicker1.Name = "dateTimePicker1";
+            this.dtp_orderEnd.Name = "dtp_orderEnd";
-            this.dateTimePicker1.Size = new System.Drawing.Size(85, 21);
+            this.dtp_orderEnd.Size = new System.Drawing.Size(87, 21);
-            this.dateTimePicker1.TabIndex = 17;
+            this.dtp_orderEnd.TabIndex = 17;
             // 
-            // dateTimePicker3
+            // dtp_listEnd
             // 
-            this.dateTimePicker3.CustomFormat = "yyyy-MM-dd";
+            this.dtp_listEnd.Checked = false;
-            this.dateTimePicker3.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtp_listEnd.CustomFormat = "yyyy-MM-dd";
-            this.dateTimePicker3.Location = new System.Drawing.Point(784, 4);
+            this.dtp_listEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dateTimePicker3.Name = "dateTimePicker3";
+            this.dtp_listEnd.Location = new System.Drawing.Point(776, 4);
-            this.dateTimePicker3.Size = new System.Drawing.Size(85, 21);
+            this.dtp_listEnd.Name = "dtp_listEnd";
-            this.dateTimePicker3.TabIndex = 21;
+            this.dtp_listEnd.ShowCheckBox = true;
+            this.dtp_listEnd.Size = new System.Drawing.Size(103, 21);
+            this.dtp_listEnd.TabIndex = 21;
             // 
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(768, 8);
+            this.label8.Location = new System.Drawing.Point(760, 8);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(14, 12);
             this.label8.TabIndex = 20;
             this.label8.Text = "~";
             // 
-            // dateTimePicker4
+            // dtp_listBegin
             // 
-            this.dateTimePicker4.CustomFormat = "yyyy-MM-dd";
+            this.dtp_listBegin.Checked = false;
-            this.dateTimePicker4.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtp_listBegin.CustomFormat = "yyyy-MM-01";
-            this.dateTimePicker4.Location = new System.Drawing.Point(680, 4);
+            this.dtp_listBegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dateTimePicker4.Name = "dateTimePicker4";
+            this.dtp_listBegin.Location = new System.Drawing.Point(655, 4);
-            this.dateTimePicker4.Size = new System.Drawing.Size(85, 21);
+            this.dtp_listBegin.Name = "dtp_listBegin";
-            this.dateTimePicker4.TabIndex = 19;
+            this.dtp_listBegin.ShowCheckBox = true;
+            this.dtp_listBegin.Size = new System.Drawing.Size(103, 21);
+            this.dtp_listBegin.TabIndex = 19;
             // 
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(639, 8);
+            this.label9.Location = new System.Drawing.Point(614, 8);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(41, 12);
             this.label9.TabIndex = 18;
@@ -326,7 +331,7 @@
             this.btn_All_unchk.TabIndex = 37;
             this.btn_All_unchk.Text = "전체선택취소";
             this.btn_All_unchk.UseVisualStyleBackColor = true;
-            this.btn_All_unchk.Click += new System.EventHandler(this.btn_All_chk_Click);
+            this.btn_All_unchk.Click += new System.EventHandler(this.btn_All_unchk_Click);
             // 
             // btn_Save
             // 
@@ -338,28 +343,18 @@
             this.btn_Save.UseVisualStyleBackColor = true;
             this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
             // 
-            // button12
-            // 
-            this.button12.Location = new System.Drawing.Point(432, 111);
-            this.button12.Name = "button12";
-            this.button12.Size = new System.Drawing.Size(62, 23);
-            this.button12.TabIndex = 39;
-            this.button12.Text = "주문순위";
-            this.button12.UseVisualStyleBackColor = true;
-            this.button12.Visible = false;
-            // 
             // cb_ordersend
             // 
             this.cb_ordersend.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_ordersend.FormattingEnabled = true;
-            this.cb_ordersend.Location = new System.Drawing.Point(500, 112);
+            this.cb_ordersend.Location = new System.Drawing.Point(570, 112);
             this.cb_ordersend.Name = "cb_ordersend";
             this.cb_ordersend.Size = new System.Drawing.Size(77, 20);
             this.cb_ordersend.TabIndex = 40;
             // 
             // btn_order_send
             // 
-            this.btn_order_send.Location = new System.Drawing.Point(650, 111);
+            this.btn_order_send.Location = new System.Drawing.Point(720, 111);
             this.btn_order_send.Name = "btn_order_send";
             this.btn_order_send.Size = new System.Drawing.Size(75, 23);
             this.btn_order_send.TabIndex = 42;
@@ -369,7 +364,7 @@
             // 
             // btn_send_chk
             // 
-            this.btn_send_chk.Location = new System.Drawing.Point(583, 111);
+            this.btn_send_chk.Location = new System.Drawing.Point(653, 111);
             this.btn_send_chk.Name = "btn_send_chk";
             this.btn_send_chk.Size = new System.Drawing.Size(63, 23);
             this.btn_send_chk.TabIndex = 41;
@@ -419,14 +414,14 @@
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
             this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle4.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)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.chk,
             this.order,
@@ -445,24 +440,24 @@
             this.send_date,
             this.num,
             this.idx});
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle5.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)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle5;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
             this.dataGridView1.Location = new System.Drawing.Point(9, 142);
             this.dataGridView1.MultiSelect = false;
             this.dataGridView1.Name = "dataGridView1";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle6.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)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
             this.dataGridView1.RowHeadersWidth = 10;
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
@@ -633,14 +628,14 @@
             this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel2.Controls.Add(this.label5);
             this.panel2.Controls.Add(this.label6);
-            this.panel2.Controls.Add(this.dateTimePicker2);
+            this.panel2.Controls.Add(this.dtp_orderBegin);
             this.panel2.Controls.Add(this.label7);
-            this.panel2.Controls.Add(this.dateTimePicker1);
+            this.panel2.Controls.Add(this.dtp_orderEnd);
             this.panel2.Controls.Add(this.label9);
-            this.panel2.Controls.Add(this.dateTimePicker4);
+            this.panel2.Controls.Add(this.dtp_listBegin);
             this.panel2.Controls.Add(this.label8);
             this.panel2.Controls.Add(this.tb_search_book_list);
-            this.panel2.Controls.Add(this.dateTimePicker3);
+            this.panel2.Controls.Add(this.dtp_listEnd);
             this.panel2.Controls.Add(this.label10);
             this.panel2.Controls.Add(this.tb_PS);
             this.panel2.Location = new System.Drawing.Point(9, 47);
@@ -652,7 +647,7 @@
             // 
             this.tb_search_book_list.Location = new System.Drawing.Point(63, 4);
             this.tb_search_book_list.Name = "tb_search_book_list";
-            this.tb_search_book_list.Size = new System.Drawing.Size(333, 21);
+            this.tb_search_book_list.Size = new System.Drawing.Size(307, 21);
             this.tb_search_book_list.TabIndex = 44;
             this.tb_search_book_list.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_search_book_list_KeyDown);
             // 
@@ -686,11 +681,30 @@
             this.btn_Excel.UseVisualStyleBackColor = true;
             this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click);
             // 
+            // lbl_OrderStat
+            // 
+            this.lbl_OrderStat.AutoSize = true;
+            this.lbl_OrderStat.Location = new System.Drawing.Point(796, 116);
+            this.lbl_OrderStat.Name = "lbl_OrderStat";
+            this.lbl_OrderStat.Size = new System.Drawing.Size(53, 12);
+            this.lbl_OrderStat.TabIndex = 51;
+            this.lbl_OrderStat.Text = "            ";
+            // 
+            // cb_OrderStat
+            // 
+            this.cb_OrderStat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cb_OrderStat.FormattingEnabled = true;
+            this.cb_OrderStat.Location = new System.Drawing.Point(453, 112);
+            this.cb_OrderStat.Name = "cb_OrderStat";
+            this.cb_OrderStat.Size = new System.Drawing.Size(111, 20);
+            this.cb_OrderStat.TabIndex = 40;
+            // 
             // Order_input
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1261, 722);
+            this.Controls.Add(this.lbl_OrderStat);
             this.Controls.Add(this.btn_Excel);
             this.Controls.Add(this.btn_close);
             this.Controls.Add(this.panel2);
@@ -704,8 +718,8 @@
             this.Controls.Add(this.btn_order_send);
             this.Controls.Add(this.btn_send_chk);
             this.Controls.Add(this.btn_lookup);
+            this.Controls.Add(this.cb_OrderStat);
             this.Controls.Add(this.cb_ordersend);
-            this.Controls.Add(this.button12);
             this.Controls.Add(this.btn_Save);
             this.Controls.Add(this.btn_All_unchk);
             this.Controls.Add(this.btn_All_chk);
@@ -737,12 +751,10 @@
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.DateTimePicker dateTimePicker2;
+        private System.Windows.Forms.DateTimePicker dtp_orderBegin;
         private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.DateTimePicker dateTimePicker1;
+        private System.Windows.Forms.DateTimePicker dtp_orderEnd;
-        private System.Windows.Forms.DateTimePicker dateTimePicker3;
         private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.DateTimePicker dateTimePicker4;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.TextBox tb_PS;
@@ -753,7 +765,6 @@
         private System.Windows.Forms.Button btn_All_chk;
         private System.Windows.Forms.Button btn_All_unchk;
         private System.Windows.Forms.Button btn_Save;
-        private System.Windows.Forms.Button button12;
         private System.Windows.Forms.Button btn_order_send;
         private System.Windows.Forms.Button btn_send_chk;
         private System.Windows.Forms.Label label12;
@@ -790,5 +801,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn send_date;
         private System.Windows.Forms.DataGridViewTextBoxColumn num;
         private System.Windows.Forms.DataGridViewTextBoxColumn idx;
+        public System.Windows.Forms.DateTimePicker dtp_listEnd;
+        public System.Windows.Forms.DateTimePicker dtp_listBegin;
+        private System.Windows.Forms.Label lbl_OrderStat;
+        private System.Windows.Forms.ComboBox cb_OrderStat;
     }
 }

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

@@ -22,7 +22,6 @@ namespace WindowsFormsApp1.Delivery
         public string compidx = "";
         public int grididx;
         int ColumnIndex;
-        string chk_mkdate = "";
         bool chk_V = false;
         public Order_input(Main _main)
         {
@@ -41,15 +40,15 @@ namespace WindowsFormsApp1.Delivery
             // 데이터 그리드 뷰 수정
             for(int a = 0; a < dataGridView1.Columns.Count; a++)
             {
-                if (a != 1 && a != 6 && a != 16) { 
+                if (a != 1 && a != 6 && a != 7 && a != 12 && a != 16) { 
                     dataGridView1.Columns[a].ReadOnly = true;
                 }
             }
 
             // 사용자 구분
             cb_user.Items.Add("전체");
-            string[] user_tmp = main.DB_User_Data.Split('|');
+            string compName = main.toolStripLabel2.Text;
-            string cmd = db.self_Made_Cmd("SELECT `name` FROM `User_Data` WHERE `affil` = '" + user_tmp[5] + "';");
+            string cmd = db.self_Made_Cmd("SELECT `name` FROM `User_Data` WHERE `affil` = '" + compName + "';");
             string[] user_name = cmd.Split('|');
             for (int a = 0; a < user_name.Length; a++)
             {
@@ -68,31 +67,60 @@ namespace WindowsFormsApp1.Delivery
             cb_order.Items.AddRange(order);
             cb_order.SelectedIndex = 1;
 
+            // 주문서 조건
+            string[] order_Stat = { "ISBN 인쇄", "납품처 인쇄", "납품처 ISBN" };
+            cb_OrderStat.Items.AddRange(order_Stat);
+            cb_OrderStat.SelectedIndex = 0;
+
             // 주문서 구분
             string[] order_send = { "팩스", "메일" };
             cb_ordersend.Items.AddRange(order_send);
             cb_ordersend.SelectedIndex = 0;
         }
+
         private void btn_lookup_Click(object sender, EventArgs e)
         {
-            List<string> l_col = new List<string>();
+            string Area = "`order`, `order_stat`, `isbn`, `book_name`, `author`, " +
-            List<string> l_data = new List<string>();
-
-            l_col.Add("compidx");
-            l_data.Add(compidx);
-
-            if (tb_search_book_list.Text != "") {
-                l_col.Add("list_name");
-                l_data.Add(tb_search_book_list.Text);
-            }
-
-            string[] tmp_col = l_col.ToArray();
-            string[] tmp_data = l_data.ToArray();
-            string takedata = "`order`, `order_stat`, `isbn`, `book_name`, `author`, " +
                               "`book_comp`, `order_count`, `count`, `pay`, `total`, " +
                               "`etc`, `list_name`, `order_date`, `send_date`, `header`, " +
                               "`num`, `idx`";
-            string cmd = db.More_DB_Search("Obj_List_Book", tmp_col, tmp_data, takedata);
+            string Table = "Obj_List_Book";
+
+            string cmd = string.Format("SELECT {0} FROM `{1}` WHERE `compidx` = \"{2}\"", Area, Table, compidx);
+
+            string tmpData = "";
+
+            if (tb_search_book_name.Text != "")
+                tmpData += string.Format(" AND `book_name` LIKE \"%{0}%\"", tb_search_book_name.Text);
+
+            if (tb_search_book_comp.Text != "")
+                tmpData += string.Format(" AND `book_comp` LIKE \"%{0}%\"", tb_search_book_comp.Text);
+
+            if (cb_state.Text != "전체")
+                tmpData += string.Format(" AND `import` = \"{0}\"", cb_state.Text);
+
+            if (cb_order.Text == "주문중") {
+                string DateBegin = dtp_orderBegin.Text;
+                string DateEnd = dtp_orderEnd.Text;
+                tmpData += string.Format(" AND `order_date` >= \"{0}\" AND `order_date` <= \"{1}\"", DateBegin, DateEnd);
+            }
+            else if (cb_order.Text == "미주문")
+                tmpData += string.Format(" AND `order_date` =\"\"");
+
+            cmd += tmpData + ";";
+
+            // string cmd = db.More_DB_Search("Obj_List_Book", tmp_col, tmp_data, takedata);
+
+            // SELECT {0}
+            // FROM `Obj_List_Book`
+            // WHERE `compidx` = \"{1}\"
+            //   AND `list_name` = \"{2}\" AND `date` >= \"{3}\" AND `date` <= \"{4}\"
+            //   AND `book_name` LIKE \"%{3}%\"
+            //   AND `book_comp` LIKE \"%{4}%\"
+            //   AND `import` = \"{5}\"
+            //   AND `order_date` >= \"{6}\" AND `order_date` <= \"{7}\"
+            //   ;
+
             string db_res = db.DB_Send_CMD_Search(cmd);
             made_grid(db_res, true);
             date_Substring();
@@ -124,8 +152,8 @@ namespace WindowsFormsApp1.Delivery
                 if (a % 17 == 3) { mkgrid[4] = data[a]; }   // 도서명
                 if (a % 17 == 4) { mkgrid[5] = data[a]; }   // 저자
                 if (a % 17 == 5) { mkgrid[6] = data[a]; }   // 출판사
-                if (a % 17 == 6) { mkgrid[7] = data[a]; }   // 주문수
+                if (a % 17 == 6) {  }   // 주문수 => 원래 수량과 동일하게 됨.
-                if (a % 17 == 7) { mkgrid[8] = data[a]; }   // 원주문
+                if (a % 17 == 7) { mkgrid[7] = data[a]; mkgrid[8] = data[a]; }   // 원주문
                 if (a % 17 == 8) { mkgrid[9] = data[a]; }   // 정가
                 if (a % 17 == 9) { mkgrid[10] = data[a]; }   // 합계
                 if (a % 17 == 10) { mkgrid[11] = data[a]; }   // 비고
@@ -136,14 +164,11 @@ namespace WindowsFormsApp1.Delivery
                 if (a % 17 == 15) { mkgrid[15] += " " + data[a]; }         // 번호
                 if (a % 17 == 16) {
                     mkgrid[16] = data[a];
-                    if (chk == false) { dataGridView1.Rows.Add(mkgrid); }
+                    if (!chk)
-                    else
-                    {
-                        if (Array_Inspection(mkgrid) == true)
-                        {
                         dataGridView1.Rows.Add(mkgrid);
-                        }
+                    else
-                    }
+                        dataGridView1.Rows.Add(mkgrid);
+
                 }
             }
             // 색입히는 함수 기입
@@ -321,12 +346,10 @@ namespace WindowsFormsApp1.Delivery
             if (col == 13 && dataGridView1.Rows[grididx].Cells[ColumnIndex].Value.ToString() != "")
             {
                 dataGridView1.Rows[row].Cells["order_date"].Value = "";
-                chk_mkdate = chk_mkdate.Replace("." + row + ", ", "");
             }
             else if (col == 13 && dataGridView1.Rows[grididx].Cells[ColumnIndex].Value.ToString() == "")
             {
                 dataGridView1.Rows[row].Cells["order_date"].Value = DateTime.Now.ToString("d");
-                chk_mkdate += "." + row + ", ";
             }
         }
         private void tb_search_book_list_KeyDown(object sender, KeyEventArgs e)
@@ -369,7 +392,7 @@ namespace WindowsFormsApp1.Delivery
             string temp = Excel_sub();
             if (temp == "false") { return; }
 
-            if (sender != null && e != null) { System.Diagnostics.Process.Start(Application.StartupPath + "/Excel"); }
+            if (sender != null && e != null) { Process.Start(Application.StartupPath + "/Excel"); }
         }
         private string Excel_sub()
         {
@@ -380,13 +403,15 @@ namespace WindowsFormsApp1.Delivery
                 if (dataGridView1.Rows[a].Cells["chk"].Value.ToString() == "true")
                 {
                     chkIdx.Add(a);
-                    total[0] += Convert.ToInt32(dataGridView1.Rows[a].Cells["count"].Value.ToString());
+                    total[0] += Convert.ToInt32(dataGridView1.Rows[a].Cells["order_count"].Value.ToString());
                     total[1] += Convert.ToInt32(dataGridView1.Rows[a].Cells["pay"].Value.ToString());
                 }
             }
             if (chkIdx.Count < 1) { MessageBox.Show("선택된 도서가 없습니다!"); return "false"; }
             string[,] inputExcel = new string[chkIdx.Count, 7];
             string pur = dataGridView1.Rows[chkIdx[0]].Cells["order"].Value.ToString();
+
+            int isCondition = cb_OrderStat.SelectedIndex;
             for (int a = 0; a < chkIdx.Count; a++)
             {
                 string list = dataGridView1.Rows[chkIdx[a]].Cells["list_name"].Value.ToString();
@@ -396,8 +421,14 @@ namespace WindowsFormsApp1.Delivery
                 inputExcel[a, 1] = dataGridView1.Rows[chkIdx[a]].Cells["book_comp"].Value.ToString();
                 inputExcel[a, 2] = dataGridView1.Rows[chkIdx[a]].Cells["book_name"].Value.ToString();
                 inputExcel[a, 3] = dataGridView1.Rows[chkIdx[a]].Cells["author"].Value.ToString();
-                inputExcel[a, 4] = dataGridView1.Rows[chkIdx[a]].Cells["count"].Value.ToString();
+                inputExcel[a, 4] = dataGridView1.Rows[chkIdx[a]].Cells["order_count"].Value.ToString();
                 inputExcel[a, 5] = dataGridView1.Rows[chkIdx[a]].Cells["pay"].Value.ToString();
+
+                if (isCondition == 0)       // ISBN만
+                    inputExcel[a, 6] = dataGridView1.Rows[chkIdx[a]].Cells["isbn"].Value.ToString();
+                else if (isCondition == 1)  // 납품처만
+                    inputExcel[a, 6] = div;
+                else                        // 납품처 + ISBN
                     inputExcel[a, 6] = div + "\n" +
                                    dataGridView1.Rows[chkIdx[a]].Cells["isbn"].Value.ToString();
             }
@@ -445,20 +476,38 @@ namespace WindowsFormsApp1.Delivery
 
             Upload_File(filename, filePath);
 
+            bool isSend = false;
             switch (emchk)
             {
                 case "0":
-                    MessageBox.Show("팩스");
+                    lbl_OrderStat.Text = "팩스전송중입니다.";
-                    Send_FAX(pur, filename, filePath);
+                    isSend = Send_FAX(pur, filename, filePath);
                     break;
                 case "1":
-                    MessageBox.Show("메일");
+                    lbl_OrderStat.Text = "메일전송중입니다.";
-                    Send_Email(pur, filename, filePath);
+                    isSend = Send_Email(pur, filename, filePath);
                     break;
             }
+
+            if (isSend)
+            {
+                InputOrderDate();
+            }
         }
         #region Order_Send_Sub
 
+        private void InputOrderDate()
+        {
+            for (int a = 0; a < dataGridView1.Rows.Count; a++)
+            {
+                if (dataGridView1.Rows[a].Cells["chk"].Value.ToString() == "true")
+                {
+                    dataGridView1.Rows[a].Cells["order_date"].Value = DateTime.Now.ToString("d");
+                    dataGridView1.Rows[a].Cells["chk"].Value = false;
+                }
+            }
+        }
+
         private void Upload_File(string file_name, string path)
         {
             FTP ftp = new FTP();
@@ -469,6 +518,7 @@ namespace WindowsFormsApp1.Delivery
 
             if (result)
             {
+                lbl_OrderStat.Text = "FTP 접속 성공";
                 foreach (FileInfo info in dirInfo.GetFiles())
                 {
                     if (Path.GetFileName(info.Name) == file_name)
@@ -476,15 +526,15 @@ namespace WindowsFormsApp1.Delivery
                         path = path.Replace(Application.StartupPath, "");
 
                         if (!ftp.UpLoad(path, info.FullName))
-                            MessageBox.Show("FTP Upload 실패");
+                            lbl_OrderStat.Text = "FTP UpLoad 실패";
 
                         else
-                            MessageBox.Show("FTP Upload 성공");
+                            lbl_OrderStat.Text = "FTP UpLoad 성공";
                     }
                 }
             }
             else
-                MessageBox.Show("FTP 접속 실패");
+                lbl_OrderStat.Text = "FTP 접속 실패";
         }
         /// <summary>
         /// 보낼 경로가 메일인지 팩스인지 확인
@@ -503,7 +553,7 @@ namespace WindowsFormsApp1.Delivery
         /// <param name="pur">거래처명</param>
         /// <param name="filename">파일명</param>
         /// <param name="FilePath">파일경로 (파일명 포함)</param>
-        private void Send_FAX(string pur, string filename, string FilePath)
+        private bool Send_FAX(string pur, string filename, string FilePath)
         {
             List<string> data_list = new List<string>();
 
@@ -543,7 +593,7 @@ namespace WindowsFormsApp1.Delivery
             if (pur_data[1] == "")
             {
                 MessageBox.Show("주문처의 팩스 번호가 비어있습니다!", "Error");
-                return;
+                return false;
             }
 
             data_list.Add(fax_num[0]);
@@ -564,16 +614,21 @@ namespace WindowsFormsApp1.Delivery
                 {
                     if (Path.GetFileName(info.Name) == filename)
                     {
-                        if (ftp.UpLoad(path, info.FullName) == false)
+                        if (ftp.UpLoad(path, info.FullName))
-                            MessageBox.Show("팩스 FTP Upload 실패");
+                            lbl_OrderStat.Text = "팩스 FTP UPload 성공";
 
-                        else
+                        else {
-                            MessageBox.Show("팩스 FTP Upload 성공");
+                            lbl_OrderStat.Text = "팩스 FTP UPload 실패";
+                            return false;
+                        }
 
                     }
                 }
             }
-            else MessageBox.Show("접속 실패");
+            else {
+                lbl_OrderStat.Text = "팩스 서버 접속 실패";
+                return false;
+            }
 
             // 날짜 시간 구해오기
             string Date = DateTime.Now.ToString("yyyy-MM-dd");
@@ -589,6 +644,8 @@ namespace WindowsFormsApp1.Delivery
             string[] set_Data = { compidx, "팩스", Fax_Key, Date, Time, filename };
             string Incmd = db.DB_INSERT("Send_Order", col_Name, set_Data);
             db.DB_Send_CMD_reVoid(Incmd);
+
+            return true;
         }
         /// <summary>
         /// 메일 보내는 함수
@@ -596,7 +653,7 @@ namespace WindowsFormsApp1.Delivery
         /// <param name="pur">거래처명</param>
         /// <param name="filename">파일명</param>
         /// <param name="FilePath">파일경로 (파일명 포함)</param>
-        private void Send_Email(string pur, string filename, string filePath)
+        private bool Send_Email(string pur, string filename, string filePath)
         {
             String_Text st = new String_Text();
 
@@ -624,7 +681,7 @@ namespace WindowsFormsApp1.Delivery
                 string value = "";
                 if (sst.InputBox("보내실 이메일을 적어주세요.", "보내실 이메일을 적어주세요.", ref value) == DialogResult.OK)
                 {
-                    if (value == "") { return; }
+                    if (value == "") { return false; }
                 }
                 else
                 {
@@ -645,9 +702,14 @@ namespace WindowsFormsApp1.Delivery
                 string[] set_Data = { compidx, "메일", pur, Date, Time, arr_db[0], m_send, filename, "성공" };
                 string Incmd = db.DB_INSERT("Send_Order", col_Name, set_Data);
                 db.DB_Send_CMD_reVoid(Incmd);
-                MessageBox.Show("전송 성공!");
+                lbl_OrderStat.Text = "메일 전송 성공!";
+                return true;
+            }
+            else
+            {
+                lbl_OrderStat.Text = "메일 전송 실패!";
+                return false;
             }
-            else { MessageBox.Show("전송 실패!"); }
         }
         #endregion
         private void btn_send_chk_Click(object sender, EventArgs e)
@@ -687,14 +749,17 @@ namespace WindowsFormsApp1.Delivery
         }
         private void btn_All_chk_Click(object sender, EventArgs e)
         {
-            string name = ((Button)sender).Name;
             for(int a = 0; a < dataGridView1.Rows.Count; a++)
             {
-                if (name == "btn_All_chk")
+                dataGridView1.Rows[a].Cells["chk"].Value = true;
-                    dataGridView1.Rows[a].Cells["chk"].Value = "true";
+            }
+        }
 
-                else if (name == "btn_All_unchk")
+        private void btn_All_unchk_Click(object sender, EventArgs e)
-                    dataGridView1.Rows[a].Cells["chk"].Value = "false";
+        {
+            for (int a = 0; a < dataGridView1.Rows.Count; a++)
+            {
+                dataGridView1.Rows[a].Cells["chk"].Value = false;
             }
         }
         private void dataGridView1_DataError(object sender, DataGridViewDataErrorEventArgs e)

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

@@ -20,7 +20,6 @@ namespace WindowsFormsApp1.Delivery
         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;
@@ -110,27 +109,16 @@ namespace WindowsFormsApp1.Delivery
                 if (a % 4 == 1) { res[1] = data[a]; }
                 if (a % 4 == 2) { res[2] = data[a]; }
                 if (a % 4 == 3) { res[3] = data[a];
-                    if(Contain_Text(res[0]))
+                    if (res[0].Contains(searchText))
                         dataGridView1.Rows.Add(res);
                 }
             }
         }
-        private bool Contain_Text(string ori)
-        {
-            if (ori.Contains(searchText))
-                return true;
-
-            return false;
-        }
         private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e)
         {
-            grididx = e.RowIndex;
         }
         private void dataGridView1_KeyDown(object sender, KeyEventArgs e)
         {
-            if (e.KeyCode == Keys.Up) { grididx--; }
-            if (e.KeyCode == Keys.Down) { grididx++; }
-
             if (e.KeyCode == Keys.Enter) {
                 if (dataGridView1.Rows.Count == 0)
                     return;
@@ -140,31 +128,40 @@ namespace WindowsFormsApp1.Delivery
         }
         private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
-            if (Where_Open == "") { grididx = 0; }
+            int row = 0;
-            if (e != null) { grididx = e.RowIndex; }
+
+            if (Where_Open == "") { row = 0; }
+            else row = dataGridView1.CurrentCell.RowIndex;
+
+            if (e != null) { row = e.RowIndex; }
+            else row = dataGridView1.CurrentCell.RowIndex;
+
             if (oin != null) {
-                oin_result();
+                oin_result(row);
             }
             else if (pb != null) {
-                pb_result();
+                pb_result(row);
             }
             else if (rem2 != null) {
-                rem2.tb_purchase.Text = dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString();
+                rem2.tb_purchase.Text = dataGridView1.Rows[row].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();
+                string listName = dataGridView1.Rows[row].Cells["list_name"].Value.ToString();
                 isbn.tb_list_name.Text = listName;
                 isbn.DataLoad(listName);
             }
             Close();
         }
-        private void oin_result()
+        private void oin_result(int grididx)
         {
             if (Where_Open == "book_list")
             {
-                string[] tmp_col = { "compidx", "list_name" };
+                string ListName = dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString();
-                string[] tmp_data = { compidx, dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString() };
+                string DBdate = dataGridView1.Rows[grididx].Cells["date"].Value.ToString();
+
+                string[] tmp_col = { "compidx", "list_name", "date" };
+                string[] tmp_data = { compidx, ListName, DBdate };
                 string takedata = "`order`, `order_stat`, `isbn`, `book_name`, `author`, " +
                                   "`book_comp`, `order_count`, `count`, `pay`, `total`, " +
                                   "`etc`, `list_name`, `order_date`, `send_date`, `header`, " +
@@ -172,15 +169,24 @@ namespace WindowsFormsApp1.Delivery
                 string cmd = db.More_DB_Search("Obj_List_Book", tmp_col, tmp_data, takedata);
                 string db_res = db.DB_Send_CMD_Search(cmd);
                 oin.made_grid(db_res, false);
-                oin.tb_search_book_list.Text = tmp_data[1];
+                oin.tb_search_book_list.Text = ListName;
+
+                DateTime setDate = DateTime.ParseExact(DBdate, "yyyy-MM-dd", null);
+
+                oin.dtp_listBegin.Checked = true;
+                oin.dtp_listEnd.Checked = true;
+
+                oin.dtp_listBegin.Value = setDate;
+                oin.dtp_listEnd.Value = setDate;
             }
             else if (Where_Open.Contains("Order"))
             {
-                if(Where_Open == "Order_Grid") {
+                if (Where_Open == "Order_Grid") {
                     oin.dataGridView1.Rows[oin_grid_idx[0]].Cells[oin_grid_idx[1]].Value =
                         dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString();
                 }
-                else {
+                else
+                {
                     try
                     {
                         oin.tb_orderText.Text = dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString();
@@ -189,7 +195,7 @@ namespace WindowsFormsApp1.Delivery
                 }
             }
         }
-        private void pb_result()
+        private void pb_result(int grididx)
         {
             pb.tb_purchase.Text = dataGridView1.Rows[grididx].Cells["list_name"].Value.ToString();
             pb.btn_Lookup_Click(null, null);

unimarc/unimarc/마크/Check_ISBN.cs

@@ -59,7 +59,7 @@ namespace WindowsFormsApp1.Mac
             db.DBcon();
             string[] search_tbl = { "compidx", "list_name" };
             string[] search_col = { compidx, list_name };
-            string search_data = "`header`, `num`, `isbn`, `book_name`, `author`, `book_comp`, " +
+            string search_data = "`idx`, `header`, `num`, `isbn`, `book_name`, `author`, `book_comp`, " +
                                  "`count`, `pay`, `total`, `import`, `price`, " +
                                  "`etc`, `pubDate`, `persent`, `category`, `image_url`, `set_book_name`";
 
@@ -188,7 +188,7 @@ namespace WindowsFormsApp1.Mac
             MessageBox.Show("검색이 완료되었습니다!");
 
             progressBar1.Value = dataGridView1.Rows.Count;
-            dataGridView1.CurrentCell = dataGridView1.Rows[0].Cells[0];
+            dataGridView1.CurrentCell = dataGridView1.Rows[0].Cells["num"];
             this.ActiveControl = dataGridView1;
             rowidx = 0;
             save = false;
@@ -421,9 +421,15 @@ namespace WindowsFormsApp1.Mac
 
             if (data == "") { return; }
 
+            string newstring;
+            try {
                 // pubDate형 보기편하게 DateTime형으로 재정리
-            string newstring = String.Format("{0:yyyy/MM/dd HH:mm}", 
+                newstring = String.Format("{0:yyyy/MM/dd HH:mm}",
                             DateTime.Parse(insert[5].Remove(insert[5].IndexOf(" G"))));
+            }
+            catch {
+                newstring = insert[5];
+            }
 
             // 도서 분류 필요한 데이터로 재정리
             int top = insert[6].IndexOf('>');
@@ -691,7 +697,7 @@ namespace WindowsFormsApp1.Mac
             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)
+            if (e.KeyCode == Keys.Insert)
             {
                 Check_ISBN_Split split = new Check_ISBN_Split(this);
                 split.book_data[0] = dataGridView1.Rows[rowidx].Cells["num"].Value.ToString();
@@ -748,12 +754,10 @@ namespace WindowsFormsApp1.Mac
         private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e)
         {
             rowidx = e.RowIndex;
-            richTextBox1.Text += dataGridView1.Rows[rowidx].Cells["etc"].Value.ToString().Contains("세트분할").ToString();
             if (rowidx < 0) {
-                Skill_Grid sg = new Skill_Grid();
-                sg.Grid_Sort(dataGridView1, e.ColumnIndex);
                 return;
             }
+            richTextBox1.Text += dataGridView1.Rows[rowidx].Cells["etc"].Value.ToString().Contains("세트분할").ToString();
             if (dataGridView1.Rows[rowidx].Cells["api_data"].Value == null) {
                 return;
             }

unimarc/unimarc/마크/DLS_Lookup.Designer.cs

@@ -0,0 +1,411 @@
+namespace WindowsFormsApp1.DLS
+{
+    partial class School_Lookup
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(School_Lookup));
+            this.btn_Back = new System.Windows.Forms.Button();
+            this.tb_URL = new System.Windows.Forms.TextBox();
+            this.panel7 = new System.Windows.Forms.Panel();
+            this.webBrowser1 = new System.Windows.Forms.WebBrowser();
+            this.panel6 = new System.Windows.Forms.Panel();
+            this.btn_Forward = new System.Windows.Forms.Button();
+            this.btn_Close = new System.Windows.Forms.Button();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.lbl_ID = new System.Windows.Forms.Label();
+            this.lbl_Client = new System.Windows.Forms.Label();
+            this.tb_SearchClient = new System.Windows.Forms.TextBox();
+            this.btn_Reflesh008 = new System.Windows.Forms.Button();
+            this.rBtn_ISBN = new System.Windows.Forms.RadioButton();
+            this.rBtn_BookName = new System.Windows.Forms.RadioButton();
+            this.lbl_PW = new System.Windows.Forms.Label();
+            this.lbl_Area = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.btn_Connect = new System.Windows.Forms.Button();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.btn_Search = new System.Windows.Forms.Button();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.Check = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.panel7.SuspendLayout();
+            this.panel6.SuspendLayout();
+            this.panel4.SuspendLayout();
+            this.panel5.SuspendLayout();
+            this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.panel3.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btn_Back
+            // 
+            this.btn_Back.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.btn_Back.Location = new System.Drawing.Point(10, 8);
+            this.btn_Back.Name = "btn_Back";
+            this.btn_Back.Size = new System.Drawing.Size(43, 23);
+            this.btn_Back.TabIndex = 1;
+            this.btn_Back.Text = "<<";
+            this.btn_Back.UseVisualStyleBackColor = true;
+            this.btn_Back.Click += new System.EventHandler(this.btn_Back_Click);
+            // 
+            // tb_URL
+            // 
+            this.tb_URL.Location = new System.Drawing.Point(108, 9);
+            this.tb_URL.Name = "tb_URL";
+            this.tb_URL.Size = new System.Drawing.Size(706, 21);
+            this.tb_URL.TabIndex = 0;
+            this.tb_URL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_URL_KeyDown);
+            // 
+            // panel7
+            // 
+            this.panel7.Controls.Add(this.webBrowser1);
+            this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel7.Location = new System.Drawing.Point(0, 38);
+            this.panel7.Name = "panel7";
+            this.panel7.Size = new System.Drawing.Size(917, 676);
+            this.panel7.TabIndex = 7;
+            // 
+            // webBrowser1
+            // 
+            this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.webBrowser1.Location = new System.Drawing.Point(0, 0);
+            this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
+            this.webBrowser1.Name = "webBrowser1";
+            this.webBrowser1.Size = new System.Drawing.Size(917, 676);
+            this.webBrowser1.TabIndex = 5;
+            this.webBrowser1.DocumentCompleted += new System.Windows.Forms.WebBrowserDocumentCompletedEventHandler(this.webBrowser1_DocumentCompleted);
+            // 
+            // panel6
+            // 
+            this.panel6.Controls.Add(this.btn_Back);
+            this.panel6.Controls.Add(this.btn_Forward);
+            this.panel6.Controls.Add(this.tb_URL);
+            this.panel6.Controls.Add(this.btn_Close);
+            this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel6.Location = new System.Drawing.Point(0, 0);
+            this.panel6.Name = "panel6";
+            this.panel6.Size = new System.Drawing.Size(917, 38);
+            this.panel6.TabIndex = 6;
+            // 
+            // btn_Forward
+            // 
+            this.btn_Forward.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.btn_Forward.Location = new System.Drawing.Point(59, 8);
+            this.btn_Forward.Name = "btn_Forward";
+            this.btn_Forward.Size = new System.Drawing.Size(43, 23);
+            this.btn_Forward.TabIndex = 1;
+            this.btn_Forward.Text = ">>";
+            this.btn_Forward.UseVisualStyleBackColor = true;
+            this.btn_Forward.Click += new System.EventHandler(this.btn_Forward_Click);
+            // 
+            // btn_Close
+            // 
+            this.btn_Close.Location = new System.Drawing.Point(820, 8);
+            this.btn_Close.Name = "btn_Close";
+            this.btn_Close.Size = new System.Drawing.Size(75, 23);
+            this.btn_Close.TabIndex = 2;
+            this.btn_Close.Text = "닫    기";
+            this.btn_Close.UseVisualStyleBackColor = true;
+            this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
+            // 
+            // panel4
+            // 
+            this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel4.Controls.Add(this.panel7);
+            this.panel4.Controls.Add(this.panel6);
+            this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel4.Location = new System.Drawing.Point(364, 0);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(919, 716);
+            this.panel4.TabIndex = 4;
+            // 
+            // lbl_ID
+            // 
+            this.lbl_ID.AutoSize = true;
+            this.lbl_ID.Location = new System.Drawing.Point(185, 37);
+            this.lbl_ID.Name = "lbl_ID";
+            this.lbl_ID.Size = new System.Drawing.Size(16, 12);
+            this.lbl_ID.TabIndex = 3;
+            this.lbl_ID.Text = "ID";
+            // 
+            // lbl_Client
+            // 
+            this.lbl_Client.AutoSize = true;
+            this.lbl_Client.Location = new System.Drawing.Point(7, 37);
+            this.lbl_Client.Name = "lbl_Client";
+            this.lbl_Client.Size = new System.Drawing.Size(37, 12);
+            this.lbl_Client.TabIndex = 3;
+            this.lbl_Client.Text = "Client";
+            // 
+            // tb_SearchClient
+            // 
+            this.tb_SearchClient.Location = new System.Drawing.Point(65, 9);
+            this.tb_SearchClient.Name = "tb_SearchClient";
+            this.tb_SearchClient.Size = new System.Drawing.Size(198, 21);
+            this.tb_SearchClient.TabIndex = 1;
+            this.tb_SearchClient.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_SearchClient_KeyDown);
+            // 
+            // btn_Reflesh008
+            // 
+            this.btn_Reflesh008.BackColor = System.Drawing.SystemColors.WindowText;
+            this.btn_Reflesh008.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_Reflesh008.BackgroundImage")));
+            this.btn_Reflesh008.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.btn_Reflesh008.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btn_Reflesh008.Location = new System.Drawing.Point(329, 0);
+            this.btn_Reflesh008.Name = "btn_Reflesh008";
+            this.btn_Reflesh008.Size = new System.Drawing.Size(29, 29);
+            this.btn_Reflesh008.TabIndex = 208;
+            this.btn_Reflesh008.UseVisualStyleBackColor = false;
+            this.btn_Reflesh008.Click += new System.EventHandler(this.btn_Reflesh008_Click);
+            // 
+            // rBtn_ISBN
+            // 
+            this.rBtn_ISBN.AutoSize = true;
+            this.rBtn_ISBN.Checked = true;
+            this.rBtn_ISBN.Location = new System.Drawing.Point(185, 7);
+            this.rBtn_ISBN.Name = "rBtn_ISBN";
+            this.rBtn_ISBN.Size = new System.Drawing.Size(51, 16);
+            this.rBtn_ISBN.TabIndex = 4;
+            this.rBtn_ISBN.TabStop = true;
+            this.rBtn_ISBN.Text = "ISBN";
+            this.rBtn_ISBN.UseVisualStyleBackColor = true;
+            // 
+            // rBtn_BookName
+            // 
+            this.rBtn_BookName.AutoSize = true;
+            this.rBtn_BookName.Location = new System.Drawing.Point(98, 7);
+            this.rBtn_BookName.Name = "rBtn_BookName";
+            this.rBtn_BookName.Size = new System.Drawing.Size(59, 16);
+            this.rBtn_BookName.TabIndex = 4;
+            this.rBtn_BookName.Text = "도서명";
+            this.rBtn_BookName.UseVisualStyleBackColor = true;
+            // 
+            // lbl_PW
+            // 
+            this.lbl_PW.AutoSize = true;
+            this.lbl_PW.Location = new System.Drawing.Point(297, 37);
+            this.lbl_PW.Name = "lbl_PW";
+            this.lbl_PW.Size = new System.Drawing.Size(23, 12);
+            this.lbl_PW.TabIndex = 3;
+            this.lbl_PW.Text = "PW";
+            // 
+            // lbl_Area
+            // 
+            this.lbl_Area.AutoSize = true;
+            this.lbl_Area.Location = new System.Drawing.Point(97, 37);
+            this.lbl_Area.Name = "lbl_Area";
+            this.lbl_Area.Size = new System.Drawing.Size(31, 12);
+            this.lbl_Area.TabIndex = 3;
+            this.lbl_Area.Text = "Area";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(6, 9);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(53, 12);
+            this.label2.TabIndex = 3;
+            this.label2.Text = "검색조건";
+            // 
+            // btn_Connect
+            // 
+            this.btn_Connect.Location = new System.Drawing.Point(278, 8);
+            this.btn_Connect.Name = "btn_Connect";
+            this.btn_Connect.Size = new System.Drawing.Size(75, 23);
+            this.btn_Connect.TabIndex = 5;
+            this.btn_Connect.Text = "접    속";
+            this.btn_Connect.UseVisualStyleBackColor = true;
+            this.btn_Connect.Click += new System.EventHandler(this.btn_Connect_Click);
+            // 
+            // panel5
+            // 
+            this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel5.Controls.Add(this.btn_Reflesh008);
+            this.panel5.Controls.Add(this.rBtn_ISBN);
+            this.panel5.Controls.Add(this.rBtn_BookName);
+            this.panel5.Controls.Add(this.label2);
+            this.panel5.Controls.Add(this.btn_Search);
+            this.panel5.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel5.Location = new System.Drawing.Point(0, 37);
+            this.panel5.Name = "panel5";
+            this.panel5.Size = new System.Drawing.Size(360, 31);
+            this.panel5.TabIndex = 4;
+            // 
+            // btn_Search
+            // 
+            this.btn_Search.Location = new System.Drawing.Point(242, 4);
+            this.btn_Search.Name = "btn_Search";
+            this.btn_Search.Size = new System.Drawing.Size(75, 23);
+            this.btn_Search.TabIndex = 2;
+            this.btn_Search.Text = "검    색";
+            this.btn_Search.UseVisualStyleBackColor = true;
+            this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click);
+            // 
+            // panel2
+            // 
+            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel2.Controls.Add(this.btn_Connect);
+            this.panel2.Controls.Add(this.panel5);
+            this.panel2.Controls.Add(this.lbl_PW);
+            this.panel2.Controls.Add(this.lbl_Area);
+            this.panel2.Controls.Add(this.lbl_ID);
+            this.panel2.Controls.Add(this.lbl_Client);
+            this.panel2.Controls.Add(this.label1);
+            this.panel2.Controls.Add(this.tb_SearchClient);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(362, 70);
+            this.panel2.TabIndex = 3;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(7, 13);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "납품처명";
+            // 
+            // Check
+            // 
+            this.Check.HeaderText = "Y/N";
+            this.Check.Name = "Check";
+            this.Check.Width = 70;
+            // 
+            // ISBN
+            // 
+            this.ISBN.HeaderText = "ISBN";
+            this.ISBN.Name = "ISBN";
+            // 
+            // Book_name
+            // 
+            this.Book_name.HeaderText = "도서명";
+            this.Book_name.Name = "Book_name";
+            this.Book_name.Width = 140;
+            // 
+            // dataGridView1
+            // 
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Book_name,
+            this.ISBN,
+            this.Check});
+            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridView1.Location = new System.Drawing.Point(0, 0);
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.RowHeadersWidth = 31;
+            this.dataGridView1.RowTemplate.Height = 23;
+            this.dataGridView1.Size = new System.Drawing.Size(360, 642);
+            this.dataGridView1.TabIndex = 0;
+            this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
+            this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
+            // 
+            // panel3
+            // 
+            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel3.Controls.Add(this.dataGridView1);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel3.Location = new System.Drawing.Point(0, 70);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(362, 644);
+            this.panel3.TabIndex = 4;
+            // 
+            // panel1
+            // 
+            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Controls.Add(this.panel3);
+            this.panel1.Controls.Add(this.panel2);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(364, 716);
+            this.panel1.TabIndex = 3;
+            // 
+            // School_Lookup
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1283, 716);
+            this.Controls.Add(this.panel4);
+            this.Controls.Add(this.panel1);
+            this.Name = "School_Lookup";
+            this.Text = "DLS_조회/입력";
+            this.Load += new System.EventHandler(this.School_Lookup_Load);
+            this.panel7.ResumeLayout(false);
+            this.panel6.ResumeLayout(false);
+            this.panel6.PerformLayout();
+            this.panel4.ResumeLayout(false);
+            this.panel5.ResumeLayout(false);
+            this.panel5.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.panel3.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btn_Back;
+        private System.Windows.Forms.TextBox tb_URL;
+        private System.Windows.Forms.Panel panel7;
+        private System.Windows.Forms.WebBrowser webBrowser1;
+        private System.Windows.Forms.Panel panel6;
+        private System.Windows.Forms.Button btn_Forward;
+        private System.Windows.Forms.Button btn_Close;
+        private System.Windows.Forms.Panel panel4;
+        public System.Windows.Forms.Label lbl_ID;
+        public System.Windows.Forms.Label lbl_Client;
+        public System.Windows.Forms.TextBox tb_SearchClient;
+        private System.Windows.Forms.Button btn_Reflesh008;
+        private System.Windows.Forms.RadioButton rBtn_ISBN;
+        private System.Windows.Forms.RadioButton rBtn_BookName;
+        public System.Windows.Forms.Label lbl_PW;
+        public System.Windows.Forms.Label lbl_Area;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Button btn_Connect;
+        private System.Windows.Forms.Panel panel5;
+        private System.Windows.Forms.Button btn_Search;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Check;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ISBN;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Book_name;
+        private System.Windows.Forms.DataGridView dataGridView1;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Panel panel1;
+    }
+}

unimarc/unimarc/마크/DLS_Lookup.cs

@@ -0,0 +1,380 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using UniMarc.마크;
+
+namespace WindowsFormsApp1.DLS
+{
+    public partial class School_Lookup : Form
+    {
+        Main main;
+        public string compidx;
+        public School_Lookup(Main _main)
+        {
+            InitializeComponent();
+            main = _main;
+            compidx = main.com_idx;
+        }
+
+        #region SHDocVw
+        SHDocVw.WebBrowser nativeBrowser;
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            nativeBrowser = (SHDocVw.WebBrowser)webBrowser1.ActiveXInstance;
+            nativeBrowser.NewWindow2 += nativeBrowser_NewWindow2;
+        }
+
+        protected override void OnFormClosing(FormClosingEventArgs e)
+        {
+            nativeBrowser.NewWindow2 -= nativeBrowser_NewWindow2;
+            base.OnFormClosing(e);
+        }
+
+        void nativeBrowser_NewWindow2(ref object ppDisp, ref bool Cancel)
+        {
+            var popup = new DLS_Manage();
+            popup.Show(this);
+            ppDisp = popup.Browser.ActiveXInstance;
+        }
+        #endregion
+
+        private void School_Lookup_Load(object sender, EventArgs e)
+        {
+            webBrowser1.Navigate("https://reading.jnei.go.kr");
+        }
+
+        private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)
+        {
+            Skill_Grid sg = new Skill_Grid();
+            sg.Print_Grid_Num(sender, e);
+        }
+
+        private void dataGridView1_KeyDown(object sender, KeyEventArgs e)
+        {
+            Skill_Grid sg = new Skill_Grid();
+            sg.Excel_to_DataGridView(sender, e);
+        }
+
+        private void tb_SearchClient_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                // 검색 함수
+                ClientSearch();
+            }
+        }
+        #region KeyDown SUB
+
+        private void ClientSearch()
+        {
+            Delivery.Commodity_Search cs = new Delivery.Commodity_Search(this);
+            cs.Clinet_name = tb_SearchClient.Text;
+            cs.Show();
+        }
+        #endregion
+
+        private void btn_Connect_Click(object sender, EventArgs e)
+        {
+            if (lbl_Client.Text == "Client")
+            {
+                MessageBox.Show("납품처명을 선택해주세요");
+                return;
+            }
+            if (lbl_Area.Text == "")
+            {
+                MessageBox.Show("설정된 지역이 없습니다. 납품처 관리에서 확인해주세요.");
+                return;
+            }
+
+            string dlsArea = lbl_Area.Text;
+            string code = SetArea(dlsArea);
+            string url = "";
+
+            webBrowser1.Navigate("https://reading.jnei.go.kr");
+
+            Delay(4000);
+
+            HtmlElementCollection combo = webBrowser1.Document.GetElementsByTagName("option");
+            foreach (HtmlElement Select in combo)
+            {
+                if (Select.Id == code)
+                    url = Select.GetAttribute("value");
+            }
+            url = url.Replace("http", "https");
+
+            webBrowser1.Navigate(url + "/r/newReading/member/loginForm.jsp");
+            bool isWebComplite = false;
+
+            while (!isWebComplite)
+            {
+                Delay(1000);
+                if (tb_URL.Text.Contains("/r/newReading/member/loginForm.jsp"))
+                {
+                    isWebComplite = true;
+                    break;
+                }
+            }
+
+            Delay(5000);
+
+            if (isWebComplite)
+                DLS_Login(url);
+        }
+        #region Connect_SUB
+
+        private void DLS_Login(string url)
+        {
+            if (lbl_ID.Text == "" || lbl_PW.Text == "")
+            {
+                MessageBox.Show("ID 혹은 PW가 없습니다.");
+                return;
+            }
+            string ID = lbl_ID.Text;
+            string PW = lbl_PW.Text;
+
+            HtmlElementCollection input = webBrowser1.Document.GetElementsByTagName("input");
+            foreach (HtmlElement login in input)
+            {
+                if (login.Id == "s_id")
+                    login.SetAttribute("value", ID);
+                if (login.Id == "s_pwd")
+                    login.SetAttribute("value", PW);
+            }
+
+            HtmlElementCollection button = webBrowser1.Document.GetElementsByTagName("button");
+            foreach (HtmlElement SearchButton in button)
+            {
+                if (SearchButton.Id == "s_login")
+                    SearchButton.InvokeMember("click");
+            }
+
+            Delay(4000);
+            webBrowser1.Navigate(url + "/r/dls_new/bookInfo/collectionFormMA.jsp");
+        }
+        #endregion
+
+        private void btn_Search_Click(object sender, EventArgs e)
+        {
+
+            if (dataGridView1.Rows[0].Cells["ISBN"].Value == null && rBtn_ISBN.Checked)
+            {
+                MessageBox.Show("ISBN이 입력되지않았습니다!");
+                return;
+            }
+            if (dataGridView1.Rows[0].Cells["Book_name"].Value == null && rBtn_BookName.Checked)
+            {
+                MessageBox.Show("도서명이 입력되지않았습니다!");
+                return;
+            }
+
+            bool isISBN = rBtn_ISBN.Checked;
+            if (!SearchCopy(isISBN))
+                return;
+
+            MessageBox.Show("완료되었습니다.");
+        }
+        #region SearchClick_Sub
+
+        private bool SearchCopy(bool isISBN)
+        {
+            if (!webBrowser1.Url.AbsoluteUri.Contains("collectionFormMA"))
+            {
+                MessageBox.Show("자료관리 창이 아닙니다!");
+                return false;
+            }
+
+            int count = dataGridView1.Rows.Count;
+
+            for (int a = 0; a < count; a++)
+            {
+                string Check = "";
+                if (isISBN)
+                {
+                    string Target = dataGridView1.Rows[a].Cells["ISBN"].Value.ToString();
+                    Check = SearchISBN(Target);
+                }
+                else
+                {
+                    string Target = dataGridView1.Rows[a].Cells["Book_name"].Value.ToString();
+                    Check = SearchName(Target);
+                }
+                dataGridView1.Rows[a].Cells["Check"].Value = Check;
+            }
+            return true;
+        }
+        /// <summary>
+        /// 도서명 필터로 DLS복본 검색
+        /// </summary>
+        /// <param name="Target">도서명</param>
+        /// <param name="row">행 번호</param>
+        private string SearchName(string Target)
+        {
+            HtmlElementCollection search = webBrowser1.Document.GetElementsByTagName("input");
+            foreach (HtmlElement Search in search)
+            {
+                if (Search.Id == "bib1")
+                    Search.SetAttribute("value", Target);
+
+                if (Search.GetAttribute("className") == "button_search")
+                    Search.InvokeMember("click");
+            }
+            Delay(5000);
+
+            string InnerText = "";
+
+            HtmlElementCollection paging_nav = webBrowser1.Document.GetElementsByTagName("div");
+            foreach (HtmlElement div in paging_nav)
+            {
+                if (div.GetAttribute("className") == "paging_nav")
+                {
+                    HtmlElementCollection span = div.GetElementsByTagName("span");
+                    foreach (HtmlElement count in span)
+                    {
+                        InnerText = count.InnerText;
+                        break;
+                    }
+                }
+            }
+
+            return InnerText;
+        }
+        /// <summary>
+        /// ISBN 필터로 DLS복본 검색
+        /// </summary>
+        /// <param name="Target">ISBN</param>
+        /// <param name="row">행 번호</param>
+        private string SearchISBN(string Target)
+        {
+            HtmlElementCollection combo = webBrowser1.Document.GetElementsByTagName("select");
+            foreach (HtmlElement Search in combo)
+            {
+                if (Search.Id == "bibKind2")
+                    Search.SetAttribute("selectedIndex", "2");
+            }
+
+            HtmlElementCollection search = webBrowser1.Document.GetElementsByTagName("input");
+            foreach (HtmlElement Search in search)
+            {
+                if (Search.Id == "bib2")
+                    Search.SetAttribute("value", Target);
+
+                if (Search.GetAttribute("className") == "button_search")
+                    Search.InvokeMember("click");
+            }
+            Delay(5000);
+
+            string InnerText = "";
+
+            HtmlElementCollection paging_nav = webBrowser1.Document.GetElementsByTagName("div");
+            foreach (HtmlElement div in paging_nav)
+            {
+                if (div.GetAttribute("className") == "paging_nav")
+                {
+                    HtmlElementCollection span = div.GetElementsByTagName("span");
+                    foreach (HtmlElement count in span)
+                    {
+                        InnerText = count.InnerText;
+                        break;
+                    }
+                }
+            }
+
+            return InnerText;
+        }
+        #endregion
+
+        /// <summary>
+        /// DLS지역 코드 변환
+        /// </summary>
+        /// <returns>코드</returns>
+        string SetArea(string dlsArea)
+        {
+            string[] Area = {
+                "서울", "부산", "대구", "인천", "광주",
+                "대전", "울산", "세종", "경기", "강원",
+                "충북", "충남", "전북", "전남", "경북",
+                "경남", "제주"
+            };
+
+            string[] Code = {
+                "SU", "BS", "DG", "IC", "KJ",
+                "DJ", "US", "SJ", "KG", "KW",
+                "CB", "CN", "JB", "JN", "KB",
+                "KN", "JJ"
+            };
+
+            int idx = 0;
+            foreach (string code in Area)
+            {
+                if (code == dlsArea)
+                {
+                    break;
+                }
+                idx++;
+            }
+
+            return Code[idx];
+        }
+
+        /// <summary>
+        /// 지연시키는 함수
+        /// </summary>
+        /// <param name="ms">1000 = 1초</param>
+        void Delay(int ms)
+        {
+            DateTime dateTimeNow = DateTime.Now;
+            TimeSpan duration = new TimeSpan(0, 0, 0, 0, ms);
+            DateTime dateTimeAdd = dateTimeNow.Add(duration);
+            while (dateTimeAdd >= dateTimeNow)
+            {
+                Application.DoEvents();
+                dateTimeNow = DateTime.Now;
+            }
+            return;
+        }
+
+        private void btn_Close_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btn_Back_Click(object sender, EventArgs e)
+        {
+            webBrowser1.GoBack();
+        }
+
+        private void btn_Forward_Click(object sender, EventArgs e)
+        {
+            webBrowser1.GoForward();
+        }
+
+        private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
+        {
+            tb_URL.Text = webBrowser1.Url.AbsoluteUri;
+        }
+
+        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_Reflesh008_Click(object sender, EventArgs e)
+        {
+            for (int a = 0; a < dataGridView1.Rows.Count; a++)
+            {
+                dataGridView1.Rows[a].Cells["Check"].Value = "";
+            }
+        }
+    }
+}

unimarc/unimarc/마크/DLS_Lookup.resx

@@ -117,4 +117,52 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btn_Reflesh008.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAOEAAADhCAMAAAAJbSJIAAAABGdBTUEAALGPC/xhBQAAAIFQTFRF////
+        AAAAlJSU4ODgU1NT6enp+Pj4w8PDxMTEkpKS/Pz81tbW5eXlRERE3NzcmZmZzMzMZGRkTU1Nb29vg4OD
+        urq6KioqW1tb8vLyf39/sbGxEhISPz8/i4uL0NDQZmZmIyMjoqKiNTU1tLS0GRkZp6end3d3Li4uOjo6
+        Dg4OJSUlLUB5vgAABwxJREFUeF7tnX97ojAMx6ceIqDi/DXndJ47vZt7/y/wFOMUSKG0SWE8+fxz9zxl
+        ZN8BaZq26ZMgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCELrWHnDsb8+7uNuvD+u/fHQW0GLOT34t276kb99
+        nn51siynu60f9eEqA7Zb+E+d9P1g9AaKcN42gR/C1dUIOl34X12E43gDMsrYxGP4IX26nZoVRtt/8Ovr
+        8bmtJvIssE6Fq/3n9feuxOao73wuAutTGD0nv7AJM80HmQisS6E/TaybMh3AfYq4CqxH4ULXuagp1wgC
+        61A4MPn88kzf4X44N4HuFQ5/gWV7dh7cE+FboGuF/S3YpSFWhQF3gY4VTqp1f+V8RnDnNA8C3Sr8C0Yp
+        wcLOR4EuFUYnsEnLMjd4SAl0qDAGi/SswQKQFuhMYWgewpTzF4wkZAS6Ujj8DfZ4+LzHqlmBjhROwBob
+        p1uomhPoRuEajJUzms3jtT+JxtHEP3bnM/3w7hrF5QU6UbgHW8V8BAsvl60I+8M/2w+4opjF+XJEoAuF
+        mNkMy3lhIB0uZhrf8RG3xK8wAEtKvrZ4YJJmMitO5ZzB3TW7wrIn+OLrJtJWa73XNQO3wpJvcFYtmzkY
+        wc9VgFnhHzCDMysY/iiYVNbIq/AdrKC8VE8OXlhUHJ+wKvTACMZJJ9WCEpb6rhScCsN8kv6bV7MU9pVe
+        lTwPp8IZ2MhzmMAlpmj0sTcYFard6LP9jNKktHe8wadwDBbyBHCFFStdp8qnUBlnGbuYDJo5ETaFr2Ag
+        y5tOiKaHnk/lUqjqCQ9DuIACrUELk8JQEUIe7H3MI8Uh0xUmhQpvTixQK7vFo1ARzLxRvqJntHpFHoU7
+        uHsGOieToNftsyhUuBkfmonQjGtYFOLTn8SmdAM3DoV47vAZWonQFciiEH2ExG5UWyCHQvwR2o4m0ugL
+        5FD4ArdO8QqNNFQQyKCwB3dOcbIZ8OaoIpBBIRryU40nEioJpFfYhxuneIFGEqoJpFeIzsKYZdVwKgqk
+        V4h1FTNoo6CqQHKFqJ+pnvhVUi2TeIFaITaeIXyElZ8gvUIsP0S30tpAILVCbGBI50hNBFIrPMJtHyEb
+        NBkJpFaIRGxLi4X2KcwEUiuEuz5CtRvAUCCxQmxwT5S6MBVIrBD5DP9BkyXGAokVIp/hHJrsMBdIrBCZ
+        qyAZVVSPZO6QKhzCTR+BJitsBNIqRBzNBppssHhFz5AqRBwNwVyhnUBahcjw/rLazA6rV/QMqULElVoP
+        nGwF0sw430AGFrYhWzjuWUKZp10dQNadETS1BGToRJm/aABId0gT0TQGJEcTQ1NLQCYsMlshfjoLkPUA
+        8aRo3SAKaWecagdJdxPP3NcNEpZSpvMbQPufYfu/w/b70vb3h+2Padofl7Z/bNH+8SHHGL9hcORpmgVL
+        rq1R8ORLmwRTzrtBcM1bNAiuuafmwDZ/2BgQV7OEppbAOI/fFEDVI+5e02D6Kwc00YFs+idbT1PGCqnw
+        k6rrQgLyITob52PbvOhDKt51bcVgiwYZ3h9sAa2bKrARWHuEeBdLAvP60gKQvpglTcS9RliJO8Pc67xV
+        YKVbdtBGC/tafRx0QyBPTMy/3wIFqzd5gjZq0D0z3H0ikm7nS9Zig0TifU850BenQ7yt+g7mton3rmVB
+        3xv6iO2Gi/2HaQZgIw1joOFiD+kjWMjN1VVccbIP+AH0s+DtodCHyJZYxAv3cj5CRffL1WWgHUWnQ1y+
+        IYubmgoJir8md2ZBURfjRP+HRQPuM+yJBcXKZXKH6inKRfHProeKuuvEEhXvSmcK7ZwoPg/aAi69/JTs
+        FSdZBQd1opTlsx2tj1DW+qLqNHy4Xw5X813qem00+wPUi/idzTuz1txb4aHaBYfTzuq6iW+2I42Jysdw
+        j9MyLMEoglXty1Dlxs64Xd+i6q4unMwdjl9wBMHB8fIWVa+YYFiDdqz+As84X7JLXkfYQxMW39Qwp05b
+        C7qndl4JtazeKds9qF/PO/QL388zR7jSMaXb677mOoFcNC+tAb2HS52jsQe0pK7+02Be0PHcqOkJXtAq
+        M9r5xM5GeOp7i0Cv8nOtC64rnW/RPSbnW7z763g+0y0WXPua+cJ+kYTa17R4BcXLCfjgSzdrEyrSbyQ0
+        ZDU533lPNTrRNJF6xGPD7ybtHiuOKc1wOhwsh/zsvI/GbR0jPv8w4J1aNmNYFj7r88I8+2LMwP6c1Quj
+        Ju9tJDhLdtT0jRy+fsCJMao5CtXC5kznn7Kw2tubvKyb+EdtpYo0z8W7sdRKBzSLcBzrfpIf8biJ3Z8O
+        fT8YFR/9c9gE2gmrptKP/O3zNJ+N+Zrutovop6u7s/KG48H6uI+78X6/9qOh14ChrSAIgiAIgiAIgiAI
+        giAIgiAIgiAIgiAIAilPT/8BzuZT5uV+S2QAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="Check.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ISBN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Book_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

unimarc/unimarc/마크/Input_DLS.cs

@@ -46,8 +46,18 @@ namespace WindowsFormsApp1.DLS
         private void Input_DLS_Load(object sender, EventArgs e)
         {
             webBrowser1.Navigate("https://reading.jnei.go.kr/r/newReading/member/loginForm.jsp");
+        }
+
+        private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
+        {
+            tb_URL.Text = webBrowser1.Url.AbsoluteUri;
+            this.Text = webBrowser1.DocumentText;
+
+            if (tb_URL.Text.Contains("loginForm"))
+            {
                 Load_Search();
             }
+        }
 
         private void Load_Search()
         {
@@ -71,12 +81,6 @@ namespace WindowsFormsApp1.DLS
             webBrowser1.Navigate("https://reading.jnei.go.kr/r/dls_new/loan/loan.jsp");
         }
 
-        private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
-        {
-            tb_URL.Text = webBrowser1.Url.AbsoluteUri;
-            this.Text = webBrowser1.DocumentText;
-        }
-
         private void btn_Back_Click(object sender, EventArgs e)
         {
             webBrowser1.GoBack();

unimarc/unimarc/마크/Marc.cs

@@ -77,6 +77,8 @@ namespace ExcelTest
             comboBox6.SelectedIndex = 0;
             comboBox7.SelectedIndex = 0;
             comboBox8.SelectedIndex = 0;
+
+
             #endregion
             compidx = UniMarc.Properties.Settings.Default.compidx;
         }
@@ -92,6 +94,8 @@ namespace ExcelTest
             string[] sear_tbl = { "date", "list_name" };
             string[] sear_col = { date, value };
 
+            lbl_BookList.Text = value;
+
             string cmd = db.More_DB_Search("Obj_List_Book", sear_tbl, sear_col, Area);
             string db_res = db.DB_Send_CMD_Search(cmd);
             string[] db_data = db_res.Split('|');
@@ -564,7 +568,7 @@ namespace ExcelTest
         {
             String_Text st = new String_Text();
             string[] SearchTag = {
-                "056a", "0562", "245a", "245d", "260a", "260b", "260c", "300a", "300b", "300c", "653a"
+                "056a", "0562", "245a", "245d", "260a", "260b", "260c", "300a", "300c", "653a"
             };
 
             string[] Tag = st.Take_Tag(orimarc, SearchTag);
@@ -616,7 +620,7 @@ namespace ExcelTest
             string marc = richTextBox1.Text;
             string[] temp = marc.Split('\n');
             List<string> target = temp.ToList();
-
+            btn_Reflesh008_Click(null, null);
             bool isEight = false;
             bool eight_chk = false;
             string tag056 = string.Empty;
@@ -713,6 +717,7 @@ namespace ExcelTest
             string cmd = db.More_DB_Search("Marc", sear_tbl, sear_col, "`비고1`, `비고2`");
             string res = db.DB_Send_CMD_Search(cmd);
 
+            lbl_ISBN.Text = "[" + List_Book.Rows[row].Cells["ISBN13"].Value.ToString() + "]";
             string[] ary = res.Split('|');
             etc1.Text = ary[0];
             etc2.Text = ary[1];
@@ -1327,6 +1332,13 @@ namespace ExcelTest
             int row = List_Book.CurrentRow.Index;
             string ISBN = List_Book.Rows[row].Cells["ISBN13"].Value.ToString();
 
+            if (ISBN == "" || ISBN == null)
+            {
+                MessageBox.Show("ISBN이 존재하지않습니다!");
+                return;
+            }
+
+
             UniMarc.Marc_FillBlank fb = new UniMarc.Marc_FillBlank(this);
             fb.ISBN = ISBN;
             fb.Show();
@@ -1335,7 +1347,6 @@ namespace ExcelTest
         private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
         {
             int TabIndex = tabControl1.SelectedIndex;
-            label4.Text = TabIndex.ToString();
 
             // 종단기호 제거
             string Text = richTextBox1.Text.Replace("▲", "");
@@ -1394,6 +1405,11 @@ namespace ExcelTest
             foreach (DataGridView grid in dgv)
             {
                 grid.Rows.Clear();
+
+                grid.Rows.Add(50);
+
+                if (grid.Name.IndexOf("505") > 0)
+                    grid.Rows.Add(50);
             }
         }
 
@@ -1422,6 +1438,7 @@ namespace ExcelTest
             if (TagNum == "500") InputOneTextBox(text500a, GetMiddelString(Marc, "▼a", "▼"));
             if (TagNum == "504") InputOneTextBox(text504a, GetMiddelString(Marc, "▼a", "▼"));
             if (TagNum == "505") InputOneTextBox(text505a, GetMiddelString(Marc, "▼a", "▼"));
+            if (TagNum == "505") Grid505(Marc);
             if (TagNum == "507") Text507(Marc);
             if (TagNum == "520") InputOneTextBox(text520a, GetMiddelString(Marc, "▼a", "▼"));
             if (TagNum == "521") InputOneTextBox(text521a, GetMiddelString(Marc, "▼a", "▼"));
@@ -1453,7 +1470,22 @@ namespace ExcelTest
             if (a.Contains("세트"))
                 Grid[0] = true;
 
-            GridView020.Rows.Add(Grid);
+            for (int count = 0; count < GridView020.Rows.Count; count++)
+            {
+                if (GridView020.Rows[count].Cells["CheckSet"].Value == null && 
+                    GridView020.Rows[count].Cells["Text020a"].Value == null &&
+                    GridView020.Rows[count].Cells["Text020g"].Value == null &&
+                    GridView020.Rows[count].Cells["Text020c"].Value == null) {
+
+                    GridView020.Rows[count].Cells["CheckSet"].Value = Grid[0];
+                    GridView020.Rows[count].Cells["Text020a"].Value = Grid[1];
+                    GridView020.Rows[count].Cells["Text020g"].Value = Grid[2];
+                    GridView020.Rows[count].Cells["Text020c"].Value = Grid[3];
+                    break;
+                }
+            }
+
+            //GridView020.Rows.Add(Grid);
         }
 
         /// <summary>
@@ -1469,8 +1501,27 @@ namespace ExcelTest
             string p = GetMiddelString(SplitTag, "▼p", "▼");
 
             object[] Grid = { Jisi, i, a, b, n, p };
+            for (int count = 0; count < GridView246.Rows.Count; count++)
+            {
+                if (GridView246.Rows[count].Cells["Text246Jisi"].Value == null &&
+                    GridView246.Rows[count].Cells["Text246i"].Value == null &&
+                    GridView246.Rows[count].Cells["Text246a"].Value == null &&
+                    GridView246.Rows[count].Cells["Text246b"].Value == null &&
+                    GridView246.Rows[count].Cells["Text246n"].Value == null &&
+                    GridView246.Rows[count].Cells["Text246p"].Value == null)
+                {
 
-            GridView246.Rows.Add(Grid);
+                    GridView246.Rows[count].Cells["Text246Jisi"].Value = Grid[0];
+                    GridView246.Rows[count].Cells["Text246i"].Value = Grid[1];
+                    GridView246.Rows[count].Cells["Text246a"].Value = Grid[2];
+                    GridView246.Rows[count].Cells["Text246b"].Value = Grid[3];
+                    GridView246.Rows[count].Cells["Text246n"].Value = Grid[4];
+                    GridView246.Rows[count].Cells["Text246p"].Value = Grid[5];
+                    break;
+                }
+            }
+
+            //GridView246.Rows.Add(Grid);
         }
 
         /// <summary>
@@ -1489,8 +1540,27 @@ namespace ExcelTest
             // string vTxt = System.Text.RegularExpressions.Regex.Replace(v, @"\d", "");
 
             object[] Grid = { a, n, p, v, "", x };
+            for (int count = 0; count < GridView440.Rows.Count; count++)
+            {
+                if (GridView440.Rows[count].Cells["text440a"].Value == null &&
+                    GridView440.Rows[count].Cells["text440n"].Value == null &&
+                    GridView440.Rows[count].Cells["text440p"].Value == null &&
+                    GridView440.Rows[count].Cells["text440vNum"].Value == null &&
+                    GridView440.Rows[count].Cells["text440vTxt"].Value == null &&
+                    GridView440.Rows[count].Cells["text440x"].Value == null)
+                {
                     
-            GridView440.Rows.Add(Grid);
+                    GridView440.Rows[count].Cells["text440a"].Value = Grid[0];
+                    GridView440.Rows[count].Cells["text440n"].Value = Grid[1];
+                    GridView440.Rows[count].Cells["text440p"].Value = Grid[2];
+                    GridView440.Rows[count].Cells["text440vNum"].Value = Grid[3];
+                    GridView440.Rows[count].Cells["text440vTxt"].Value = Grid[4];
+                    GridView440.Rows[count].Cells["text440x"].Value = Grid[5];
+                    break;
+                }
+            }
+
+            //GridView440.Rows.Add(Grid);
         }
 
         /// <summary>
@@ -1503,8 +1573,19 @@ namespace ExcelTest
             string v = GetMiddelString(SplitTag, "▼v", "▼");
 
             object[] Grid = { a, v };
+            for (int count = 0; count < GridView490.Rows.Count; count++)
+            {
+                if (GridView490.Rows[count].Cells["text490a"].Value == null &&
+                    GridView490.Rows[count].Cells["text490v"].Value == null)
+                {
 
-            GridView490.Rows.Add(Grid);
+                    GridView490.Rows[count].Cells["text490a"].Value = Grid[0];
+                    GridView490.Rows[count].Cells["text490v"].Value = Grid[1];
+                    break;
+                }
+            }
+
+            //GridView490.Rows.Add(Grid);
         }
 
         /// <summary>
@@ -1520,8 +1601,23 @@ namespace ExcelTest
             string e = GetMiddelString(SplitTag, "▼e", "▼");
 
             object[] Grid = { n, t, d, e };
+            for (int count = 0; count < GridView505.Rows.Count; count++)
+            {
+                if (GridView505.Rows[count].Cells["text505n"].Value == null &&
+                    GridView505.Rows[count].Cells["text505t"].Value == null &&
+                    GridView505.Rows[count].Cells["text505d"].Value == null &&
+                    GridView505.Rows[count].Cells["text505e"].Value == null)
+                {
 
-            GridView505.Rows.Add(Grid);
+                    GridView505.Rows[count].Cells["text505n"].Value = Grid[0];
+                    GridView505.Rows[count].Cells["text505t"].Value = Grid[1];
+                    GridView505.Rows[count].Cells["text505d"].Value = Grid[2];
+                    GridView505.Rows[count].Cells["text505e"].Value = Grid[3];
+                    break;
+                }
+            }
+
+            //GridView505.Rows.Add(Grid);
             text505a.Text = a;
         }
         #endregion
@@ -1685,17 +1781,17 @@ namespace ExcelTest
                 text300a, text300b, text300c1, text300c2, text300e
             };
 
-            string a = GetMiddelString(SplitTag, "▼a", "▼");
+            string a = GetMiddelString(SplitTag, "▼a", "▼", "300");
-            string b = GetMiddelString(SplitTag, "▼b", "▼");
+            string b = GetMiddelString(SplitTag, "▼b", "▼", "300");
             string c = GetMiddelString(SplitTag, "▼c", "▼");
             string e = GetMiddelString(SplitTag, "▼e", "▼");
 
             string[] size = { "", "" };
             string[] size_tmp = c.ToUpper().Split('X');
 
-            size[0] = System.Text.RegularExpressions.Regex.Replace(size_tmp[0], @"[^0-9]", "");
+            size[0] = Regex.Replace(size_tmp[0], @"[^0-9]", "");
             if (size_tmp.Length > 1)
-                size[1] = System.Text.RegularExpressions.Regex.Replace(size_tmp[1], @"[^0-9]", "");
+                size[1] = Regex.Replace(size_tmp[1], @"[^0-9]", "");
 
             string[] Marc = { a, b, size[0], size[1], e };
 
@@ -1825,6 +1921,16 @@ namespace ExcelTest
 
         string TrimEndGubun(string str, string TagNum)
         {
+            
+            if (TagNum == "300")
+            {
+                str = str.Trim();
+                if (str.Contains("ill."))
+                    return str;
+                if (str.Contains("p."))
+                    return str;
+            }
+
             if (TagNum == "710" || TagNum == "910")
                 return str;
 
@@ -1832,6 +1938,7 @@ namespace ExcelTest
 
             foreach (char gubun in gu)
             {
+                if (str.Length < 1) continue;
                 if (str[str.Length - 1] == gubun)
                 {
                     str = str.Remove(str.Length - 1);
@@ -1918,6 +2025,7 @@ namespace ExcelTest
 
 
             int count = 0;
+
             foreach (string Data in aryText)
             {
                 string[] grid = { count.ToString() };
@@ -1930,6 +2038,7 @@ namespace ExcelTest
                     Array.Resize(ref grid, grid.Length + 1);
                     grid[grid.Length - 1] = tt;
                 }
+
                 dataGridView1.Rows.Add(grid);
                 count++;
             }
@@ -1945,18 +2054,14 @@ namespace ExcelTest
                 string jisi = dataGridView1.Rows[a].Cells["jisi"].Value.ToString();
                 string marc = dataGridView1.Rows[a].Cells["MarcValue"].Value.ToString();
 
-                if (tag == "100" && !isAuthor ||
+                if (tag != "100")
-                    tag == "110" && !isAuthor ||
-                    tag == "111" && !isAuthor)
-                {
-                    richTextBox1.Text += string.Format("{0}\t{1}\t{2}\n", tag, jisi, marc);
-                    isAuthor = true;
-                }
-                else
                     isAuthor = false;
 
-                if(!isAuthor)
+                if (!isAuthor)
                     richTextBox1.Text += string.Format("{0}\t{1}\t{2}\n", tag, jisi, marc);
+
+                if (tag == "100")
+                    isAuthor = true;
             }
         }
 
@@ -2011,12 +2116,13 @@ namespace ExcelTest
                 }
 
                 if (isGrid)
-                {
                     LineMarc.Add(GridMarc(TagNum));
-                }
+
                 if (isText)
+                {
                     LineMarc.Add(TextMarc(TagNum));
                 }
+            }
 
             return LineMarc;
         }
@@ -2055,13 +2161,32 @@ namespace ExcelTest
 
             for (int a = 0; a < count; a++)
             {
-                if (dgv.Rows[a].Cells["Text020a"].Value.ToString() == "" || dgv.Rows[a].Cells["Text020a"].Value == null)
+                if (dgv.Rows[a].Cells["Text020a"].Value == null)
                     break;
 
-                string CheckSet = dgv.Rows[a].Cells["CheckSet"].Value.ToString();
+                string CheckSet;
-                string a020 = dgv.Rows[a].Cells["Text020a"].Value.ToString();
+                if (dgv.Rows[a].Cells["CheckSet"].Value == null)
-                string g020 = dgv.Rows[a].Cells["Text020g"].Value.ToString();
+                    CheckSet = "";
-                string c020 = dgv.Rows[a].Cells["Text020c"].Value.ToString();
+                else
+                    CheckSet = dgv.Rows[a].Cells["CheckSet"].Value.ToString();
+
+                string a020;
+                if (dgv.Rows[a].Cells["Text020a"].Value == null)
+                    a020 = "";
+                else
+                    a020 = dgv.Rows[a].Cells["Text020a"].Value.ToString();
+
+                string g020;
+                if (dgv.Rows[a].Cells["Text020g"].Value == null)
+                    g020 = "";
+                else
+                    g020 = dgv.Rows[a].Cells["Text020g"].Value.ToString();
+
+                string c020;
+                if (dgv.Rows[a].Cells["Text020c"].Value == null)
+                    c020 = "";
+                else
+                    c020 = dgv.Rows[a].Cells["Text020c"].Value.ToString();
 
                 result += string.Format("020\t{0}\t▼a{1}", Insert020Sub(CheckSet), a020);
 
@@ -2084,15 +2209,45 @@ namespace ExcelTest
 
             for (int a = 0; a < count; a++)
             {
-                if (dgv.Rows[a].Cells[0].Value.ToString() == "" || dgv.Rows[a].Cells[0].Value == null)
+                if (dgv.Rows[a].Cells[0].Value == null)
                     break;
 
-                string Jisi = dgv.Rows[a].Cells["Text246Jisi"].Value.ToString();
+                string Jisi;
-                string a246 = dgv.Rows[a].Cells["Text246a"].Value.ToString();
+                if (dgv.Rows[a].Cells["Text246Jisi"].Value == null)
-                string b246 = dgv.Rows[a].Cells["Text246b"].Value.ToString();
+                    Jisi = "";
-                string i246 = dgv.Rows[a].Cells["Text246i"].Value.ToString();
+                else
-                string n246 = dgv.Rows[a].Cells["Text246n"].Value.ToString();
+                    Jisi = dgv.Rows[a].Cells["Text246Jisi"].Value.ToString();
-                string p246 = dgv.Rows[a].Cells["Text246p"].Value.ToString();
+
+                string a246;
+                if (dgv.Rows[a].Cells["Text246a"].Value == null)
+                    a246 = "";
+                else
+                    a246 = dgv.Rows[a].Cells["Text246a"].Value.ToString();
+
+                string b246;
+                if (dgv.Rows[a].Cells["Text246b"].Value == null)
+                    b246 = "";
+                else
+                    b246 = dgv.Rows[a].Cells["Text246b"].Value.ToString();
+
+                string i246;
+                if (dgv.Rows[a].Cells["Text246i"].Value == null)
+                    i246 = "";
+                else
+                    i246 = dgv.Rows[a].Cells["Text246i"].Value.ToString();
+
+                string n246;
+                if (dgv.Rows[a].Cells["Text246n"].Value == null)
+                    n246 = "";
+                else
+                    n246 = dgv.Rows[a].Cells["Text246n"].Value.ToString();
+
+                string p246;
+                if (dgv.Rows[a].Cells["Text246p"].Value == null)
+                    p246 = "";
+                else
+                    p246 = dgv.Rows[a].Cells["Text246p"].Value.ToString();
+
 
                 result += string.Format("246\t{0}\t▼a{1}", Jisi, a246);
 
@@ -2113,7 +2268,7 @@ namespace ExcelTest
 
             for (int a = 0; a < count; a++)
             {
-                if (dgv.Rows[a].Cells[0].Value.ToString() == "" || dgv.Rows[a].Cells[0].Value == null)
+                if (dgv.Rows[a].Cells[0].Value == null)
                     break;
                 
                 for (int b = 0; b < dgv.ColumnCount; b++)
@@ -2122,12 +2277,42 @@ namespace ExcelTest
                         dgv.Rows[a].Cells[b].Value = "";
                 }
 
-                string a440 = dgv.Rows[a].Cells["text440a"].Value.ToString();
+                string a440;
-                string n440 = dgv.Rows[a].Cells["text440n"].Value.ToString();
+                if (dgv.Rows[a].Cells["text440a"].Value == null)
-                string p440 = dgv.Rows[a].Cells["text440p"].Value.ToString();
+                    a440 = "";
-                string v440Num = dgv.Rows[a].Cells["text440vNum"].Value.ToString();
+                else
-                string v440Txt = dgv.Rows[a].Cells["text440vTxt"].Value.ToString();
+                    a440 = dgv.Rows[a].Cells["text440a"].Value.ToString();
-                string x440 = dgv.Rows[a].Cells["text440x"].Value.ToString();
+
+                string n440;
+                if (dgv.Rows[a].Cells["text440n"].Value == null)
+                    n440 = "";
+                else
+                    n440 = dgv.Rows[a].Cells["text440n"].Value.ToString();
+
+                string p440;
+                if (dgv.Rows[a].Cells["text440p"].Value == null)
+                    p440 = "";
+                else
+                    p440 = dgv.Rows[a].Cells["text440p"].Value.ToString();
+
+                string v440Num;
+                if (dgv.Rows[a].Cells["text440vNum"].Value == null)
+                    v440Num = "";
+                else
+                    v440Num = dgv.Rows[a].Cells["text440vNum"].Value.ToString();
+
+                string v440Txt;
+                if (dgv.Rows[a].Cells["text440vTxt"].Value == null)
+                    v440Txt = "";
+                else
+                    v440Txt = dgv.Rows[a].Cells["text440vTxt"].Value.ToString();
+
+                string x440;
+                if (dgv.Rows[a].Cells["text440x"].Value == null)
+                    x440 = "";
+                else
+                    x440 = dgv.Rows[a].Cells["text440x"].Value.ToString();
+
 
                 result += string.Format("440\t  \t▼a{0}", a440);
 
@@ -2149,11 +2334,21 @@ namespace ExcelTest
 
             for (int a = 0; a < count; a++)
             {
-                if (dgv.Rows[a].Cells[0].Value.ToString() == "" || dgv.Rows[a].Cells[0].Value == null)
+                if (dgv.Rows[a].Cells[0].Value == null)
                     break;
 
-                string a490 = dgv.Rows[a].Cells["text490a"].Value.ToString();
+                string a490;
-                string v490 = dgv.Rows[a].Cells["text490v"].Value.ToString();
+                if (dgv.Rows[a].Cells["text490a"].Value == null)
+                    a490 = "";
+                else
+                    a490 = dgv.Rows[a].Cells["text490a"].Value.ToString();
+
+                string v490;
+                if (dgv.Rows[a].Cells["text490v"].Value == null)
+                    v490 = "";
+                else
+                    v490 = dgv.Rows[a].Cells["text490v"].Value.ToString();
+
 
                 result += string.Format("490\t  \t▼a{0}", a490);
 
@@ -2172,13 +2367,37 @@ namespace ExcelTest
 
             for (int a = 0; a < count; a++)
             {
-                if (dgv.Rows[a].Cells[0].Value.ToString() == "" || dgv.Rows[a].Cells[0].Value == null)
+                if (dgv.Rows[a].Cells[0].Value == null)
                     break;
 
-                string n505 = dgv.Rows[a].Cells["text505n"].Value.ToString();
+                string n505;
-                string t505 = dgv.Rows[a].Cells["text505t"].Value.ToString();
+                if (dgv.Rows[a].Cells["text505n"].Value == null)
-                string d505 = dgv.Rows[a].Cells["text505d"].Value.ToString();
+                    n505 = "";
-                string e505 = dgv.Rows[a].Cells["text505e"].Value.ToString();
+                else
+                    n505 = dgv.Rows[a].Cells["text505n"].Value.ToString();
+
+
+                string t505;
+                if (dgv.Rows[a].Cells["text505t"].Value == null)
+                    t505 = "";
+                else
+                    t505 = dgv.Rows[a].Cells["text505t"].Value.ToString();
+
+
+                string d505;
+                if (dgv.Rows[a].Cells["text505d"].Value == null)
+                    d505 = "";
+                else
+                    d505 = dgv.Rows[a].Cells["text505d"].Value.ToString();
+
+
+                string e505;
+                if (dgv.Rows[a].Cells["text505e"].Value == null)
+                    e505 = "";
+                else
+                    e505 = dgv.Rows[a].Cells["text505e"].Value.ToString();
+
+
 
                 result += string.Format("505\t 0\t▼n{0}", n505);
 
@@ -2337,7 +2556,12 @@ namespace ExcelTest
             string result = "245\t  \t";
 
             if (boxText[0] != "") result += "▼a" + boxText[0];
-            if (boxText[3] != "") result += "▼b" + boxText[3];
+            if (boxText[3] != "") {
+                string[] splitText245b = boxText[3].Split('▽');
+                foreach (string text in splitText245b)
+                    result += "▼b" + text;
+
+            }
             if (boxText[1] != "") result += "▼n" + boxText[1];
             if (boxText[2] != "") result += "▼p" + boxText[2];
             if (boxText[4] != "") result += "▼x" + boxText[4];
@@ -2401,8 +2625,11 @@ namespace ExcelTest
 
             if (boxText[0] != "") result += "▼a" + boxText[0];
             if (boxText[1] != "") result += "▼b" + boxText[1];
-            if (boxText[2] != "") result += "▼c" + boxText[2];
+            if (boxText[2] != "") {
-            if (boxText[3] != "") result += " x " + boxText[3];
+                result += "▼c" + boxText[2];
+                if (boxText[3] == "") result += "cm";
+            }
+            if (boxText[3] != "") result += " x " + boxText[3] + "cm";
             if (boxText[4] != "") result += "▼e" + boxText[4];
 
             result += "▲";
@@ -2614,14 +2841,9 @@ namespace ExcelTest
             if (!isText)
                 return "";
 
-            string[] splitText = boxText.Split('▽');
+            string result = string.Format("653\t  \t▼a{0}", boxText.Replace("▽", "▼a"));
 
-            string result = "";
+            result += "▲";
-
-            foreach (string text in splitText)
-            {
-                result += string.Format("653\t  \t▼a{0}▲\n", text);
-            }
 
             return result;
         }
@@ -2767,5 +2989,149 @@ namespace ExcelTest
         #endregion
 
         #endregion
+
+        private void Btn_interlock_Click(object sender, EventArgs e)
+        {
+            // 언어 36
+            string[] combo6 = {
+                "한국어", "영어", "일본어", "중국어", "독일어",
+                "프랑스어", "러시아어", "스페인어", "이탈리아어", "네덜란드어",
+                "핀란드어", "스웨덴어", "포르투갈어", "노르웨이어", "그리스어",
+                "체코어", "폴란드어", "다국어", "말레이시아어", "몽골어",
+                "버마어", "베트남어", "슬로베니아어", "아랍어", "아프리카어",
+                "에스토니아어", "우즈베키스탄어", "우크라이나어", "마라티어", "캄보디아어",
+                "태국어", "터키어", "투르크메니스탄어", "티베르어", "타갈로그어",
+                "헝가리어" };
+
+            string[] combo6_res = {
+                "kor", "eng", "jpn", "chi", "ger",
+                "fre", "rus", "spa", "ita", "dut",
+                "fin", "swe", "por", "nor", "grc",
+                "cze", "pol", "mul", "may", "mon",
+                "bur", "vie", "slv", "ara", "afr",
+                "est", "uzb", "ukr", "mar", "cam",
+                "tha", "tur", "tuk", "tib", "tag",
+                "hun" };
+            string result = "";
+            string a041 = text041a.Text;
+            string k041 = text041k.Text;
+            string h041 = text041h.Text;
+            string b041 = text041b.Text;
+
+            int count = 0;
+            foreach (string code in combo6_res)
+            {
+                a041 = a041.Replace(code, combo6[count]);
+                k041 = k041.Replace(code, combo6[count]);
+                h041 = h041.Replace(code, combo6[count]);
+                b041 = b041.Replace(code, combo6[count]);
+                count++;
+            }
+
+            a041 = a041.Replace("▽", ", ");
+
+            // k로 번역된 h 원작을 a로 중역
+            if (a041 != "" && k041 != "" && h041 != "") {
+                result = string.Format("{0}로 번역된 {1} 원작을 {2}로 중역", k041, h041, a041);
+            }
+            // h 원작을 a로 번역
+            else if (a041 != "" && k041 == "" && h041 != "") {
+                result = string.Format("{0} 원작을 {1}로 번역", h041, a041);
+            }
+            // 본문은 a1, a2 혼합수록됨.
+            else if (a041.IndexOf(",") > 0) {
+                result = string.Format("본문은 {0} 혼합수록 됨.", a041);
+            }
+
+            text546a.Text = result;
+        }
+
+        private void invertCheck_CheckedChanged(object sender, EventArgs e)
+        {
+            string tmpStr = text245d.Text;
+            if (tmpStr[tmpStr.Length - 1] != ',') { tmpStr = basic_Replace(tmpStr); }
+            else { tmpStr = tmpStr.Remove(tmpStr.Length - 1); }
+            basicHeadBox.Text = tmpStr;
+
+            string[] invert = basicHeadBox.Text.Split(' ');
+
+            for (int a = 0; a < invert.Length; a++)
+            {
+                if (invert[a][invert[a].Length - 1] == ',')
+                {
+                    invert[a] = invert[a].Substring(0, invert[a].Length - 1);
+                }
+            }
+            try
+            {
+                if (invertCheck.Checked == true)
+                {
+                    for (int a = 0; a < invert.Length; a++)
+                    {
+                        if (a == 0)
+                        {
+                            if (invert[a][invert[a].Length - 1] != ',') { invert[a] += ","; }
+                            basicHeadBox.Text = invert[a] + " ";
+                            if (invert[a][invert[a].Length - 1] == ',') { invert[a] = invert[a].Substring(0, invert.Length - 1); }
+                        }
+                        else
+                        {
+                            if (invert[a][invert[a].Length - 1] != ',') { invert[a] += ","; }
+                            basicHeadBox.Text += invert[a] + " ";
+                            if (invert[a][invert[a].Length - 1] == ',') { invert[a] = invert[a].Substring(0, invert.Length - 1); }
+                        }
+                    }
+                }
+                else if (invertCheck.Checked == false)
+                {
+                    for (int a = invert.Length - 1; a >= 0; a--)
+                    {
+                        if (a == invert.Length - 1)
+                        {
+                            if (invert[a][invert[a].Length - 1] != ',') { invert[a] += ","; }
+                            basicHeadBox.Text = invert[a] + " ";
+                            if (invert[a][invert[a].Length - 1] == ',') { invert[a] = invert[a].Substring(0, invert.Length - 1); }
+                        }
+                        else
+                        {
+                            if (invert[a][invert[a].Length - 1] != ',') { invert[a] += ","; }
+                            basicHeadBox.Text += invert[a] + " ";
+                            if (invert[a][invert[a].Length - 1] == ',') { invert[a] = invert[a].Substring(0, invert.Length - 1); }
+                        }
+                    }
+                }
+                if (basicHeadBox.Text[basicHeadBox.Text.Length - 1] == ' ')
+                {
+                    basicHeadBox.Text = basicHeadBox.Text.Substring(0, basicHeadBox.Text.Length - 1);
+                }
+                if (basicHeadBox.Text[basicHeadBox.Text.Length - 1] == ',')
+                {
+                    basicHeadBox.Text = basicHeadBox.Text.Substring(0, basicHeadBox.Text.Length - 1);
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("데이터가 올바르지않습니다.\n245d를 확인해주세요.");
+            }
+        }
+        #region
+
+        /// <summary>
+        /// 245d에서 " 역할어,"를 잘라내는 함수
+        /// </summary>
+        /// <param name="strValue"></param>
+        /// <returns></returns>
+        public string basic_Replace(string strValue)
+        {
+            basicHeadBox.Text = "";
+            string result = strValue + ",";
+            string[] Role = { "글", "그림", "지음", "글·그림", "편", "엮음", "저", "씀" };
+            string[] gl = { "글.그림", "글그림", "그림글", "그림.글" };
+            for (int a = 0; a < gl.Length; a++) { result = result.Replace(gl[a], "글·그림"); }
+            for (int a = 0; a < Role.Length; a++) { result = result.Replace(" " + Role[a] + ",", ""); }
+
+            return result;
+        }
+        #endregion
     }
 }

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

@@ -29,6 +29,7 @@
         private void InitializeComponent()
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -38,7 +39,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.etc1 = new System.Windows.Forms.RichTextBox();
             this.etc2 = new System.Windows.Forms.RichTextBox();
@@ -66,6 +66,21 @@
             this.comboBox7 = new System.Windows.Forms.ComboBox();
             this.Btn_Memo = new System.Windows.Forms.Button();
             this.List_Book = new System.Windows.Forms.DataGridView();
+            this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.num = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.author = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.count = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pay = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.url = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.marc_idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.db_marc = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colCheck = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.user = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SaveDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.btn_Save = new System.Windows.Forms.Button();
             this.label4 = new System.Windows.Forms.Label();
             this.text008 = new System.Windows.Forms.TextBox();
@@ -91,6 +106,7 @@
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.panel4 = new System.Windows.Forms.Panel();
+            this.Btn_interlock = new System.Windows.Forms.Button();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.GridView020 = new System.Windows.Forms.DataGridView();
             this.CheckSet = new System.Windows.Forms.DataGridViewCheckBoxColumn();
@@ -233,21 +249,8 @@
             this.jisi = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.MarcValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.lbl_SaveData = new System.Windows.Forms.Label();
-            this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lbl_ISBN = new System.Windows.Forms.Label();
-            this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lbl_BookList = new System.Windows.Forms.Label();
-            this.num = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.author = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.count = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pay = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.url = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.marc_idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.db_marc = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colCheck = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.user = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SaveDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.List_Book)).BeginInit();
             this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -503,7 +506,7 @@
             // checkBox1
             // 
             this.checkBox1.AutoSize = true;
-            this.checkBox1.Location = new System.Drawing.Point(893, 31);
+            this.checkBox1.Location = new System.Drawing.Point(889, 31);
             this.checkBox1.Name = "checkBox1";
             this.checkBox1.Size = new System.Drawing.Size(112, 16);
             this.checkBox1.TabIndex = 213;
@@ -573,7 +576,7 @@
             this.user,
             this.SaveDate});
             this.List_Book.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
-            this.List_Book.Location = new System.Drawing.Point(12, 57);
+            this.List_Book.Location = new System.Drawing.Point(12, 78);
             this.List_Book.MultiSelect = false;
             this.List_Book.Name = "List_Book";
             this.List_Book.ReadOnly = true;
@@ -581,11 +584,125 @@
             this.List_Book.RowHeadersWidth = 10;
             this.List_Book.RowTemplate.Height = 23;
             this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.List_Book.Size = new System.Drawing.Size(502, 842);
+            this.List_Book.Size = new System.Drawing.Size(502, 821);
             this.List_Book.TabIndex = 217;
             this.List_Book.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.List_Book_CellClick);
             this.List_Book.KeyDown += new System.Windows.Forms.KeyEventHandler(this.List_Book_KeyDown);
             // 
+            // list_idx
+            // 
+            this.list_idx.HeaderText = "list_idx";
+            this.list_idx.Name = "list_idx";
+            this.list_idx.ReadOnly = true;
+            this.list_idx.Visible = false;
+            this.list_idx.Width = 30;
+            // 
+            // ISBN13
+            // 
+            this.ISBN13.FillWeight = 136.2398F;
+            this.ISBN13.HeaderText = "ISBN13";
+            this.ISBN13.Name = "ISBN13";
+            this.ISBN13.ReadOnly = true;
+            this.ISBN13.Visible = false;
+            // 
+            // num
+            // 
+            this.num.HeaderText = "연번";
+            this.num.Name = "num";
+            this.num.ReadOnly = true;
+            this.num.Width = 50;
+            // 
+            // book_name
+            // 
+            this.book_name.FillWeight = 135.5107F;
+            this.book_name.HeaderText = "도서명";
+            this.book_name.Name = "book_name";
+            this.book_name.ReadOnly = true;
+            this.book_name.Width = 150;
+            // 
+            // author
+            // 
+            this.author.FillWeight = 67.49011F;
+            this.author.HeaderText = "저자";
+            this.author.Name = "author";
+            this.author.ReadOnly = true;
+            this.author.Width = 80;
+            // 
+            // book_comp
+            // 
+            this.book_comp.FillWeight = 76.49199F;
+            this.book_comp.HeaderText = "출판사";
+            this.book_comp.Name = "book_comp";
+            this.book_comp.ReadOnly = true;
+            this.book_comp.Width = 80;
+            // 
+            // count
+            // 
+            this.count.HeaderText = "C";
+            this.count.Name = "count";
+            this.count.ReadOnly = true;
+            this.count.Width = 30;
+            // 
+            // pay
+            // 
+            this.pay.FillWeight = 84.26746F;
+            this.pay.HeaderText = "정가";
+            this.pay.Name = "pay";
+            this.pay.ReadOnly = true;
+            this.pay.Width = 62;
+            // 
+            // url
+            // 
+            this.url.HeaderText = "url";
+            this.url.Name = "url";
+            this.url.ReadOnly = true;
+            this.url.Visible = false;
+            // 
+            // marc_idx
+            // 
+            this.marc_idx.HeaderText = "marc_idx";
+            this.marc_idx.Name = "marc_idx";
+            this.marc_idx.ReadOnly = true;
+            this.marc_idx.Visible = false;
+            this.marc_idx.Width = 30;
+            // 
+            // db_marc
+            // 
+            this.db_marc.HeaderText = "marc";
+            this.db_marc.Name = "db_marc";
+            this.db_marc.ReadOnly = true;
+            this.db_marc.Visible = false;
+            // 
+            // grade
+            // 
+            this.grade.HeaderText = "등급";
+            this.grade.Name = "grade";
+            this.grade.ReadOnly = true;
+            this.grade.Visible = false;
+            this.grade.Width = 50;
+            // 
+            // colCheck
+            // 
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.colCheck.DefaultCellStyle = dataGridViewCellStyle2;
+            this.colCheck.HeaderText = "V";
+            this.colCheck.Name = "colCheck";
+            this.colCheck.ReadOnly = true;
+            this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCheck.Width = 30;
+            // 
+            // user
+            // 
+            this.user.HeaderText = "작업자";
+            this.user.Name = "user";
+            this.user.ReadOnly = true;
+            // 
+            // SaveDate
+            // 
+            this.SaveDate.HeaderText = "저장시각";
+            this.SaveDate.Name = "SaveDate";
+            this.SaveDate.ReadOnly = true;
+            // 
             // btn_Save
             // 
             this.btn_Save.Location = new System.Drawing.Point(1466, 186);
@@ -763,7 +880,7 @@
             this.panel1.Controls.Add(this.comboBox9);
             this.panel1.Controls.Add(this.rb_Filter);
             this.panel1.Controls.Add(this.comboBox8);
-            this.panel1.Location = new System.Drawing.Point(12, 11);
+            this.panel1.Location = new System.Drawing.Point(12, 37);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(476, 35);
             this.panel1.TabIndex = 226;
@@ -800,10 +917,10 @@
             // checkBox3
             // 
             this.checkBox3.AutoSize = true;
-            this.checkBox3.BackColor = System.Drawing.Color.Transparent;
+            this.checkBox3.BackColor = System.Drawing.Color.White;
             this.checkBox3.Checked = true;
             this.checkBox3.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.checkBox3.Location = new System.Drawing.Point(476, 62);
+            this.checkBox3.Location = new System.Drawing.Point(475, 83);
             this.checkBox3.Name = "checkBox3";
             this.checkBox3.Size = new System.Drawing.Size(15, 14);
             this.checkBox3.TabIndex = 227;
@@ -858,6 +975,7 @@
             // 
             this.panel4.BackColor = System.Drawing.SystemColors.ScrollBar;
             this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel4.Controls.Add(this.Btn_interlock);
             this.panel4.Controls.Add(this.groupBox5);
             this.panel4.Controls.Add(this.groupBox10);
             this.panel4.Controls.Add(this.label45);
@@ -905,6 +1023,16 @@
             this.panel4.Size = new System.Drawing.Size(932, 810);
             this.panel4.TabIndex = 316;
             // 
+            // Btn_interlock
+            // 
+            this.Btn_interlock.Location = new System.Drawing.Point(790, 45);
+            this.Btn_interlock.Name = "Btn_interlock";
+            this.Btn_interlock.Size = new System.Drawing.Size(137, 55);
+            this.Btn_interlock.TabIndex = 309;
+            this.Btn_interlock.Text = "태그연동\r\n(041-546)";
+            this.Btn_interlock.UseVisualStyleBackColor = true;
+            this.Btn_interlock.Click += new System.EventHandler(this.Btn_interlock_Click);
+            // 
             // groupBox5
             // 
             this.groupBox5.BackColor = System.Drawing.SystemColors.Control;
@@ -920,6 +1048,7 @@
             // GridView020
             // 
             this.GridView020.AllowDrop = true;
+            this.GridView020.AllowUserToAddRows = false;
             this.GridView020.AllowUserToResizeRows = false;
             this.GridView020.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.GridView020.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -987,6 +1116,7 @@
             // GridView505
             // 
             this.GridView505.AllowDrop = true;
+            this.GridView505.AllowUserToAddRows = false;
             this.GridView505.AllowUserToResizeRows = false;
             this.GridView505.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.GridView505.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1128,6 +1258,7 @@
             // GridView246
             // 
             this.GridView246.AllowDrop = true;
+            this.GridView246.AllowUserToAddRows = false;
             this.GridView246.AllowUserToResizeRows = false;
             dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
@@ -1294,6 +1425,7 @@
             // GridView440
             // 
             this.GridView440.AllowDrop = true;
+            this.GridView440.AllowUserToAddRows = false;
             this.GridView440.AllowUserToResizeRows = false;
             dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
@@ -1410,6 +1542,7 @@
             // GridView490
             // 
             this.GridView490.AllowDrop = true;
+            this.GridView490.AllowUserToAddRows = false;
             this.GridView490.AllowUserToResizeRows = false;
             dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
@@ -1496,7 +1629,7 @@
             // 
             // text300b
             // 
-            this.text300b.BackColor = System.Drawing.SystemColors.Info;
+            this.text300b.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.text300b.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.text300b.Location = new System.Drawing.Point(17, 42);
             this.text300b.Name = "text300b";
@@ -1580,7 +1713,7 @@
             this.text546a.Location = new System.Drawing.Point(502, 47);
             this.text546a.Multiline = true;
             this.text546a.Name = "text546a";
-            this.text546a.Size = new System.Drawing.Size(323, 53);
+            this.text546a.Size = new System.Drawing.Size(282, 53);
             this.text546a.TabIndex = 255;
             // 
             // groupBox6
@@ -1742,10 +1875,12 @@
             this.invertCheck.TabIndex = 213;
             this.invertCheck.Text = "생성";
             this.invertCheck.UseVisualStyleBackColor = true;
+            this.invertCheck.CheckedChanged += new System.EventHandler(this.invertCheck_CheckedChanged);
             // 
             // rbtn_100
             // 
             this.rbtn_100.AutoSize = true;
+            this.rbtn_100.Checked = true;
             this.rbtn_100.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.rbtn_100.Location = new System.Drawing.Point(16, 21);
             this.rbtn_100.Name = "rbtn_100";
@@ -2330,123 +2465,29 @@
             this.lbl_SaveData.ForeColor = System.Drawing.Color.PaleTurquoise;
             this.lbl_SaveData.Location = new System.Drawing.Point(1132, 53);
             this.lbl_SaveData.Name = "lbl_SaveData";
-            this.lbl_SaveData.Size = new System.Drawing.Size(336, 19);
+            this.lbl_SaveData.Size = new System.Drawing.Size(64, 19);
             this.lbl_SaveData.TabIndex = 318;
-            this.lbl_SaveData.Text = "[양승호] [2022-01-05 14:44:09]";
+            this.lbl_SaveData.Text = "[] []";
             // 
-            // list_idx
+            // lbl_ISBN
             // 
-            this.list_idx.HeaderText = "list_idx";
+            this.lbl_ISBN.AutoSize = true;
-            this.list_idx.Name = "list_idx";
+            this.lbl_ISBN.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold);
-            this.list_idx.ReadOnly = true;
+            this.lbl_ISBN.Location = new System.Drawing.Point(964, 53);
-            this.list_idx.Visible = false;
+            this.lbl_ISBN.Name = "lbl_ISBN";
-            this.list_idx.Width = 30;
+            this.lbl_ISBN.Size = new System.Drawing.Size(31, 19);
+            this.lbl_ISBN.TabIndex = 33;
+            this.lbl_ISBN.Text = "[]";
             // 
-            // ISBN13
+            // lbl_BookList
             // 
-            this.ISBN13.FillWeight = 136.2398F;
+            this.lbl_BookList.AutoSize = true;
-            this.ISBN13.HeaderText = "ISBN13";
+            this.lbl_BookList.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold);
-            this.ISBN13.Name = "ISBN13";
+            this.lbl_BookList.Location = new System.Drawing.Point(8, 12);
-            this.ISBN13.ReadOnly = true;
+            this.lbl_BookList.Name = "lbl_BookList";
-            this.ISBN13.Visible = false;
+            this.lbl_BookList.Size = new System.Drawing.Size(306, 19);
-            // 
+            this.lbl_BookList.TabIndex = 33;
-            // num
+            this.lbl_BookList.Text = "[장성공공희45]열린서적(장성)";
-            // 
-            this.num.HeaderText = "연번";
-            this.num.Name = "num";
-            this.num.ReadOnly = true;
-            this.num.Width = 50;
-            // 
-            // book_name
-            // 
-            this.book_name.FillWeight = 135.5107F;
-            this.book_name.HeaderText = "도서명";
-            this.book_name.Name = "book_name";
-            this.book_name.ReadOnly = true;
-            this.book_name.Width = 150;
-            // 
-            // author
-            // 
-            this.author.FillWeight = 67.49011F;
-            this.author.HeaderText = "저자";
-            this.author.Name = "author";
-            this.author.ReadOnly = true;
-            this.author.Width = 80;
-            // 
-            // book_comp
-            // 
-            this.book_comp.FillWeight = 76.49199F;
-            this.book_comp.HeaderText = "출판사";
-            this.book_comp.Name = "book_comp";
-            this.book_comp.ReadOnly = true;
-            this.book_comp.Width = 80;
-            // 
-            // count
-            // 
-            this.count.HeaderText = "C";
-            this.count.Name = "count";
-            this.count.ReadOnly = true;
-            this.count.Width = 30;
-            // 
-            // pay
-            // 
-            this.pay.FillWeight = 84.26746F;
-            this.pay.HeaderText = "정가";
-            this.pay.Name = "pay";
-            this.pay.ReadOnly = true;
-            this.pay.Width = 62;
-            // 
-            // url
-            // 
-            this.url.HeaderText = "url";
-            this.url.Name = "url";
-            this.url.ReadOnly = true;
-            this.url.Visible = false;
-            // 
-            // marc_idx
-            // 
-            this.marc_idx.HeaderText = "marc_idx";
-            this.marc_idx.Name = "marc_idx";
-            this.marc_idx.ReadOnly = true;
-            this.marc_idx.Visible = false;
-            this.marc_idx.Width = 30;
-            // 
-            // db_marc
-            // 
-            this.db_marc.HeaderText = "marc";
-            this.db_marc.Name = "db_marc";
-            this.db_marc.ReadOnly = true;
-            this.db_marc.Visible = false;
-            // 
-            // grade
-            // 
-            this.grade.HeaderText = "등급";
-            this.grade.Name = "grade";
-            this.grade.ReadOnly = true;
-            this.grade.Visible = false;
-            this.grade.Width = 50;
-            // 
-            // colCheck
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.colCheck.DefaultCellStyle = dataGridViewCellStyle2;
-            this.colCheck.HeaderText = "V";
-            this.colCheck.Name = "colCheck";
-            this.colCheck.ReadOnly = true;
-            this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colCheck.Width = 30;
-            // 
-            // user
-            // 
-            this.user.HeaderText = "작업자";
-            this.user.Name = "user";
-            this.user.ReadOnly = true;
-            // 
-            // SaveDate
-            // 
-            this.SaveDate.HeaderText = "저장시각";
-            this.SaveDate.Name = "SaveDate";
-            this.SaveDate.ReadOnly = true;
             // 
             // Marc
             // 
@@ -2454,7 +2495,10 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Gray;
             this.ClientSize = new System.Drawing.Size(1759, 929);
+            this.Controls.Add(this.lbl_BookList);
+            this.Controls.Add(this.lbl_ISBN);
             this.Controls.Add(this.lbl_SaveData);
+            this.Controls.Add(this.checkBox1);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.btn_FillBlank);
@@ -2471,7 +2515,6 @@
             this.Controls.Add(this.btn_preview);
             this.Controls.Add(this.Btn_Memo);
             this.Controls.Add(this.checkBox2);
-            this.Controls.Add(this.checkBox1);
             this.Controls.Add(this.comboBox6);
             this.Controls.Add(this.comboBox5);
             this.Controls.Add(this.comboBox4);
@@ -2754,5 +2797,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn colCheck;
         private System.Windows.Forms.DataGridViewTextBoxColumn user;
         private System.Windows.Forms.DataGridViewTextBoxColumn SaveDate;
+        private System.Windows.Forms.Button Btn_interlock;
+        private System.Windows.Forms.Label lbl_ISBN;
+        private System.Windows.Forms.Label lbl_BookList;
     }
 }

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

@@ -28,13 +28,13 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = 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();
@@ -76,6 +76,7 @@
             this.search_tag = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.checkBox1 = new System.Windows.Forms.CheckBox();
+            this.btn_Output = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
@@ -84,6 +85,7 @@
             // panel1
             // 
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Controls.Add(this.btn_Output);
             this.panel1.Controls.Add(this.btn_Excel);
             this.panel1.Controls.Add(this.panel3);
             this.panel1.Controls.Add(this.btn_ChangeTag);
@@ -95,16 +97,16 @@
             this.panel1.Controls.Add(this.btn_Select_List);
             this.panel1.Location = new System.Drawing.Point(12, 12);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1464, 36);
+            this.panel1.Size = new System.Drawing.Size(1516, 36);
             this.panel1.TabIndex = 0;
             // 
             // btn_Excel
             // 
-            this.btn_Excel.Location = new System.Drawing.Point(838, 6);
+            this.btn_Excel.Location = new System.Drawing.Point(825, 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.Text = "엑셀 반출";
             this.btn_Excel.UseVisualStyleBackColor = true;
             this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click);
             // 
@@ -120,7 +122,7 @@
             this.panel3.Controls.Add(this.label4);
             this.panel3.Location = new System.Drawing.Point(251, 2);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(581, 30);
+            this.panel3.Size = new System.Drawing.Size(562, 30);
             this.panel3.TabIndex = 7;
             // 
             // cb_authorType
@@ -136,7 +138,7 @@
             // 
             this.cb_divType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_divType.FormattingEnabled = true;
-            this.cb_divType.Location = new System.Drawing.Point(414, 4);
+            this.cb_divType.Location = new System.Drawing.Point(402, 4);
             this.cb_divType.Name = "cb_divType";
             this.cb_divType.Size = new System.Drawing.Size(88, 20);
             this.cb_divType.TabIndex = 1;
@@ -146,7 +148,7 @@
             // 
             this.cb_divNum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_divNum.FormattingEnabled = true;
-            this.cb_divNum.Location = new System.Drawing.Point(508, 4);
+            this.cb_divNum.Location = new System.Drawing.Point(496, 4);
             this.cb_divNum.Name = "cb_divNum";
             this.cb_divNum.Size = new System.Drawing.Size(61, 20);
             this.cb_divNum.TabIndex = 1;
@@ -172,7 +174,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(383, 8);
+            this.label3.Location = new System.Drawing.Point(371, 8);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(29, 12);
             this.label3.TabIndex = 1;
@@ -189,7 +191,7 @@
             // 
             // btn_ChangeTag
             // 
-            this.btn_ChangeTag.Location = new System.Drawing.Point(1277, 6);
+            this.btn_ChangeTag.Location = new System.Drawing.Point(1313, 6);
             this.btn_ChangeTag.Name = "btn_ChangeTag";
             this.btn_ChangeTag.Size = new System.Drawing.Size(86, 23);
             this.btn_ChangeTag.TabIndex = 5;
@@ -199,7 +201,7 @@
             // 
             // btn_Close
             // 
-            this.btn_Close.Location = new System.Drawing.Point(1369, 6);
+            this.btn_Close.Location = new System.Drawing.Point(1405, 6);
             this.btn_Close.Name = "btn_Close";
             this.btn_Close.Size = new System.Drawing.Size(86, 23);
             this.btn_Close.TabIndex = 5;
@@ -209,7 +211,7 @@
             // 
             // tb_SearchTag
             // 
-            this.tb_SearchTag.Location = new System.Drawing.Point(1171, 7);
+            this.tb_SearchTag.Location = new System.Drawing.Point(1207, 7);
             this.tb_SearchTag.Name = "tb_SearchTag";
             this.tb_SearchTag.Size = new System.Drawing.Size(100, 21);
             this.tb_SearchTag.TabIndex = 4;
@@ -217,7 +219,7 @@
             // 
             // tb_ISBN
             // 
-            this.tb_ISBN.Location = new System.Drawing.Point(998, 7);
+            this.tb_ISBN.Location = new System.Drawing.Point(1034, 7);
             this.tb_ISBN.Name = "tb_ISBN";
             this.tb_ISBN.Size = new System.Drawing.Size(100, 21);
             this.tb_ISBN.TabIndex = 4;
@@ -225,7 +227,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(1112, 11);
+            this.label2.Location = new System.Drawing.Point(1148, 11);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(57, 12);
             this.label2.TabIndex = 3;
@@ -234,7 +236,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(963, 11);
+            this.label1.Location = new System.Drawing.Point(999, 11);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(33, 12);
             this.label1.TabIndex = 3;
@@ -255,14 +257,14 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.idx,
@@ -290,7 +292,7 @@
             this.dataGridView1.Location = new System.Drawing.Point(13, 57);
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.RowTemplate.Height = 23;
-            this.dataGridView1.Size = new System.Drawing.Size(1463, 611);
+            this.dataGridView1.Size = new System.Drawing.Size(1515, 647);
             this.dataGridView1.TabIndex = 1;
             this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
             this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
@@ -313,8 +315,8 @@
             // 
             // reg_num
             // 
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.reg_num.DefaultCellStyle = dataGridViewCellStyle2;
+            this.reg_num.DefaultCellStyle = dataGridViewCellStyle9;
             this.reg_num.FillWeight = 130.9363F;
             this.reg_num.HeaderText = "등록번호";
             this.reg_num.Name = "reg_num";
@@ -322,8 +324,8 @@
             // 
             // class_code
             // 
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.class_code.DefaultCellStyle = dataGridViewCellStyle3;
+            this.class_code.DefaultCellStyle = dataGridViewCellStyle10;
             this.class_code.FillWeight = 76.41504F;
             this.class_code.HeaderText = "분류";
             this.class_code.Name = "class_code";
@@ -331,8 +333,8 @@
             // 
             // author_code
             // 
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.author_code.DefaultCellStyle = dataGridViewCellStyle4;
+            this.author_code.DefaultCellStyle = dataGridViewCellStyle11;
             this.author_code.FillWeight = 77.02635F;
             this.author_code.HeaderText = "저자기호";
             this.author_code.Name = "author_code";
@@ -340,8 +342,8 @@
             // 
             // volume
             // 
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.volume.DefaultCellStyle = dataGridViewCellStyle5;
+            this.volume.DefaultCellStyle = dataGridViewCellStyle12;
             this.volume.FillWeight = 38.80909F;
             this.volume.HeaderText = "V";
             this.volume.Name = "volume";
@@ -350,8 +352,8 @@
             // 
             // copy
             // 
-            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.copy.DefaultCellStyle = dataGridViewCellStyle6;
+            this.copy.DefaultCellStyle = dataGridViewCellStyle13;
             this.copy.FillWeight = 40.14827F;
             this.copy.HeaderText = "C";
             this.copy.Name = "copy";
@@ -360,8 +362,8 @@
             // 
             // prefix
             // 
-            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.prefix.DefaultCellStyle = dataGridViewCellStyle7;
+            this.prefix.DefaultCellStyle = dataGridViewCellStyle14;
             this.prefix.FillWeight = 41.51828F;
             this.prefix.HeaderText = "F";
             this.prefix.Name = "prefix";
@@ -485,11 +487,21 @@
             this.checkBox1.UseVisualStyleBackColor = true;
             this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
             // 
+            // btn_Output
+            // 
+            this.btn_Output.Location = new System.Drawing.Point(907, 6);
+            this.btn_Output.Name = "btn_Output";
+            this.btn_Output.Size = new System.Drawing.Size(75, 23);
+            this.btn_Output.TabIndex = 9;
+            this.btn_Output.Text = "마크 반출";
+            this.btn_Output.UseVisualStyleBackColor = true;
+            this.btn_Output.Click += new System.EventHandler(this.btn_Output_Click);
+            // 
             // Marc_Plan
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1488, 716);
+            this.ClientSize = new System.Drawing.Size(1540, 716);
             this.Controls.Add(this.checkBox1);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.panel1);
@@ -549,5 +561,6 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Button btn_Excel;
+        private System.Windows.Forms.Button btn_Output;
     }
 }

unimarc/unimarc/마크/Marc_Plan.cs

@@ -149,7 +149,8 @@ namespace WindowsFormsApp1.Mac
                     dataGridView1.Rows[row].Cells["marc"].Value.ToString(),
                     dataGridView1.Rows[row].Cells["midx"].Value.ToString(),
                     dataGridView1.Rows[row].Cells["num"].Value.ToString(),
-                    dataGridView1.Rows[row].Cells["idx"].Value.ToString()
+                    dataGridView1.Rows[row].Cells["idx"].Value.ToString(),
+                    dataGridView1.Rows[row].Cells["ISBN"].Value.ToString()
                 };
                 string[] symbol_Type = {
                     cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text,
@@ -282,5 +283,30 @@ namespace WindowsFormsApp1.Mac
 
             et.Mk_Excel(Title, Content);
         }
+
+        private void btn_Output_Click(object sender, EventArgs e)
+        {
+            string Marc_data = string.Empty;
+            for (int a = 0; a < dataGridView1.Rows.Count; a++)
+            {
+                if (dataGridView1.Rows[a].Cells["marc"].Value.ToString() == "" &&
+                    dataGridView1.Rows[a].Cells["marc"].Value == null)
+                    continue;
+
+                Marc_data += dataGridView1.Rows[a].Cells["marc"].Value.ToString().Replace("￦", "\\");
+            }
+
+            string FileName;
+            SaveFileDialog saveFileDialog = new SaveFileDialog();
+            saveFileDialog.Title = "저장 경로를 지정하세요.";
+            saveFileDialog.OverwritePrompt = true;
+            saveFileDialog.Filter = "마크 파일 (*.mrc)|*.mrc|모든 파일 (*.*)|*.*";
+
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                FileName = saveFileDialog.FileName;
+                System.IO.File.WriteAllText(FileName, Marc_data, Encoding.Default);
+            }
+        }
     }
 }

unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs

@@ -31,7 +31,7 @@ namespace UniMarc.마크
         /// <summary>
         /// 시작전 세팅작업. 필요한 데이터들을 각각의 박스들에 집어넣음.
         /// </summary>
-        /// <param name="Marc">0:Marc 1:MarcIdx 2:연번 3:idx</param>
+        /// <param name="Marc">0:Marc 1:MarcIdx 2:연번 3:idx 4:ISBN</param>
         /// <param name="Symbol_Type">저자기호 배열
         /// 0:FirstAuthor 1:authorType 2:FirstBook 3:divType 4:divNum </param>
         public void Init(string[] Marc, string[] Symbol_Type)
@@ -78,10 +78,6 @@ namespace UniMarc.마크
             // 언어 36
             comboBox6.Items.AddRange(tag008.combo6);
 
-            string[] Tag = { "020a" };
-            string[] Marc_Tag = st.Take_Tag(Marc[0], Tag);
-
-            input_picture(Marc_Tag[0]);
             richTextBox1.Text = split_Marc(Marc[0]);
             Create_008();
             st.Color_change("▼", richTextBox1);
@@ -90,6 +86,7 @@ namespace UniMarc.마크
             tb_Mcode.Text = Marc[1];
             tb_num.Text = Marc[2];
             idx = Marc[3];
+            input_picture(Marc[4]);
 
         }
         #region Init_Sub
@@ -113,10 +110,12 @@ namespace UniMarc.마크
 
             if (data == "" || data == null) { return; }
 
-            string[] Tag008 = { "", "", "", "", "",
+            string[] Tag008 = {
                 "", "", "", "", "",
                 "", "", "", "", "",
-                                "", "", "", "", "" };
+                "", "", "", "", "",
+                "", "", "", "", ""
+            };
             /* 입력일자 발행년유형 발행년1 발행년2 발행국 
              * 삽화표시 이용대상자수준 개별자료형태 내용형식1 내용형식2 
              * 한국대학부호 수정레코드 회의간행물 기념논문집 색인 
@@ -503,13 +502,13 @@ namespace UniMarc.마크
             if (e.KeyCode == Keys.F12)
                 btn_Front_Click(null, null);
 
+            if (e.KeyCode == Keys.Escape)
+                btn_Close_Click(null, null);
+
             if (e.KeyCode == Keys.F9) {
                 string Tag090 = Sample_090();
                 Tag_Create("090", Tag090);
             }
-
-            if (e.KeyCode == Keys.Escape)
-                btn_Close_Click(null, null);
         }
         #region KeyDown_Sub
         /// <summary>

unimarc/unimarc/마크/School_Lookup.Designer.cs

@@ -1,522 +0,0 @@
-namespace WindowsFormsApp1.DLS
-{
-    partial class School_Lookup
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.label1 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.textBox2 = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.textBox5 = new System.Windows.Forms.TextBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.textBox6 = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.textBox7 = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.textBox8 = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.checkBox1 = new System.Windows.Forms.CheckBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label12 = new System.Windows.Forms.Label();
-            this.label13 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.textBox12 = new System.Windows.Forms.TextBox();
-            this.textBox13 = new System.Windows.Forms.TextBox();
-            this.label15 = new System.Windows.Forms.Label();
-            this.textBox14 = new System.Windows.Forms.TextBox();
-            this.label17 = new System.Windows.Forms.Label();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
-            this.comboBox2 = new System.Windows.Forms.ComboBox();
-            this.comboBox3 = new System.Windows.Forms.ComboBox();
-            this.textBox9 = new System.Windows.Forms.TextBox();
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.button1 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
-            this.button3 = new System.Windows.Forms.Button();
-            this.comboBox4 = new System.Windows.Forms.ComboBox();
-            this.textBox10 = new System.Windows.Forms.TextBox();
-            this.button4 = new System.Windows.Forms.Button();
-            this.button5 = new System.Windows.Forms.Button();
-            this.button6 = new System.Windows.Forms.Button();
-            this.button7 = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(26, 27);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(53, 12);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "거래처명";
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(85, 23);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(156, 21);
-            this.textBox1.TabIndex = 1;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(28, 54);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(49, 12);
-            this.label2.TabIndex = 0;
-            this.label2.Text = "담 당 자";
-            // 
-            // textBox2
-            // 
-            this.textBox2.Location = new System.Drawing.Point(85, 50);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(156, 21);
-            this.textBox2.TabIndex = 1;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(26, 81);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(53, 12);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "용지칸수";
-            // 
-            // textBox3
-            // 
-            this.textBox3.Location = new System.Drawing.Point(85, 77);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(156, 21);
-            this.textBox3.TabIndex = 1;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(263, 28);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(65, 12);
-            this.label4.TabIndex = 0;
-            this.label4.Text = "전 화 번 호";
-            // 
-            // textBox4
-            // 
-            this.textBox4.Location = new System.Drawing.Point(331, 24);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(156, 21);
-            this.textBox4.TabIndex = 1;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(261, 54);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(69, 12);
-            this.label5.TabIndex = 0;
-            this.label5.Text = "담당자 전화";
-            // 
-            // textBox5
-            // 
-            this.textBox5.Location = new System.Drawing.Point(331, 50);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(156, 21);
-            this.textBox5.TabIndex = 1;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(261, 81);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(69, 12);
-            this.label6.TabIndex = 0;
-            this.label6.Text = "띠라벨 종류";
-            // 
-            // textBox6
-            // 
-            this.textBox6.Location = new System.Drawing.Point(331, 77);
-            this.textBox6.Name = "textBox6";
-            this.textBox6.Size = new System.Drawing.Size(156, 21);
-            this.textBox6.TabIndex = 1;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(529, 27);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(49, 12);
-            this.label7.TabIndex = 0;
-            this.label7.Text = "팩     스";
-            // 
-            // textBox7
-            // 
-            this.textBox7.Location = new System.Drawing.Point(588, 23);
-            this.textBox7.Name = "textBox7";
-            this.textBox7.Size = new System.Drawing.Size(156, 21);
-            this.textBox7.TabIndex = 1;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(521, 54);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(65, 12);
-            this.label8.TabIndex = 0;
-            this.label8.Text = "결제담당자";
-            // 
-            // textBox8
-            // 
-            this.textBox8.Location = new System.Drawing.Point(588, 50);
-            this.textBox8.Name = "textBox8";
-            this.textBox8.Size = new System.Drawing.Size(156, 21);
-            this.textBox8.TabIndex = 1;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(553, 81);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(0, 12);
-            this.label9.TabIndex = 0;
-            // 
-            // checkBox1
-            // 
-            this.checkBox1.AutoSize = true;
-            this.checkBox1.Location = new System.Drawing.Point(511, 79);
-            this.checkBox1.Name = "checkBox1";
-            this.checkBox1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.checkBox1.Size = new System.Drawing.Size(96, 16);
-            this.checkBox1.TabIndex = 2;
-            this.checkBox1.Text = "등록번호출력";
-            this.checkBox1.UseVisualStyleBackColor = true;
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(26, 108);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(53, 12);
-            this.label10.TabIndex = 0;
-            this.label10.Text = "거래구분";
-            // 
-            // label11
-            // 
-            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(257, 108);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(77, 12);
-            this.label11.TabIndex = 0;
-            this.label11.Text = "사용프로그램";
-            // 
-            // label12
-            // 
-            this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(529, 108);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(49, 12);
-            this.label12.TabIndex = 0;
-            this.label12.Text = "지     역";
-            // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(28, 135);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(49, 12);
-            this.label13.TabIndex = 0;
-            this.label13.Text = "아 이 디";
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(263, 135);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(65, 12);
-            this.label14.TabIndex = 0;
-            this.label14.Text = "비 밀 번 호";
-            // 
-            // textBox12
-            // 
-            this.textBox12.Location = new System.Drawing.Point(85, 131);
-            this.textBox12.Name = "textBox12";
-            this.textBox12.Size = new System.Drawing.Size(156, 21);
-            this.textBox12.TabIndex = 1;
-            // 
-            // textBox13
-            // 
-            this.textBox13.Location = new System.Drawing.Point(331, 131);
-            this.textBox13.Name = "textBox13";
-            this.textBox13.Size = new System.Drawing.Size(156, 21);
-            this.textBox13.TabIndex = 1;
-            // 
-            // label15
-            // 
-            this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(28, 162);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(49, 12);
-            this.label15.TabIndex = 0;
-            this.label15.Text = "주     소";
-            // 
-            // textBox14
-            // 
-            this.textBox14.Location = new System.Drawing.Point(85, 158);
-            this.textBox14.Name = "textBox14";
-            this.textBox14.Size = new System.Drawing.Size(61, 21);
-            this.textBox14.TabIndex = 1;
-            // 
-            // label17
-            // 
-            this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(28, 186);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(49, 12);
-            this.label17.TabIndex = 0;
-            this.label17.Text = "비     고";
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(85, 105);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(126, 20);
-            this.comboBox1.TabIndex = 3;
-            // 
-            // comboBox2
-            // 
-            this.comboBox2.FormattingEnabled = true;
-            this.comboBox2.Location = new System.Drawing.Point(331, 105);
-            this.comboBox2.Name = "comboBox2";
-            this.comboBox2.Size = new System.Drawing.Size(126, 20);
-            this.comboBox2.TabIndex = 3;
-            // 
-            // comboBox3
-            // 
-            this.comboBox3.FormattingEnabled = true;
-            this.comboBox3.Location = new System.Drawing.Point(588, 105);
-            this.comboBox3.Name = "comboBox3";
-            this.comboBox3.Size = new System.Drawing.Size(126, 20);
-            this.comboBox3.TabIndex = 3;
-            // 
-            // textBox9
-            // 
-            this.textBox9.Location = new System.Drawing.Point(152, 158);
-            this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(386, 21);
-            this.textBox9.TabIndex = 1;
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.Location = new System.Drawing.Point(85, 186);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(740, 86);
-            this.richTextBox1.TabIndex = 4;
-            this.richTextBox1.Text = "";
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(13, 289);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(71, 23);
-            this.button1.TabIndex = 5;
-            this.button1.Text = "추   가 (&A)";
-            this.button1.UseVisualStyleBackColor = true;
-            // 
-            // button2
-            // 
-            this.button2.Location = new System.Drawing.Point(89, 289);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(71, 23);
-            this.button2.TabIndex = 5;
-            this.button2.Text = "저   장 (&S)";
-            this.button2.UseVisualStyleBackColor = true;
-            // 
-            // button3
-            // 
-            this.button3.Location = new System.Drawing.Point(166, 289);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(71, 23);
-            this.button3.TabIndex = 5;
-            this.button3.Text = "삭   제 (&D)";
-            this.button3.UseVisualStyleBackColor = true;
-            // 
-            // comboBox4
-            // 
-            this.comboBox4.FormattingEnabled = true;
-            this.comboBox4.Location = new System.Drawing.Point(243, 290);
-            this.comboBox4.Name = "comboBox4";
-            this.comboBox4.Size = new System.Drawing.Size(97, 20);
-            this.comboBox4.TabIndex = 3;
-            // 
-            // textBox10
-            // 
-            this.textBox10.Location = new System.Drawing.Point(346, 290);
-            this.textBox10.Name = "textBox10";
-            this.textBox10.Size = new System.Drawing.Size(152, 21);
-            this.textBox10.TabIndex = 1;
-            // 
-            // button4
-            // 
-            this.button4.Location = new System.Drawing.Point(504, 290);
-            this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(71, 23);
-            this.button4.TabIndex = 5;
-            this.button4.Text = "조   회 (&H)";
-            this.button4.UseVisualStyleBackColor = true;
-            // 
-            // button5
-            // 
-            this.button5.Location = new System.Drawing.Point(580, 290);
-            this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(99, 23);
-            this.button5.TabIndex = 5;
-            this.button5.Text = "바코드 출력 (&B)";
-            this.button5.UseVisualStyleBackColor = true;
-            // 
-            // button6
-            // 
-            this.button6.Location = new System.Drawing.Point(685, 290);
-            this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(84, 23);
-            this.button6.TabIndex = 5;
-            this.button6.Text = "복본조사 (&O)";
-            this.button6.UseVisualStyleBackColor = true;
-            // 
-            // button7
-            // 
-            this.button7.Location = new System.Drawing.Point(775, 290);
-            this.button7.Name = "button7";
-            this.button7.Size = new System.Drawing.Size(71, 23);
-            this.button7.TabIndex = 5;
-            this.button7.Text = "DLS (&L)";
-            this.button7.UseVisualStyleBackColor = true;
-            // 
-            // School_Lookup
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1126, 470);
-            this.Controls.Add(this.button7);
-            this.Controls.Add(this.button6);
-            this.Controls.Add(this.button3);
-            this.Controls.Add(this.button5);
-            this.Controls.Add(this.button2);
-            this.Controls.Add(this.button4);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.richTextBox1);
-            this.Controls.Add(this.comboBox3);
-            this.Controls.Add(this.comboBox4);
-            this.Controls.Add(this.comboBox2);
-            this.Controls.Add(this.comboBox1);
-            this.Controls.Add(this.checkBox1);
-            this.Controls.Add(this.textBox6);
-            this.Controls.Add(this.textBox3);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.textBox8);
-            this.Controls.Add(this.textBox10);
-            this.Controls.Add(this.textBox13);
-            this.Controls.Add(this.textBox5);
-            this.Controls.Add(this.textBox9);
-            this.Controls.Add(this.textBox14);
-            this.Controls.Add(this.textBox12);
-            this.Controls.Add(this.label12);
-            this.Controls.Add(this.label14);
-            this.Controls.Add(this.textBox2);
-            this.Controls.Add(this.label17);
-            this.Controls.Add(this.label15);
-            this.Controls.Add(this.label11);
-            this.Controls.Add(this.label13);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.label10);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.textBox7);
-            this.Controls.Add(this.label7);
-            this.Controls.Add(this.textBox4);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.label1);
-            this.Name = "School_Lookup";
-            this.Text = "DLS_학교조회";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox textBox5;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.TextBox textBox6;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.TextBox textBox7;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TextBox textBox8;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.CheckBox checkBox1;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.TextBox textBox12;
-        private System.Windows.Forms.TextBox textBox13;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.TextBox textBox14;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.ComboBox comboBox1;
-        private System.Windows.Forms.ComboBox comboBox2;
-        private System.Windows.Forms.ComboBox comboBox3;
-        private System.Windows.Forms.TextBox textBox9;
-        private System.Windows.Forms.RichTextBox richTextBox1;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button3;
-        private System.Windows.Forms.ComboBox comboBox4;
-        private System.Windows.Forms.TextBox textBox10;
-        private System.Windows.Forms.Button button4;
-        private System.Windows.Forms.Button button5;
-        private System.Windows.Forms.Button button6;
-        private System.Windows.Forms.Button button7;
-    }
-}

unimarc/unimarc/마크/School_Lookup.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace WindowsFormsApp1.DLS
-{
-    public partial class School_Lookup : Form
-    {
-        Main main;
-        public School_Lookup(Main _main)
-        {
-            InitializeComponent();
-            main = _main;
-        }
-    }
-}

unimarc/unimarc/마크/Search_Infor_Sub.Designer.cs

@@ -60,7 +60,7 @@ namespace WindowsFormsApp1.마크
             this.Controls.Add(this.richTextBox1);
             this.Controls.Add(this.pictureBox1);
             this.Name = "Search_Infor_Sub";
-            this.Text = "Search_Infor_Sub";
+            this.Text = "마크편집";
             this.Load += new System.EventHandler(this.Search_Infor_Sub_Load);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);

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

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

unimarc/unimarc/홈/Home_User_manage.cs

@@ -180,11 +180,13 @@ namespace WindowsFormsApp1.Home
                 MessageBox.Show("성명 / 아이디 / 비밀번호 를 채워주세요.");
                 return;
             }
+
+            if (!CheckSelect()) {
                 if (!overlap) {
                     MessageBox.Show("아이디 중복확인을 해주세요.");
                     return;
                 }
-
+            }
 
             bool IsUpdate = true;
             string cmd = _DB.DB_Search(Table_User, "id", tb_ID.Text);
@@ -253,9 +255,34 @@ namespace WindowsFormsApp1.Home
             }
 
             MessageBox.Show("저장되었습니다!");
+            main.isAccess();
             btn_lookup_Click(null, null);
         }
 
+        private bool CheckSelect()
+        {
+            int row = dataGridView1.CurrentCell.RowIndex;
+
+            string[] GridData = {
+                dataGridView1.Rows[row].Cells["Per_name"].Value.ToString(),
+                dataGridView1.Rows[row].Cells["Rank"].Value.ToString(),
+                dataGridView1.Rows[row].Cells["Phone"].Value.ToString(),
+                dataGridView1.Rows[row].Cells["ID"].Value.ToString()
+            };
+            string[] BoxData = {
+                tb_Name.Text, tb_position.Text, tb_Phone.Text, tb_ID.Text
+            };
+
+            int count = 0;
+            foreach (string data in GridData)
+            {
+                if (data != BoxData[count])
+                    return false;
+                count++;
+            }
+            return true;
+        }
+
         private void btn_Empty_Click(object sender, EventArgs e)
         {
             tb_ID.Text = "";