From c44f40a65120ece8a2b83200c492e3ad5c8695a1 Mon Sep 17 00:00:00 2001 From: LGram16 Date: Sat, 24 Jan 2026 00:35:09 +0900 Subject: [PATCH] =?UTF-8?q?addmar2=20=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- unimarc/unimarc/Main.Designer.cs | 288 +++++---- unimarc/unimarc/Main.cs | 5 + unimarc/unimarc/UniMarc.csproj | 9 + unimarc/unimarc/마크/AddMarc.cs | 23 +- unimarc/unimarc/마크/AddMarc2.Designer.cs | 157 +++++ unimarc/unimarc/마크/AddMarc2.cs | 573 ++++++++++++++++++ unimarc/unimarc/마크/AddMarc2.resx | 123 ++++ unimarc/unimarc/마크/AddMarc_FillBlank.cs | 11 +- unimarc/unimarc/마크/MacEditorParameter.cs | 3 + unimarc/unimarc/마크/Marc2.cs | 4 +- unimarc/unimarc/마크/MarcCopySelect.cs | 14 +- unimarc/unimarc/마크/MarcEditorControl.cs | 34 +- .../unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs | 2 +- unimarc/unimarc/마크/Marc_memo.cs | 8 +- unimarc/unimarc/마크/findNchange.cs | 7 +- 15 files changed, 1076 insertions(+), 185 deletions(-) create mode 100644 unimarc/unimarc/마크/AddMarc2.Designer.cs create mode 100644 unimarc/unimarc/마크/AddMarc2.cs create mode 100644 unimarc/unimarc/마크/AddMarc2.resx diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs index 608fc6d..ee84ed8 100644 --- a/unimarc/unimarc/Main.Designer.cs +++ b/unimarc/unimarc/Main.Designer.cs @@ -139,6 +139,7 @@ this.mdiTabControl = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.신규마크작성NewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -159,8 +160,7 @@ this.menu_allclose}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(1902, 30); + this.menuStrip1.Size = new System.Drawing.Size(1664, 24); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -175,34 +175,34 @@ this.도서정보관리, this.사용대장}); this.홈ToolStripMenuItem.Name = "홈ToolStripMenuItem"; - this.홈ToolStripMenuItem.Size = new System.Drawing.Size(38, 26); + this.홈ToolStripMenuItem.Size = new System.Drawing.Size(31, 20); this.홈ToolStripMenuItem.Text = "홈"; // // 사업체정보 // this.사업체정보.Name = "사업체정보"; - this.사업체정보.Size = new System.Drawing.Size(218, 26); + 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(218, 26); + 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(218, 26); + 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(218, 26); + this.주문처관리.Size = new System.Drawing.Size(175, 22); this.주문처관리.Text = "주문처 관리"; this.주문처관리.Click += new System.EventHandler(this.주문처관리ToolStripMenuItem_Click); // @@ -210,14 +210,14 @@ // this.비밀번호변경.Enabled = false; this.비밀번호변경.Name = "비밀번호변경"; - this.비밀번호변경.Size = new System.Drawing.Size(218, 26); + 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(218, 26); + this.도서정보관리.Size = new System.Drawing.Size(175, 22); this.도서정보관리.Text = "도서정보 관리"; this.도서정보관리.Click += new System.EventHandler(this.도서정보관리ToolStripMenuItem_Click); // @@ -225,7 +225,7 @@ // this.사용대장.Enabled = false; this.사용대장.Name = "사용대장"; - this.사용대장.Size = new System.Drawing.Size(218, 26); + this.사용대장.Size = new System.Drawing.Size(175, 22); this.사용대장.Text = "사용대장"; this.사용대장.Click += new System.EventHandler(this.사용대장ToolStripMenuItem_Click); // @@ -240,55 +240,55 @@ this.재고입력및조회, this.반품처리}); this.납품관리ToolStripMenuItem.Name = "납품관리ToolStripMenuItem"; - this.납품관리ToolStripMenuItem.Size = new System.Drawing.Size(83, 26); + this.납품관리ToolStripMenuItem.Size = new System.Drawing.Size(67, 20); this.납품관리ToolStripMenuItem.Text = "납품관리"; // // 목록등록 // this.목록등록.Name = "목록등록"; - this.목록등록.Size = new System.Drawing.Size(207, 26); + 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(207, 26); + 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(207, 26); + 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(207, 26); + 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(207, 26); + 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(207, 26); + 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(207, 26); + this.반품처리.Size = new System.Drawing.Size(166, 22); this.반품처리.Text = "반품처리"; this.반품처리.Click += new System.EventHandler(this.반품처리ToolStripMenuItem_Click); // @@ -301,20 +301,20 @@ this.매출, this.파트타임관리}); this.회계ToolStripMenuItem.Name = "회계ToolStripMenuItem"; - this.회계ToolStripMenuItem.Size = new System.Drawing.Size(53, 26); + this.회계ToolStripMenuItem.Size = new System.Drawing.Size(43, 20); this.회계ToolStripMenuItem.Text = "회계"; // // 송금내역조회 // this.송금내역조회.Name = "송금내역조회"; - this.송금내역조회.Size = new System.Drawing.Size(192, 26); + 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(192, 26); + this.송금등록.Size = new System.Drawing.Size(154, 22); this.송금등록.Text = "송금 등록"; this.송금등록.Click += new System.EventHandler(this.송금등록ToolStripMenuItem_Click); // @@ -325,20 +325,20 @@ this.매입장부, this.매입미결제ToolStripMenuItem}); this.매입.Name = "매입"; - this.매입.Size = new System.Drawing.Size(192, 26); + this.매입.Size = new System.Drawing.Size(154, 22); this.매입.Text = "매입"; // // 매입집계 // this.매입집계.Name = "매입집계"; - this.매입집계.Size = new System.Drawing.Size(172, 26); + 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(172, 26); + this.매입장부.Size = new System.Drawing.Size(138, 22); this.매입장부.Text = "매입 장부"; this.매입장부.Click += new System.EventHandler(this.매입장부ToolStripMenuItem1_Click); // @@ -346,7 +346,7 @@ // this.매입미결제ToolStripMenuItem.Enabled = false; this.매입미결제ToolStripMenuItem.Name = "매입미결제ToolStripMenuItem"; - this.매입미결제ToolStripMenuItem.Size = new System.Drawing.Size(172, 26); + this.매입미결제ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.매입미결제ToolStripMenuItem.Text = "매입 미결제"; this.매입미결제ToolStripMenuItem.Click += new System.EventHandler(this.매입미결제ToolStripMenuItem_Click); // @@ -358,41 +358,41 @@ this.매출조회, this.매출집계}); this.매출.Name = "매출"; - this.매출.Size = new System.Drawing.Size(192, 26); + this.매출.Size = new System.Drawing.Size(154, 22); this.매출.Text = "매출"; // // 매출입력 // this.매출입력.Name = "매출입력"; - this.매출입력.Size = new System.Drawing.Size(157, 26); + 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(157, 26); + 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(157, 26); + 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(157, 26); + 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(192, 26); + this.파트타임관리.Size = new System.Drawing.Size(154, 22); this.파트타임관리.Text = "파트타임 관리"; this.파트타임관리.Click += new System.EventHandler(this.파트타임관리ToolStripMenuItem_Click); // @@ -407,7 +407,7 @@ this.DLS, this.마크기타}); this.마크ToolStripMenuItem.Name = "마크ToolStripMenuItem"; - this.마크ToolStripMenuItem.Size = new System.Drawing.Size(53, 26); + this.마크ToolStripMenuItem.Size = new System.Drawing.Size(43, 20); this.마크ToolStripMenuItem.Text = "마크"; // // 마크설정 @@ -418,13 +418,13 @@ this.불용어, this.작업지시서}); this.마크설정.Name = "마크설정"; - this.마크설정.Size = new System.Drawing.Size(193, 26); + this.마크설정.Size = new System.Drawing.Size(180, 22); this.마크설정.Text = "설정"; // // 단축키설정 // this.단축키설정.Name = "단축키설정"; - this.단축키설정.Size = new System.Drawing.Size(172, 26); + this.단축키설정.Size = new System.Drawing.Size(138, 22); this.단축키설정.Text = "단축키"; this.단축키설정.Visible = false; this.단축키설정.Click += new System.EventHandler(this.단축키설정ToolStripMenuItem_Click); @@ -432,14 +432,14 @@ // 매크로문구 // this.매크로문구.Name = "매크로문구"; - this.매크로문구.Size = new System.Drawing.Size(172, 26); + 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(172, 26); + this.불용어.Size = new System.Drawing.Size(138, 22); this.불용어.Text = "불용어"; this.불용어.Visible = false; this.불용어.Click += new System.EventHandler(this.불용어ToolStripMenuItem_Click); @@ -447,7 +447,7 @@ // 작업지시서 // this.작업지시서.Name = "작업지시서"; - this.작업지시서.Size = new System.Drawing.Size(172, 26); + this.작업지시서.Size = new System.Drawing.Size(138, 22); this.작업지시서.Text = "작업지시서"; this.작업지시서.Visible = false; this.작업지시서.Click += new System.EventHandler(this.작업지시서ToolStripMenuItem_Click); @@ -456,6 +456,7 @@ // this.마크작업.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.마크작성, + this.신규마크작성NewToolStripMenuItem, this.마크목록, this.소장자료검색, this.마크정리, @@ -463,13 +464,13 @@ this.복본조사2, this.iSBN조회}); this.마크작업.Name = "마크작업"; - this.마크작업.Size = new System.Drawing.Size(193, 26); + this.마크작업.Size = new System.Drawing.Size(180, 22); this.마크작업.Text = "마크 작업"; // // 마크작성 // this.마크작성.Name = "마크작성"; - this.마크작성.Size = new System.Drawing.Size(192, 26); + this.마크작성.Size = new System.Drawing.Size(182, 22); this.마크작성.Text = "신규마크 작성"; this.마크작성.ToolTipText = "마크 작성(2)"; this.마크작성.Click += new System.EventHandler(this.마크작성ToolStripMenuItem_Click); @@ -477,42 +478,42 @@ // 마크목록 // this.마크목록.Name = "마크목록"; - this.마크목록.Size = new System.Drawing.Size(192, 26); + this.마크목록.Size = new System.Drawing.Size(182, 22); this.마크목록.Text = "마크 목록"; this.마크목록.Click += new System.EventHandler(this.마크목록ToolStripMenuItem_Click); // // 소장자료검색 // this.소장자료검색.Name = "소장자료검색"; - this.소장자료검색.Size = new System.Drawing.Size(192, 26); + this.소장자료검색.Size = new System.Drawing.Size(182, 22); this.소장자료검색.Text = "소장자료검색"; this.소장자료검색.Click += new System.EventHandler(this.소장자료검색ToolStripMenuItem_Click); // // 마크정리 // this.마크정리.Name = "마크정리"; - this.마크정리.Size = new System.Drawing.Size(192, 26); + this.마크정리.Size = new System.Drawing.Size(182, 22); this.마크정리.Text = "마크 정리"; this.마크정리.Click += new System.EventHandler(this.마크정리ToolStripMenuItem_Click); // // 복본조사1 // this.복본조사1.Name = "복본조사1"; - this.복본조사1.Size = new System.Drawing.Size(192, 26); + this.복본조사1.Size = new System.Drawing.Size(182, 22); this.복본조사1.Text = "복본조사"; this.복본조사1.Click += new System.EventHandler(this.복본조사ToolStripMenuItem1_Click); // // 복본조사2 // this.복본조사2.Name = "복본조사2"; - this.복본조사2.Size = new System.Drawing.Size(192, 26); + this.복본조사2.Size = new System.Drawing.Size(182, 22); this.복본조사2.Text = "복본조사(New)"; this.복본조사2.Click += new System.EventHandler(this.복본조사2_Click); // // iSBN조회 // this.iSBN조회.Name = "iSBN조회"; - this.iSBN조회.Size = new System.Drawing.Size(192, 26); + this.iSBN조회.Size = new System.Drawing.Size(182, 22); this.iSBN조회.Text = "ISBN 조회"; this.iSBN조회.Click += new System.EventHandler(this.iSBN조회ToolStripMenuItem_Click); // @@ -522,21 +523,21 @@ this.목록, this.편목}); this.dVDCDLPToolStripMenuItem.Name = "dVDCDLPToolStripMenuItem"; - this.dVDCDLPToolStripMenuItem.Size = new System.Drawing.Size(193, 26); + this.dVDCDLPToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.dVDCDLPToolStripMenuItem.Text = "DVD / CD / LP"; // // 목록 // this.목록.Enabled = false; this.목록.Name = "목록"; - this.목록.Size = new System.Drawing.Size(122, 26); + this.목록.Size = new System.Drawing.Size(98, 22); this.목록.Text = "목록"; this.목록.Click += new System.EventHandler(this.목록_Click); // // 편목 // this.편목.Name = "편목"; - this.편목.Size = new System.Drawing.Size(122, 26); + this.편목.Size = new System.Drawing.Size(98, 22); this.편목.Text = "편목"; this.편목.Click += new System.EventHandler(this.편목ToolStripMenuItem_Click); // @@ -546,20 +547,20 @@ this.마크반입, this.마크반출}); this.반입및반출.Name = "반입및반출"; - this.반입및반출.Size = new System.Drawing.Size(193, 26); + this.반입및반출.Size = new System.Drawing.Size(180, 22); this.반입및반출.Text = "반입 및 반출"; // // 마크반입 // this.마크반입.Name = "마크반입"; - this.마크반입.Size = new System.Drawing.Size(122, 26); + 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(122, 26); + this.마크반출.Size = new System.Drawing.Size(98, 22); this.마크반출.Text = "반출"; this.마크반출.Click += new System.EventHandler(this.반출ToolStripMenuItem_Click); // @@ -571,14 +572,14 @@ this.검수, this.저자기호}); this.부가기능.Name = "부가기능"; - this.부가기능.Size = new System.Drawing.Size(193, 26); + this.부가기능.Size = new System.Drawing.Size(180, 22); this.부가기능.Text = "부가기능"; // // 마크수집 // this.마크수집.Enabled = false; this.마크수집.Name = "마크수집"; - this.마크수집.Size = new System.Drawing.Size(152, 26); + this.마크수집.Size = new System.Drawing.Size(122, 22); this.마크수집.Text = "마크수집"; this.마크수집.Visible = false; this.마크수집.Click += new System.EventHandler(this.마크수집ToolStripMenuItem_Click); @@ -586,7 +587,7 @@ // 전집관리 // this.전집관리.Name = "전집관리"; - this.전집관리.Size = new System.Drawing.Size(152, 26); + this.전집관리.Size = new System.Drawing.Size(122, 22); this.전집관리.Text = "전집관리"; this.전집관리.Click += new System.EventHandler(this.전집관리ToolStripMenuItem1_Click); // @@ -594,7 +595,7 @@ // this.검수.Enabled = false; this.검수.Name = "검수"; - this.검수.Size = new System.Drawing.Size(152, 26); + this.검수.Size = new System.Drawing.Size(122, 22); this.검수.Text = "검수"; this.검수.Visible = false; this.검수.Click += new System.EventHandler(this.검수ToolStripMenuItem_Click); @@ -602,7 +603,7 @@ // 저자기호 // this.저자기호.Name = "저자기호"; - this.저자기호.Size = new System.Drawing.Size(152, 26); + this.저자기호.Size = new System.Drawing.Size(122, 22); this.저자기호.Text = "저자기호"; this.저자기호.Click += new System.EventHandler(this.저자기호ToolStripMenuItem_Click); // @@ -612,20 +613,20 @@ this.DLS조회, this.dLS복본조사}); this.DLS.Name = "DLS"; - this.DLS.Size = new System.Drawing.Size(193, 26); + this.DLS.Size = new System.Drawing.Size(180, 22); this.DLS.Text = "DLS"; // // DLS조회 // this.DLS조회.Name = "DLS조회"; - this.DLS조회.Size = new System.Drawing.Size(190, 26); + this.DLS조회.Size = new System.Drawing.Size(154, 22); this.DLS조회.Text = "DLS_조회/입력"; this.DLS조회.Click += new System.EventHandler(this.dLS조회ToolStripMenuItem_Click); // // dLS복본조사 // this.dLS복본조사.Name = "dLS복본조사"; - this.dLS복본조사.Size = new System.Drawing.Size(190, 26); + this.dLS복본조사.Size = new System.Drawing.Size(154, 22); this.dLS복본조사.Text = "DLS 복본조사"; this.dLS복본조사.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click); // @@ -636,14 +637,14 @@ this.마크통계, this.장비관리}); this.마크기타.Name = "마크기타"; - this.마크기타.Size = new System.Drawing.Size(193, 26); + this.마크기타.Size = new System.Drawing.Size(180, 22); this.마크기타.Text = "기타"; // // 서류작성 // this.서류작성.Enabled = false; this.서류작성.Name = "서류작성"; - this.서류작성.Size = new System.Drawing.Size(152, 26); + this.서류작성.Size = new System.Drawing.Size(122, 22); this.서류작성.Text = "서류작성"; this.서류작성.Visible = false; this.서류작성.Click += new System.EventHandler(this.서류작성ToolStripMenuItem_Click); @@ -651,7 +652,7 @@ // 마크통계 // this.마크통계.Name = "마크통계"; - this.마크통계.Size = new System.Drawing.Size(152, 26); + this.마크통계.Size = new System.Drawing.Size(122, 22); this.마크통계.Text = "마크통계"; this.마크통계.Click += new System.EventHandler(this.마크통계ToolStripMenuItem_Click); // @@ -659,7 +660,7 @@ // this.장비관리.Enabled = false; this.장비관리.Name = "장비관리"; - this.장비관리.Size = new System.Drawing.Size(152, 26); + this.장비관리.Size = new System.Drawing.Size(122, 22); this.장비관리.Text = "장비관리"; this.장비관리.Visible = false; this.장비관리.Click += new System.EventHandler(this.장비관리ToolStripMenuItem1_Click); @@ -668,7 +669,7 @@ // this.작업일지ToolStripMenuItem.Enabled = false; this.작업일지ToolStripMenuItem.Name = "작업일지ToolStripMenuItem"; - this.작업일지ToolStripMenuItem.Size = new System.Drawing.Size(83, 26); + this.작업일지ToolStripMenuItem.Size = new System.Drawing.Size(67, 20); this.작업일지ToolStripMenuItem.Text = "작업일지"; this.작업일지ToolStripMenuItem.Click += new System.EventHandler(this.작업일지ToolStripMenuItem_Click); // @@ -682,20 +683,20 @@ this.공지발송, this.판매}); this.편의기능ToolStripMenuItem.Name = "편의기능ToolStripMenuItem"; - this.편의기능ToolStripMenuItem.Size = new System.Drawing.Size(83, 26); + this.편의기능ToolStripMenuItem.Size = new System.Drawing.Size(67, 20); this.편의기능ToolStripMenuItem.Text = "편의기능"; // // 캘린더 // this.캘린더.Name = "캘린더"; - this.캘린더.Size = new System.Drawing.Size(152, 26); + 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(152, 26); + this.채팅.Size = new System.Drawing.Size(122, 22); this.채팅.Text = "채팅"; this.채팅.Visible = false; this.채팅.Click += new System.EventHandler(this.채팅ToolStripMenuItem_Click); @@ -703,14 +704,14 @@ // 퀵메뉴 // this.퀵메뉴.Name = "퀵메뉴"; - this.퀵메뉴.Size = new System.Drawing.Size(152, 26); + 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(152, 26); + this.게시판.Size = new System.Drawing.Size(122, 22); this.게시판.Text = "게시판"; this.게시판.Visible = false; this.게시판.Click += new System.EventHandler(this.게시판ToolStripMenuItem_Click); @@ -718,7 +719,7 @@ // 공지발송 // this.공지발송.Name = "공지발송"; - this.공지발송.Size = new System.Drawing.Size(152, 26); + this.공지발송.Size = new System.Drawing.Size(122, 22); this.공지발송.Text = "공지발송"; this.공지발송.Visible = false; this.공지발송.Click += new System.EventHandler(this.공지발송ToolStripMenuItem_Click); @@ -731,35 +732,35 @@ this.판매마감, this.회원관리}); this.판매.Name = "판매"; - this.판매.Size = new System.Drawing.Size(152, 26); + this.판매.Size = new System.Drawing.Size(122, 22); this.판매.Text = "판매"; this.판매.Visible = false; // // 판매1 // this.판매1.Name = "판매1"; - this.판매1.Size = new System.Drawing.Size(152, 26); + this.판매1.Size = new System.Drawing.Size(122, 22); this.판매1.Text = "판매"; this.판매1.Click += new System.EventHandler(this.판매ToolStripMenuItem1_Click); // // 정산 // this.정산.Name = "정산"; - this.정산.Size = new System.Drawing.Size(152, 26); + 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(152, 26); + 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(152, 26); + this.회원관리.Size = new System.Drawing.Size(122, 22); this.회원관리.Text = "회원관리"; this.회원관리.Click += new System.EventHandler(this.회원관리ToolStripMenuItem_Click); // @@ -774,7 +775,7 @@ this.일괄처리관리ToolStripMenuItem, this.btDevDb}); this.마스터ToolStripMenuItem.Name = "마스터ToolStripMenuItem"; - this.마스터ToolStripMenuItem.Size = new System.Drawing.Size(68, 26); + this.마스터ToolStripMenuItem.Size = new System.Drawing.Size(55, 20); this.마스터ToolStripMenuItem.Text = "마스터"; // // 이용자관리ToolStripMenuItem @@ -782,48 +783,48 @@ this.이용자관리ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.신규사업자등록ToolStripMenuItem}); this.이용자관리ToolStripMenuItem.Name = "이용자관리ToolStripMenuItem"; - this.이용자관리ToolStripMenuItem.Size = new System.Drawing.Size(252, 26); + this.이용자관리ToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.이용자관리ToolStripMenuItem.Text = "이용자 관리"; // // 신규사업자등록ToolStripMenuItem // this.신규사업자등록ToolStripMenuItem.Name = "신규사업자등록ToolStripMenuItem"; - this.신규사업자등록ToolStripMenuItem.Size = new System.Drawing.Size(172, 26); + this.신규사업자등록ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.신규사업자등록ToolStripMenuItem.Text = "사업자 관리"; this.신규사업자등록ToolStripMenuItem.Click += new System.EventHandler(this.신규사업자등록ToolStripMenuItem_Click); // // 공지발송ToolStripMenuItem1 // this.공지발송ToolStripMenuItem1.Name = "공지발송ToolStripMenuItem1"; - this.공지발송ToolStripMenuItem1.Size = new System.Drawing.Size(252, 26); + this.공지발송ToolStripMenuItem1.Size = new System.Drawing.Size(202, 22); this.공지발송ToolStripMenuItem1.Text = "공지 발송"; this.공지발송ToolStripMenuItem1.Click += new System.EventHandler(this.공지발송ToolStripMenuItem1_Click); // // 매출내역ToolStripMenuItem // this.매출내역ToolStripMenuItem.Name = "매출내역ToolStripMenuItem"; - this.매출내역ToolStripMenuItem.Size = new System.Drawing.Size(252, 26); + this.매출내역ToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.매출내역ToolStripMenuItem.Text = "매출내역"; this.매출내역ToolStripMenuItem.Click += new System.EventHandler(this.매출내역ToolStripMenuItem_Click); // // 이용자거래처조회ToolStripMenuItem // this.이용자거래처조회ToolStripMenuItem.Name = "이용자거래처조회ToolStripMenuItem"; - this.이용자거래처조회ToolStripMenuItem.Size = new System.Drawing.Size(252, 26); + this.이용자거래처조회ToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.이용자거래처조회ToolStripMenuItem.Text = "이용자 거래처 조회"; this.이용자거래처조회ToolStripMenuItem.Click += new System.EventHandler(this.이용자거래처조회ToolStripMenuItem_Click); // // 마크설정ToolStripMenuItem // this.마크설정ToolStripMenuItem.Name = "마크설정ToolStripMenuItem"; - this.마크설정ToolStripMenuItem.Size = new System.Drawing.Size(252, 26); + this.마크설정ToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.마크설정ToolStripMenuItem.Text = "마크설정"; this.마크설정ToolStripMenuItem.Click += new System.EventHandler(this.마크설정ToolStripMenuItem_Click); // // 일괄처리관리ToolStripMenuItem // this.일괄처리관리ToolStripMenuItem.Name = "일괄처리관리ToolStripMenuItem"; - this.일괄처리관리ToolStripMenuItem.Size = new System.Drawing.Size(252, 26); + this.일괄처리관리ToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.일괄처리관리ToolStripMenuItem.Text = "일괄처리 관리"; this.일괄처리관리ToolStripMenuItem.Click += new System.EventHandler(this.일괄처리관리ToolStripMenuItem_Click); // @@ -831,7 +832,7 @@ // this.btDevDb.ForeColor = System.Drawing.Color.Blue; this.btDevDb.Name = "btDevDb"; - this.btDevDb.Size = new System.Drawing.Size(252, 26); + this.btDevDb.Size = new System.Drawing.Size(202, 22); this.btDevDb.Text = "데이터베이스편집(개발)"; this.btDevDb.Visible = false; this.btDevDb.Click += new System.EventHandler(this.btDevDb_Click); @@ -840,7 +841,7 @@ // this.menu_allclose.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.menu_allclose.Name = "menu_allclose"; - this.menu_allclose.Size = new System.Drawing.Size(108, 26); + this.menu_allclose.Size = new System.Drawing.Size(87, 20); this.menu_allclose.Text = "전체 창 닫기"; this.menu_allclose.Click += new System.EventHandler(this.menu_allclose_Click); // @@ -861,10 +862,9 @@ this.panel1.Controls.Add(this.ShortCut2); this.panel1.Controls.Add(this.ShortCut1); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 30); - this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panel1.Location = new System.Drawing.Point(0, 24); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1902, 80); + this.panel1.Size = new System.Drawing.Size(1664, 64); this.panel1.TabIndex = 2; // // ShortCut12 @@ -873,10 +873,9 @@ this.ShortCut12.Enabled = false; this.ShortCut12.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut12.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut12.Location = new System.Drawing.Point(982, 1); - this.ShortCut12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut12.Location = new System.Drawing.Point(859, 1); this.ShortCut12.Name = "ShortCut12"; - this.ShortCut12.Size = new System.Drawing.Size(69, 75); + this.ShortCut12.Size = new System.Drawing.Size(60, 60); this.ShortCut12.TabIndex = 2; this.ShortCut12.Text = "즐겨찾기12"; this.ShortCut12.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -888,10 +887,9 @@ this.ShortCut11.Enabled = false; this.ShortCut11.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut11.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut11.Location = new System.Drawing.Point(894, 1); - this.ShortCut11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut11.Location = new System.Drawing.Point(782, 1); this.ShortCut11.Name = "ShortCut11"; - this.ShortCut11.Size = new System.Drawing.Size(69, 75); + this.ShortCut11.Size = new System.Drawing.Size(60, 60); this.ShortCut11.TabIndex = 2; this.ShortCut11.Text = "즐겨찾기11"; this.ShortCut11.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -903,10 +901,9 @@ this.ShortCut10.Enabled = false; this.ShortCut10.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut10.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut10.Location = new System.Drawing.Point(806, 1); - this.ShortCut10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut10.Location = new System.Drawing.Point(705, 1); this.ShortCut10.Name = "ShortCut10"; - this.ShortCut10.Size = new System.Drawing.Size(69, 75); + this.ShortCut10.Size = new System.Drawing.Size(60, 60); this.ShortCut10.TabIndex = 2; this.ShortCut10.Text = "즐겨찾기10"; this.ShortCut10.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -918,10 +915,9 @@ this.ShortCut9.Enabled = false; this.ShortCut9.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut9.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut9.Location = new System.Drawing.Point(718, 1); - this.ShortCut9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut9.Location = new System.Drawing.Point(628, 1); this.ShortCut9.Name = "ShortCut9"; - this.ShortCut9.Size = new System.Drawing.Size(69, 75); + this.ShortCut9.Size = new System.Drawing.Size(60, 60); this.ShortCut9.TabIndex = 2; this.ShortCut9.Text = "즐겨찾기9"; this.ShortCut9.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -933,10 +929,9 @@ this.ShortCut8.Enabled = false; this.ShortCut8.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut8.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut8.Location = new System.Drawing.Point(630, 1); - this.ShortCut8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut8.Location = new System.Drawing.Point(551, 1); this.ShortCut8.Name = "ShortCut8"; - this.ShortCut8.Size = new System.Drawing.Size(69, 75); + this.ShortCut8.Size = new System.Drawing.Size(60, 60); this.ShortCut8.TabIndex = 1; this.ShortCut8.Text = "즐겨찾기8"; this.ShortCut8.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -948,10 +943,9 @@ this.ShortCut6.Enabled = false; this.ShortCut6.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut6.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut6.Location = new System.Drawing.Point(454, 1); - this.ShortCut6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut6.Location = new System.Drawing.Point(397, 1); this.ShortCut6.Name = "ShortCut6"; - this.ShortCut6.Size = new System.Drawing.Size(69, 75); + this.ShortCut6.Size = new System.Drawing.Size(60, 60); this.ShortCut6.TabIndex = 2; this.ShortCut6.Text = "즐겨찾기6"; this.ShortCut6.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -963,10 +957,9 @@ this.ShortCut5.Enabled = false; this.ShortCut5.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut5.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut5.Location = new System.Drawing.Point(366, 1); - this.ShortCut5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut5.Location = new System.Drawing.Point(320, 1); this.ShortCut5.Name = "ShortCut5"; - this.ShortCut5.Size = new System.Drawing.Size(69, 75); + this.ShortCut5.Size = new System.Drawing.Size(60, 60); this.ShortCut5.TabIndex = 1; this.ShortCut5.Text = "즐겨찾기5"; this.ShortCut5.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -978,10 +971,9 @@ this.ShortCut7.Enabled = false; this.ShortCut7.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut7.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut7.Location = new System.Drawing.Point(542, 1); - this.ShortCut7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut7.Location = new System.Drawing.Point(474, 1); this.ShortCut7.Name = "ShortCut7"; - this.ShortCut7.Size = new System.Drawing.Size(69, 75); + this.ShortCut7.Size = new System.Drawing.Size(60, 60); this.ShortCut7.TabIndex = 0; this.ShortCut7.Text = "즐겨찾기7"; this.ShortCut7.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -993,10 +985,9 @@ this.ShortCut3.Enabled = false; this.ShortCut3.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut3.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut3.Location = new System.Drawing.Point(190, 1); - this.ShortCut3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut3.Location = new System.Drawing.Point(166, 1); this.ShortCut3.Name = "ShortCut3"; - this.ShortCut3.Size = new System.Drawing.Size(69, 75); + this.ShortCut3.Size = new System.Drawing.Size(60, 60); this.ShortCut3.TabIndex = 2; this.ShortCut3.Text = "즐겨찾기3"; this.ShortCut3.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -1008,10 +999,9 @@ this.ShortCut4.Enabled = false; this.ShortCut4.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut4.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut4.Location = new System.Drawing.Point(278, 1); - this.ShortCut4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut4.Location = new System.Drawing.Point(243, 1); this.ShortCut4.Name = "ShortCut4"; - this.ShortCut4.Size = new System.Drawing.Size(69, 75); + this.ShortCut4.Size = new System.Drawing.Size(60, 60); this.ShortCut4.TabIndex = 0; this.ShortCut4.Text = "즐겨찾기4"; this.ShortCut4.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -1023,10 +1013,9 @@ this.ShortCut2.Enabled = false; this.ShortCut2.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut2.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut2.Location = new System.Drawing.Point(102, 1); - this.ShortCut2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut2.Location = new System.Drawing.Point(89, 1); this.ShortCut2.Name = "ShortCut2"; - this.ShortCut2.Size = new System.Drawing.Size(69, 75); + this.ShortCut2.Size = new System.Drawing.Size(60, 60); this.ShortCut2.TabIndex = 1; this.ShortCut2.Text = "즐겨찾기2"; this.ShortCut2.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -1038,10 +1027,9 @@ this.ShortCut1.Enabled = false; this.ShortCut1.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.ShortCut1.ForeColor = System.Drawing.Color.Transparent; - this.ShortCut1.Location = new System.Drawing.Point(14, 1); - this.ShortCut1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ShortCut1.Location = new System.Drawing.Point(12, 1); this.ShortCut1.Name = "ShortCut1"; - this.ShortCut1.Size = new System.Drawing.Size(69, 75); + this.ShortCut1.Size = new System.Drawing.Size(60, 60); this.ShortCut1.TabIndex = 0; this.ShortCut1.Text = "즐겨찾기1"; this.ShortCut1.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -1062,58 +1050,58 @@ this.toolStripSeparator3, this.IPText, this.lblStatus}); - this.toolStrip1.Location = new System.Drawing.Point(0, 1002); + this.toolStrip1.Location = new System.Drawing.Point(0, 801); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1902, 31); + this.toolStrip1.Size = new System.Drawing.Size(1664, 25); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // // toolStripLabel2 // this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(54, 28); + this.toolStripLabel2.Size = new System.Drawing.Size(43, 22); this.toolStripLabel2.Text = "회사명"; // // VersionText // this.VersionText.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.VersionText.Name = "VersionText"; - this.VersionText.Size = new System.Drawing.Size(143, 28); + this.VersionText.Size = new System.Drawing.Size(116, 22); this.VersionText.Text = "UniMarc Ver 0.0000"; // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31); + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); // // botUserLabel // this.botUserLabel.Name = "botUserLabel"; - this.botUserLabel.Size = new System.Drawing.Size(54, 28); + this.botUserLabel.Size = new System.Drawing.Size(43, 22); this.botUserLabel.Text = "이용자"; // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); // // toolStripSeparator3 // this.toolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 31); + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); // // IPText // this.IPText.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.IPText.Name = "IPText"; - this.IPText.Size = new System.Drawing.Size(183, 28); + this.IPText.Size = new System.Drawing.Size(154, 22); this.IPText.Text = "접속 아이피 : 0.000.00.000"; // // lblStatus // this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(34, 28); + this.lblStatus.Size = new System.Drawing.Size(27, 22); this.lblStatus.Text = "WD"; // // mdiTabControl @@ -1121,40 +1109,44 @@ this.mdiTabControl.Controls.Add(this.tabPage1); this.mdiTabControl.Controls.Add(this.tabPage2); this.mdiTabControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.mdiTabControl.Location = new System.Drawing.Point(0, 110); - this.mdiTabControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.mdiTabControl.Location = new System.Drawing.Point(0, 88); this.mdiTabControl.Name = "mdiTabControl"; this.mdiTabControl.SelectedIndex = 0; - this.mdiTabControl.Size = new System.Drawing.Size(1902, 892); + this.mdiTabControl.Size = new System.Drawing.Size(1664, 713); this.mdiTabControl.TabIndex = 5; // // tabPage1 // - this.tabPage1.Location = new System.Drawing.Point(4, 25); - this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.tabPage1.Size = new System.Drawing.Size(1894, 863); + this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPage1.Size = new System.Drawing.Size(1656, 687); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "tabPage1"; this.tabPage1.UseVisualStyleBackColor = true; // // tabPage2 // - this.tabPage2.Location = new System.Drawing.Point(4, 25); - this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.tabPage2.Size = new System.Drawing.Size(1894, 871); + this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPage2.Size = new System.Drawing.Size(1656, 688); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "tabPage2"; this.tabPage2.UseVisualStyleBackColor = true; // + // 신규마크작성NewToolStripMenuItem + // + this.신규마크작성NewToolStripMenuItem.Name = "신규마크작성NewToolStripMenuItem"; + this.신규마크작성NewToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.신규마크작성NewToolStripMenuItem.Text = "신규마크 작성(New)"; + this.신규마크작성NewToolStripMenuItem.Click += new System.EventHandler(this.신규마크작성NewToolStripMenuItem_Click); + // // Main // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1902, 1033); + this.ClientSize = new System.Drawing.Size(1664, 826); this.Controls.Add(this.mdiTabControl); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.panel1); @@ -1162,7 +1154,6 @@ this.HelpButton = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "Main"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "메인"; @@ -1291,5 +1282,6 @@ private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.ToolStripMenuItem menu_allclose; + private System.Windows.Forms.ToolStripMenuItem 신규마크작성NewToolStripMenuItem; } } \ No newline at end of file diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs index bad6605..feba8aa 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -889,5 +889,10 @@ namespace WindowsFormsApp1 } } } + + private void 신규마크작성NewToolStripMenuItem_Click(object sender, EventArgs e) + { + OpenFormInTab(() => new AddMarc2(this)); + } } } \ No newline at end of file diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index 51abe60..feb15e6 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -280,6 +280,12 @@ From_User_manage_List.cs + + Form + + + AddMarc2.cs + Form @@ -1035,6 +1041,9 @@ From_User_manage_List.cs + + AddMarc2.cs + AddMarc.cs diff --git a/unimarc/unimarc/마크/AddMarc.cs b/unimarc/unimarc/마크/AddMarc.cs index 530f545..db51bc7 100644 --- a/unimarc/unimarc/마크/AddMarc.cs +++ b/unimarc/unimarc/마크/AddMarc.cs @@ -334,28 +334,7 @@ namespace UniMarc.마크 PUB.log.Add("ADDMarcUPDATE", string.Format("{0}({1}) : {2}", mUserName, mCompidx, UpCMD.Replace("\r", " ").Replace("\n", " "))); db.DB_Send_CMD_reVoid(UpCMD); } - #region UpdateSub - /// - /// 어느곳이 최근 저장인지 확인 - /// - /// 테이블명 - /// idx - /// marcChk 번호 - private int subMarcChk(string table, string midx) - { - string Area = "`marc_chk`, `marc_chk1`, `marc_chk2`"; - string cmd = db.DB_Select_Search(Area, table, "idx", midx); - string db_res = db.DB_Send_CMD_Search(cmd); - string[] chk_ary = db_res.Split('|'); - - for (int a = 0; a < chk_ary.Length; a++) - { - if (chk_ary[a] == "1") - return a; - } - return 0; - } - #endregion + /// /// 마크DB에 INSERT해주는 함수 diff --git a/unimarc/unimarc/마크/AddMarc2.Designer.cs b/unimarc/unimarc/마크/AddMarc2.Designer.cs new file mode 100644 index 0000000..8235e69 --- /dev/null +++ b/unimarc/unimarc/마크/AddMarc2.Designer.cs @@ -0,0 +1,157 @@ + +namespace UniMarc.마크 +{ + partial class AddMarc2 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btn_close = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.cb_SearchCol = new System.Windows.Forms.ComboBox(); + this.tb_Search = new System.Windows.Forms.TextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.Btn_SearchKolis = new System.Windows.Forms.Button(); + this.btn_Empty = new System.Windows.Forms.Button(); + this.marcEditorControl1 = new ExcelTest.MarcEditorControl(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.SuspendLayout(); + // + // btn_close + // + this.btn_close.Location = new System.Drawing.Point(1168, 3); + this.btn_close.Name = "btn_close"; + this.btn_close.Size = new System.Drawing.Size(77, 23); + this.btn_close.TabIndex = 381; + this.btn_close.Text = "닫 기"; + this.btn_close.UseVisualStyleBackColor = true; + this.btn_close.Click += new System.EventHandler(this.btn_close_Click); + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.Btn_SearchKolis); + this.panel1.Controls.Add(this.cb_SearchCol); + this.panel1.Controls.Add(this.btn_Empty); + this.panel1.Controls.Add(this.tb_Search); + this.panel1.Controls.Add(this.btn_close); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1324, 32); + this.panel1.TabIndex = 393; + // + // cb_SearchCol + // + this.cb_SearchCol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_SearchCol.FormattingEnabled = true; + this.cb_SearchCol.Items.AddRange(new object[] { + "ISBN", + "서명", + "저자", + "출판사"}); + this.cb_SearchCol.Location = new System.Drawing.Point(8, 5); + this.cb_SearchCol.Name = "cb_SearchCol"; + this.cb_SearchCol.Size = new System.Drawing.Size(121, 20); + this.cb_SearchCol.TabIndex = 395; + // + // tb_Search + // + this.tb_Search.Location = new System.Drawing.Point(135, 5); + this.tb_Search.Name = "tb_Search"; + this.tb_Search.Size = new System.Drawing.Size(205, 21); + this.tb_Search.TabIndex = 0; + this.tb_Search.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_ISBN_KeyDown); + // + // panel2 + // + this.panel2.Controls.Add(this.marcEditorControl1); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(0, 32); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1324, 907); + this.panel2.TabIndex = 394; + // + // Btn_SearchKolis + // + this.Btn_SearchKolis.Location = new System.Drawing.Point(1002, 3); + this.Btn_SearchKolis.Name = "Btn_SearchKolis"; + this.Btn_SearchKolis.Size = new System.Drawing.Size(77, 23); + this.Btn_SearchKolis.TabIndex = 397; + this.Btn_SearchKolis.Text = "코리스 검색"; + this.Btn_SearchKolis.UseVisualStyleBackColor = true; + this.Btn_SearchKolis.Click += new System.EventHandler(this.Btn_SearchKolis_Click); + // + // btn_Empty + // + this.btn_Empty.Location = new System.Drawing.Point(1085, 3); + this.btn_Empty.Name = "btn_Empty"; + this.btn_Empty.Size = new System.Drawing.Size(77, 23); + this.btn_Empty.TabIndex = 396; + this.btn_Empty.Text = "비 우 기"; + this.btn_Empty.UseVisualStyleBackColor = true; + this.btn_Empty.Click += new System.EventHandler(this.btn_Empty_Click); + // + // marcEditorControl1 + // + this.marcEditorControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.marcEditorControl1.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.marcEditorControl1.Location = new System.Drawing.Point(0, 0); + this.marcEditorControl1.Name = "marcEditorControl1"; + this.marcEditorControl1.Size = new System.Drawing.Size(1324, 907); + this.marcEditorControl1.TabIndex = 394; + // + // AddMarc2 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Gray; + this.ClientSize = new System.Drawing.Size(1324, 939); + this.Controls.Add(this.panel2); + this.Controls.Add(this.panel1); + this.Name = "AddMarc2"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "마크 작성(2-New)"; + this.Load += new System.EventHandler(this.AddMarc_Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + private System.Windows.Forms.Button btn_close; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.TextBox tb_Search; + private System.Windows.Forms.ComboBox cb_SearchCol; + private System.Windows.Forms.Button btn_Empty; + private System.Windows.Forms.Button Btn_SearchKolis; + private ExcelTest.MarcEditorControl marcEditorControl1; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/AddMarc2.cs b/unimarc/unimarc/마크/AddMarc2.cs new file mode 100644 index 0000000..2755b93 --- /dev/null +++ b/unimarc/unimarc/마크/AddMarc2.cs @@ -0,0 +1,573 @@ +using ExcelTest; +using SHDocVw; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using System.Windows.Forms; +using WindowsFormsApp1; + +namespace UniMarc.마크 +{ + public partial class AddMarc2 : Form + { + Helper_DB db = new Helper_DB(); + String_Text st = new String_Text(); + Help008Tag tag008 = new Help008Tag(); + public string mUserName; + public string mCompidx; + private string mOldMarc = string.Empty; + Main m; + public AddMarc2(Main _m) + { + InitializeComponent(); + m = _m; + mUserName = m.User; + mCompidx = m.com_idx; + } + + private void AddMarc_Load(object sender, EventArgs e) + { + cb_SearchCol.SelectedIndex = 0; + db.DBcon(); + TextReset(); + + marcEditorControl1.db = this.db; + marcEditorControl1.BookSaved += MarcEditorControl1_BookSaved; + marcEditorControl1.CloseButton += (s1,e1)=> { this.Close(); }; + marcEditorControl1.SetButtonKolist(false); + marcEditorControl1.SetButtonNext(false); + marcEditorControl1.SetButtonPrev(false); + } + public void SetKolisValueApply(string marc) + { + this.marcEditorControl1.SetMarcString(marc); + } + private void MarcEditorControl1_BookSaved(object sender, MarcEditorControl.BookSavedEventArgs e) + { + string tag056 = Tag056(e.DBMarc, e.griddata); + string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + string orimarc = st.made_Ori_marc(e.DBMarc).Replace(@"\", "￦"); + + if (!isMustTag(orimarc)) + { + + return; + } + var MarcText = e.DBMarc; + string midx = this.lbl_Midx; + string[] BookData = GetBookData(MarcText); + bool IsCoverDate = false; + + if (e.griddata.SaveDate != "") + { + // 마지막 수정일로부터 2일이 지났는지, 마지막 저장자가 사용자인지 확인 + TimeSpan sp = CheckDate(e.griddata.SaveDate, date); + IsCoverDate = IsCoverData(sp.Days, e.griddata.User); + //if (IsCoverDate) + // etc2.Text = etc2.Text.Replace(SaveData[0], date); + } + //else + // etc2.Text += string.Format("{0}\t{1}\n", date, mUserName); + string Table = "Marc"; + bool isUpdate; + if (lbl_Midx != "") + isUpdate = true; + else + isUpdate = false; + + var grade = int.Parse(e.griddata.Grade); + + if (isUpdate) + UpdateMarc(Table, midx, orimarc, grade, tag056, date, IsCoverDate,e.griddata); + else + InsertMarc(Table, BookData, orimarc, grade, tag056, date, e.griddata); + + MessageBox.Show("저장되었습니다.", "저장"); + } + + + private void tb_ISBN_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode != Keys.Enter) + return; + + TextReset(); + + string SearchText = tb_Search.Text; + string SearchCol = cb_SearchCol.SelectedItem.ToString(); + MarcCopySelect mcs = new MarcCopySelect(this); + mcs.Init(SearchCol, SearchText); + mcs.Show(); + } + + /// + /// ISBN 검색후 특정 마크 선택시 현재폼에 적용시키는 폼 + /// + /// 뷰형태 마크데이터 + /// ISBN + /// + /// 0:idx

+ /// 1:compidx

+ /// 2:user

+ /// 3:date

+ /// 4:grade

+ /// 5:tag008

+ /// 6:LineMarc + public void SelectMarc_Sub(string Marc, string ISBN, string[] GridData) + { + this.marcEditorControl1.LoadBookData(Marc, new MacEditorParameter + { + ISBN13 = ISBN, + SaveDate = string.Format("[{0}] [{1}]", GridData[2], GridData[3]), + Grade = GridData[4], + Remark1 = string.Empty, + Remark2 = string.Empty, + NewMake = true + }); + mOldMarc = GridData[6]; + lbl_Midx = GridData[0]; + } + string lbl_Midx = ""; + + + private void btn_close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btn_Empty_Click(object sender, EventArgs e) + { + TextReset(); + + } + + /// + /// 전체 초기화 + /// + /// 탭 컨트롤에서 사용할 경우 false + public void TextReset(bool isDelete = true) + { + if (isDelete) + { + marcEditorControl1.LoadBookData(string.Empty, new MacEditorParameter + { + ISBN13 = string.Empty, + SaveDate = string.Empty, + Remark1 = string.Empty, + Remark2 = string.Empty, + NewMake=true, + }); + } + + + } + + string TextResetSub() + { + // 입력일자 (00-05) + // 발행년유형 (6) + // 발행년1 (07-10) + // 발행년2 (11-14) + // 발행국 (15-17) + + // 삽화표시 (18-21) + // 이용대상자수준 (22) v + // 개별자료형태 (23) v + // 내용형식1 (24) v + // 내용형식2 (25) v + + // 한국대학부호 (26-27) + // 수정레코드 (28) + // 회의간행물 (29) c + // 기념논문집 (30) c + // 색인 (31) + + // 목록전거 (32) + // 문학형식 (33) v + // 전기 (34) v + // 언어 (35-37) v + // 한국정부기관부호 (38-39) + string yyMMdd = DateTime.Now.ToString("yyMMdd"); + string yyyy = DateTime.Now.ToString("yyyy"); + string Empty_008 = yyMMdd + "s" + yyyy + " 000 kor ▲"; + string Empty_text = string.Format( + $"008\t {Empty_008.Replace("▲", "")}" + + "020\t \t▼a▼c▲\n" + + "056\t \t▼a▼2▲\n" + + "100\t \t▼a▲\n" + + "245\t \t▼a▼d▲\n" + + "260\t \t▼b▲\n" + + "300\t \t▼a▼c▲\n" + + "653\t \t▼a▲\n" + + "700\t \t▼a▲\n" + + "950\t \t▼b▲\n"); + + this.marcEditorControl1.SetRemark(string.Empty, string.Empty); + return Empty_text; + } + + + #region SaveSub + + /// + /// 마크DB에 UPDATE해주는 함수 + /// + /// 테이블 이름 + /// 마크 인덱스 번호 + /// 한줄짜리 마크 + /// 마크 등급 + /// 분류기호 + /// 저장시각 yyyy-MM-dd HH:mm:ss + /// 덮어씌울지 유무 + void UpdateMarc(string Table, string MarcIndex, string oriMarc, int grade, string tag056, string date, bool IsCovertDate, MacEditorParameter param) + { + string[] EditTable = + { + "compidx", "marc", "marc_chk","marc1", "marc_chk1", "비고1", + "비고2", "division", "008tag", "date", "user", + "grade" + }; + string[] EditColumn = + { + mCompidx, oriMarc, "1",mOldMarc, "0", param.Remark1, + param.Remark2, tag056, param.text008, date, mUserName, + grade.ToString() + }; + string[] SearchTable = { "idx", "compidx" }; + string[] SearchColumn = { MarcIndex, mCompidx }; + + //int marcChk = subMarcChk(Table, MarcIndex); + //if (IsCovertDate) + // marcChk--; + + //switch (marcChk) + //{ + // case 0: + // EditTable[1] = "marc1"; + // EditTable[2] = "marc_chk1"; + // EditTable[3] = "marc_chk"; + // break; + // case 1: + // EditTable[1] = "marc2"; + // EditTable[2] = "marc_chk2"; + // EditTable[3] = "marc_chk1"; + // break; + // case 2: + // EditTable[1] = "marc"; + // EditTable[2] = "marc_chk"; + // EditTable[3] = "marc_chk2"; + // break; + // default: + // EditTable[1] = "marc"; + // EditTable[2] = "marc_chk"; + // EditTable[3] = "marc_chk2"; + // break; + //} + string UpCMD = db.More_Update(Table, EditTable, EditColumn, SearchTable, SearchColumn); + PUB.log.Add("ADDMarcUPDATE", string.Format("{0}({1}) : {2}", mUserName, mCompidx, UpCMD.Replace("\r", " ").Replace("\n", " "))); + db.DB_Send_CMD_reVoid(UpCMD); + } + + /// + /// 마크DB에 INSERT해주는 함수 + /// + /// 테이블 이름 + /// 0:ISBN 1:서명 2:저자 3:출판사 4:정가 + /// 한줄짜리 마크 + /// 마크 등급 + /// 분류기호 + /// 저장시각 yyyy-MM-dd HH:mm:ss + void InsertMarc(string Table, string[] BookData, string oriMarc, int grade, string tag056, string date, MacEditorParameter param) + { + string[] InsertTable = + { + "ISBN", "서명", "저자", "출판사", "가격", + "marc", "비고1", "비고2", "grade", "marc_chk", + "user", "division", "008tag", "date", "compidx" + }; + string[] InsertColumn = + { + BookData[0], BookData[1], BookData[2], BookData[3], BookData[4], + oriMarc, param.Remark1, param.Remark2, grade.ToString(), "1", + mUserName, tag056, param.text008, date, mCompidx + }; + + string InCMD = db.DB_INSERT(Table, InsertTable, InsertColumn); + PUB.log.Add("ADDMarcINSERT", string.Format("{0}({1}) : {2}", mUserName, mCompidx, InCMD.Replace("\r", " ").Replace("\n", " "))); + db.DB_Send_CMD_reVoid(InCMD); + } + + /// + /// 마크 저장시 사용하며, 마지막 수정일과 수정자를 가져와 덮어씌울지 백업데이터를 만들지 구분 + /// + /// 저장할 마크의 마지막 수정일 + /// 저장할 마크의 마지막 수정자 + /// 마지막 수정일로부터 2일이 지나지 않고, 마지막 수정자와 해당 유저가 동일 할 경우 True 반환 + private bool IsCoverData(int TimeSpanDaysValue, string user) + { + if (TimeSpanDaysValue < -1) + return false; + if (user != mUserName) + return false; + return true; + } + + private TimeSpan CheckDate(string LastDate, string SaveDate) + { + DateTime Last = Convert.ToDateTime(LastDate); + DateTime Save = Convert.ToDateTime(SaveDate); + + return Last - Save; + } + + + + /// + /// 필수태그 검사 + /// + /// 한줄짜리 마크 + /// 필수태그 없을시 false 반환 + private bool isMustTag(string orimarc) + { + string[] SearchTag = { "056a", "0562", "245a", "245d", "260a", "260c", "300a", "300c", "653a" }; + string[] Tag = st.Take_Tag(orimarc, SearchTag); + + int count = 0; + string msg = ""; + bool isTag = true; + foreach (string tag in Tag) + { + if (tag == "") + { + msg += SearchTag[count] + " "; + isTag = false; + } + count++; + } + if (!isTag) + { + MessageBox.Show(msg + "태그가 없습니다."); + return false; + } + + bool is1XX = false; + string[] AuthorTag = { "100a", "110a", "111a" }; + Tag = st.Take_Tag(orimarc, AuthorTag); + foreach (string author in Tag) + { + if (author != "") + is1XX = true; + } + if (!is1XX) + { + MessageBox.Show("기본표목이 존재하지않습니다."); + return false; + } + + bool is7XX = false; + AuthorTag[0] = "700a"; + AuthorTag[1] = "710a"; + AuthorTag[2] = "711a"; + Tag = st.Take_Tag(orimarc, AuthorTag); + + foreach (string author in Tag) + { + if (author != "") + is7XX = true; + } + + if (!is7XX) + { + MessageBox.Show("부출표목이 존재하지않습니다."); + return false; + } + + return true; + } + + /// + /// 관련 도서 정보를 가져옴 + /// + /// 뷰형태의 마크 + /// 0:ISBN 1:서명 2:저자 3:출판사 4:정가 + string[] GetBookData(string ViewMarc) + { + // ISBN, BookName, Author, BookComp, Price + string[] result = { "", "", "", "", "" }; + bool IsISBN = false; + string[] TargetArr = ViewMarc.Split('\n'); + foreach (string Target in TargetArr) + { + string[] tmp = Target.Replace("▲", "").Split('\t'); + // 0:ISBN 4:Price + if (tmp[0] == "020" && !IsISBN) + { + IsISBN = true; + result[0] = GetMiddelString(tmp[2], "▼a", "▼"); + result[4] = GetMiddelString(tmp[2], "▼c", "▼"); + } + + // 2:Author + if (tmp[0] == "100") + result[2] = GetMiddelString(tmp[2], "▼a", "▼"); + else if (tmp[0] == "110") + result[2] = GetMiddelString(tmp[2], "▼a", "▼"); + else if (tmp[0] == "111") + result[2] = GetMiddelString(tmp[2], "▼a", "▼"); + + // 1:BookName + if (tmp[0] == "245") + result[1] = GetMiddelString(tmp[2], "▼a", "▼"); + + // 3:BookComp + if (tmp[0] == "300") + result[3] = GetMiddelString(tmp[2], "▼b", "▼"); + } + + return result; + } + + string Tag056(string marc,MacEditorParameter param) + { + // string marc = richTextBox1.Text; + string[] temp = marc.Split('\n'); + List target = temp.ToList(); + bool isEight = false; + bool eight_chk = false; + string tag056 = string.Empty; + int count = 0; + + for (int a = 0; a < target.Count - 1; a++) + { + string[] tmp = target[a].Split('\t'); + string tag = tmp[0]; + if (tag == "") break; + int eight = Convert.ToInt32(tag.Substring(0, 3)); + if (eight == 008) + { + count = a; + eight_chk = true; + isEight = true; + } + else if (eight > 008 && !eight_chk) + { + count = a; + eight_chk = true; + } + if (tag == "056") + tag056 = GetMiddelString(tmp[2], "▼a", "▼"); + } + if (!isEight) + target.Insert(count, string.Format("{0}\t{1}\t{2}▲", "008", " ", param.text008)); + + //richTextBox1.Text = string.Join("\n", target.ToArray()); + return tag056; + } + + + + /// + /// 문자와 문자사이의 값 가져오기 + /// + /// 대상 문자열 + /// 시작 문자열 + /// 마지막 문자열 + /// 불러올 태그 번호 + /// 문자 사이값 + public string GetMiddelString(string str, string begin, string end, string TagNum = "") + { + string result = ""; + + if (string.IsNullOrEmpty(str) || str == "") + return result; + + int count = 0; + bool loop = false; + + for (int a = count; a < str.Length; a++) + { + count = str.IndexOf(begin); + if (count > -1) + { + str = str.Substring(count + begin.Length); + if (loop) + // 여러 태그들 구분을 지어줌. + result += "▽"; + + if (str.IndexOf(end) > -1) + result += str.Substring(0, str.IndexOf(end)); + else + result += str; + + result = TrimEndGubun(result, TagNum); + } + else + break; + + loop = true; + } + + return result; + } + + string TrimEndGubun(string str, string TagNum) + { + char[] gu = { '.', ',', ':', ';', '/', ' ' }; + if (TagNum == "300" || TagNum == "300a") + { + str = str.Trim(); + if (TagNum == "300a") + { + gu = new char[] { '.', ',', '=', ':', ';', '/', '+', ' ' }; + for (int i = 0; i < gu.Length; i++) + { + str = str.TrimEnd(gu[i]); + } + } + + if (str.Contains("ill.")) + return str; + if (str.Contains("p.")) + return str; + } + + if (TagNum == "710" || TagNum == "910") + return str; + + + if (TagNum == "245") gu = new char[] { '.', ':', ';', '/', ' ' }; + if (TagNum == "245a") gu = new char[] { '.', ',', '=', ':', ';', '/', ' ' }; + for (int i = 0; i < gu.Length; i++) + { + str = str.TrimEnd(gu[i]); + } + //foreach (char gubun in gu) + //{ + // if (str.Length < 1) continue; + // if (str[str.Length - 1] == gubun) + // { + // str = str.Remove(str.Length - 1); + // str = str.Trim(); + // } + //} + + return str; + } + #endregion + + + private void Btn_SearchKolis_Click(object sender, EventArgs e) + { + AddMarc_FillBlank af = new AddMarc_FillBlank(this); + af.Show(); + } + + + } +} diff --git a/unimarc/unimarc/마크/AddMarc2.resx b/unimarc/unimarc/마크/AddMarc2.resx new file mode 100644 index 0000000..c4a320a --- /dev/null +++ b/unimarc/unimarc/마크/AddMarc2.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 32 + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/AddMarc_FillBlank.cs b/unimarc/unimarc/마크/AddMarc_FillBlank.cs index 8eabe05..00dacb2 100644 --- a/unimarc/unimarc/마크/AddMarc_FillBlank.cs +++ b/unimarc/unimarc/마크/AddMarc_FillBlank.cs @@ -13,14 +13,20 @@ namespace UniMarc.마크 public partial class AddMarc_FillBlank : Form { AddMarc am; + AddMarc2 am2; public AddMarc_FillBlank(AddMarc _am) { InitializeComponent(); am = _am; } - + public AddMarc_FillBlank(AddMarc2 _am) + { + InitializeComponent(); + am2 = _am; + } private void AddMarc_FillBlank_Load(object sender, EventArgs e) { + webBrowser1.ScriptErrorsSuppressed = true; webBrowser1.Navigate("https://nl.go.kr/kolisnet/search/searchResultAllList.do?"); } @@ -108,7 +114,10 @@ namespace UniMarc.마크 if (ary[1].Length != 2) ary[1].PadRight(2); tmp += String.Join("\t", ary) + "\n"; } + if(am != null) am.richTextBox1.Text = tmp; + if(am2 != null) + am2.SetKolisValueApply(tmp); } private void Btn_Close_Click(object sender, EventArgs e) diff --git a/unimarc/unimarc/마크/MacEditorParameter.cs b/unimarc/unimarc/마크/MacEditorParameter.cs index 3f2d51b..f262dc3 100644 --- a/unimarc/unimarc/마크/MacEditorParameter.cs +++ b/unimarc/unimarc/마크/MacEditorParameter.cs @@ -20,6 +20,9 @@ namespace ExcelTest public string Remark1 { get; set; } public string Remark2 { get; set; } + public string text008 { get; set; } + public string tag056 { get; set; } + public bool NewMake { get; set; } } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc2.cs b/unimarc/unimarc/마크/Marc2.cs index 2e05f21..b81161f 100644 --- a/unimarc/unimarc/마크/Marc2.cs +++ b/unimarc/unimarc/마크/Marc2.cs @@ -585,7 +585,7 @@ namespace ExcelTest string[] Insert_col = { e.griddata.ISBN13, e.griddata.BookName, e.griddata.Author, e.griddata.Publisher, e.griddata.Price, orimarc, e.griddata.Remark1, e.griddata.Remark2, e.griddata.URL, - e.griddata.Grade, "1", mUserName, e.tag056, e.text008, + e.griddata.Grade, "1", mUserName, e.griddata.tag056, e.griddata.text008, date, mCompidx }; string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col); @@ -601,7 +601,7 @@ namespace ExcelTest "user", "grade" }; string[] Edit_col = { mCompidx, orimarc, "1", mOldMarc , "0", e.griddata.Remark1, - e.griddata.Remark2, e.griddata.URL, e.tag056,e.text008, date, + e.griddata.Remark2, e.griddata.URL, e.griddata.tag056,e.griddata.text008, date, mUserName, e.griddata.Grade }; string[] Sear_tbl = { "idx", "compidx" }; string[] Sear_col = { Midx, mCompidx }; diff --git a/unimarc/unimarc/마크/MarcCopySelect.cs b/unimarc/unimarc/마크/MarcCopySelect.cs index c131e06..26e278f 100644 --- a/unimarc/unimarc/마크/MarcCopySelect.cs +++ b/unimarc/unimarc/마크/MarcCopySelect.cs @@ -19,6 +19,7 @@ namespace UniMarc.마크 Marc m; Marc2 m2; AddMarc am; + AddMarc2 am2; CD_LP cp; public int MarcFormRowIndex; @@ -26,6 +27,12 @@ namespace UniMarc.마크 { InitializeComponent(); } + public MarcCopySelect(AddMarc2 cD) + { + InitializeComponent(); + am2 = cD; + db.DBcon(); + } public MarcCopySelect(CD_LP cD) { InitializeComponent(); @@ -426,7 +433,12 @@ namespace UniMarc.마크 string isbn = dataGridView1.Rows[row].Cells["isbn"].Value.ToString(); am.SelectMarc_Sub(Marc, isbn, GridData); } - + if (am2 != null) + { + string Marc = richTextBox1.Text; + string isbn = dataGridView1.Rows[row].Cells["isbn"].Value.ToString(); + am2.SelectMarc_Sub(Marc, isbn, GridData); + } this.Close(); } diff --git a/unimarc/unimarc/마크/MarcEditorControl.cs b/unimarc/unimarc/마크/MarcEditorControl.cs index fd21b79..93bcffc 100644 --- a/unimarc/unimarc/마크/MarcEditorControl.cs +++ b/unimarc/unimarc/마크/MarcEditorControl.cs @@ -45,7 +45,23 @@ namespace ExcelTest public event EventHandler PrevButton; public event EventHandler NextButton; public event EventHandler CloseButton; - + public void SetButtonKolist(bool enable) + { + btn_FillBlank.Enabled = enable; + btn_FillBlank.ForeColor = enable ? Color.Black : Color.DimGray; + + } + public void SetButtonPrev(bool enable) + { + btPrev.Enabled = enable; + btPrev.ForeColor = enable ? Color.Black : Color.DimGray; + } + public void SetButtonNext(bool enable) + { + btNext.Enabled = enable; + btNext.ForeColor = enable ? Color.Black : Color.DimGray; + } + public MarcEditorControl() { InitializeComponent(); @@ -288,8 +304,7 @@ namespace ExcelTest { public string SaveDate { get; set; } public string DBMarc { get; set; } - public string tag056 { get; set; } - public string text008 { get; set; } + public MacEditorParameter griddata { get; set; } } @@ -297,7 +312,7 @@ namespace ExcelTest private void Btn_Save_Click(object sender, EventArgs e) { - if (string.IsNullOrEmpty(Param.ISBN13)) + if (Param.NewMake ==false && string.IsNullOrEmpty(Param.ISBN13)) { MessageBox.Show("마크가 선택되지않았습니다."); return; @@ -342,13 +357,13 @@ namespace ExcelTest this.Param.Grade = cb_grade.SelectedIndex.ToString(); this.Param.Remark1 = etc1.Text; this.Param.Remark2 = etc2.Text; + this.Param.text008 = this.text008.Text.Trim(); + this.Param.tag056 = tag056; // Raise Event to Update List_Book in Parent BookSaved?.Invoke(this, new BookSavedEventArgs { SaveDate = date, DBMarc = orimarc, - tag056 = tag056, - text008 = text008.Text, griddata = this.Param }); } @@ -631,6 +646,11 @@ namespace ExcelTest richTextBox1.Text = result; return true; } + public void SetRemark(string remark1, string remark2) + { + etc1.Text = remark1; + etc2.Text = remark2; + } void ReadRemark() { @@ -1148,7 +1168,7 @@ namespace ExcelTest TextReset(); foreach (string Line in SplitLine) { - if (Line == "") break; + if (string.IsNullOrWhiteSpace(Line)) break; // [0]:태그번호, [1]:지시기호, [2]:마크내용 string[] SplitTag = Line.Split('\t'); diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs index 5134cfe..71ab138 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs @@ -106,7 +106,7 @@ namespace UniMarc.마크 string oriMarc = e.DBMarc; string etc1 = e.griddata.Remark1 ?? ""; string etc2 = e.griddata.Remark2 ?? ""; - string tag008 = e.text008; + string tag008 = e.griddata.text008; // 등록번호 분류기호 저자기호 볼륨 복본 // 별치 총서명 총서번호 저자 출판사 diff --git a/unimarc/unimarc/마크/Marc_memo.cs b/unimarc/unimarc/마크/Marc_memo.cs index b8bcde1..7dc4376 100644 --- a/unimarc/unimarc/마크/Marc_memo.cs +++ b/unimarc/unimarc/마크/Marc_memo.cs @@ -17,7 +17,7 @@ namespace UniMarc.마크 AddMarc am; Marc2 mae; MarcEditorControl mae2; - + AddMarc2 am2; public Marc_memo(MarcEditorControl _mae) { InitializeComponent(); @@ -38,7 +38,11 @@ namespace UniMarc.마크 InitializeComponent(); am = _am; } - + public Marc_memo(AddMarc2 _am) + { + InitializeComponent(); + am2 = _am; + } private void Marc_memo_Load(object sender, EventArgs e) { string[] com_List = diff --git a/unimarc/unimarc/마크/findNchange.cs b/unimarc/unimarc/마크/findNchange.cs index df20268..3635ab4 100644 --- a/unimarc/unimarc/마크/findNchange.cs +++ b/unimarc/unimarc/마크/findNchange.cs @@ -20,7 +20,7 @@ namespace ExcelTest string find = ""; string change = ""; String_Text st = new String_Text(); - AddMarc am; + AddMarc am; AddMarc2 am2; Marc mac; Marc_memo mmm; Marc2 mae; @@ -37,6 +37,11 @@ namespace ExcelTest InitializeComponent(); mae = _mae; } + public findNchange(AddMarc2 _am) + { + InitializeComponent(); + am2 = _am; + } public findNchange(AddMarc _am) { InitializeComponent();