diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 4fc9683..3a5952b 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs index b84f401..5f157e1 100644 --- a/unimarc/unimarc/Main.Designer.cs +++ b/unimarc/unimarc/Main.Designer.cs @@ -100,6 +100,8 @@ this.회원관리 = new System.Windows.Forms.ToolStripMenuItem(); this.마스터ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.이용자관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.신규사업자등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.기존사업자관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.공지발송ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.매출내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.이용자거래처조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -124,8 +126,6 @@ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.botUserLabel = new System.Windows.Forms.ToolStripLabel(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.신규사업자등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.기존사업자관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -164,28 +164,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); // @@ -193,14 +193,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); // @@ -208,7 +208,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); // @@ -400,35 +400,35 @@ this.불용어, this.작업지시서}); this.마크설정.Name = "마크설정"; - this.마크설정.Size = new System.Drawing.Size(142, 22); + this.마크설정.Size = new System.Drawing.Size(180, 22); this.마크설정.Text = "설정"; this.마크설정.Visible = false; // // 단축키설정 // this.단축키설정.Name = "단축키설정"; - this.단축키설정.Size = new System.Drawing.Size(138, 22); + this.단축키설정.Size = new System.Drawing.Size(180, 22); this.단축키설정.Text = "단축키"; this.단축키설정.Click += new System.EventHandler(this.단축키설정ToolStripMenuItem_Click); // // 매크로문구 // this.매크로문구.Name = "매크로문구"; - this.매크로문구.Size = new System.Drawing.Size(138, 22); + this.매크로문구.Size = new System.Drawing.Size(180, 22); this.매크로문구.Text = "매크로 문구"; this.매크로문구.Click += new System.EventHandler(this.매크로문구설정ToolStripMenuItem_Click); // // 불용어 // this.불용어.Name = "불용어"; - this.불용어.Size = new System.Drawing.Size(138, 22); + this.불용어.Size = new System.Drawing.Size(180, 22); this.불용어.Text = "불용어"; this.불용어.Click += new System.EventHandler(this.불용어ToolStripMenuItem_Click); // // 작업지시서 // this.작업지시서.Name = "작업지시서"; - this.작업지시서.Size = new System.Drawing.Size(138, 22); + this.작업지시서.Size = new System.Drawing.Size(180, 22); this.작업지시서.Text = "작업지시서"; this.작업지시서.Click += new System.EventHandler(this.작업지시서ToolStripMenuItem_Click); // @@ -441,41 +441,41 @@ this.복본조사1, this.iSBN조회}); this.마크작업.Name = "마크작업"; - this.마크작업.Size = new System.Drawing.Size(142, 22); + this.마크작업.Size = new System.Drawing.Size(180, 22); this.마크작업.Text = "마크 작업"; // // 마크목록 // this.마크목록.Name = "마크목록"; - this.마크목록.Size = new System.Drawing.Size(146, 22); + this.마크목록.Size = new System.Drawing.Size(180, 22); this.마크목록.Text = "마크 목록"; this.마크목록.Click += new System.EventHandler(this.마크목록ToolStripMenuItem_Click); // // 소장자료검색 // this.소장자료검색.Name = "소장자료검색"; - this.소장자료검색.Size = new System.Drawing.Size(146, 22); + this.소장자료검색.Size = new System.Drawing.Size(180, 22); this.소장자료검색.Text = "소장자료검색"; this.소장자료검색.Click += new System.EventHandler(this.소장자료검색ToolStripMenuItem_Click); // // 마크정리 // this.마크정리.Name = "마크정리"; - this.마크정리.Size = new System.Drawing.Size(146, 22); + this.마크정리.Size = new System.Drawing.Size(180, 22); this.마크정리.Text = "마크 정리"; this.마크정리.Click += new System.EventHandler(this.마크정리ToolStripMenuItem_Click); // // 복본조사1 // this.복본조사1.Name = "복본조사1"; - this.복본조사1.Size = new System.Drawing.Size(146, 22); + 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(146, 22); + this.iSBN조회.Size = new System.Drawing.Size(180, 22); this.iSBN조회.Text = "ISBN 조회"; this.iSBN조회.Click += new System.EventHandler(this.iSBN조회ToolStripMenuItem_Click); // @@ -485,20 +485,20 @@ this.마크반입, this.마크반출}); this.반입및반출.Name = "반입및반출"; - this.반입및반출.Size = new System.Drawing.Size(142, 22); + this.반입및반출.Size = new System.Drawing.Size(180, 22); this.반입및반출.Text = "반입 및 반출"; // // 마크반입 // this.마크반입.Name = "마크반입"; - this.마크반입.Size = new System.Drawing.Size(98, 22); + this.마크반입.Size = new System.Drawing.Size(180, 22); this.마크반입.Text = "반입"; this.마크반입.Click += new System.EventHandler(this.반입ToolStripMenuItem_Click); // // 마크반출 // this.마크반출.Name = "마크반출"; - this.마크반출.Size = new System.Drawing.Size(98, 22); + this.마크반출.Size = new System.Drawing.Size(180, 22); this.마크반출.Text = "반출"; this.마크반출.Click += new System.EventHandler(this.반출ToolStripMenuItem_Click); // @@ -510,14 +510,14 @@ this.검수, this.저자기호}); this.부가기능.Name = "부가기능"; - this.부가기능.Size = new System.Drawing.Size(142, 22); + this.부가기능.Size = new System.Drawing.Size(180, 22); this.부가기능.Text = "부가기능"; // // 마크수집 // this.마크수집.Enabled = false; this.마크수집.Name = "마크수집"; - this.마크수집.Size = new System.Drawing.Size(122, 22); + this.마크수집.Size = new System.Drawing.Size(180, 22); this.마크수집.Text = "마크수집"; this.마크수집.Visible = false; this.마크수집.Click += new System.EventHandler(this.마크수집ToolStripMenuItem_Click); @@ -525,7 +525,7 @@ // 전집관리 // this.전집관리.Name = "전집관리"; - this.전집관리.Size = new System.Drawing.Size(122, 22); + this.전집관리.Size = new System.Drawing.Size(180, 22); this.전집관리.Text = "전집관리"; this.전집관리.Click += new System.EventHandler(this.전집관리ToolStripMenuItem1_Click); // @@ -533,7 +533,7 @@ // this.검수.Enabled = false; this.검수.Name = "검수"; - this.검수.Size = new System.Drawing.Size(122, 22); + this.검수.Size = new System.Drawing.Size(180, 22); this.검수.Text = "검수"; this.검수.Visible = false; this.검수.Click += new System.EventHandler(this.검수ToolStripMenuItem_Click); @@ -541,7 +541,7 @@ // 저자기호 // this.저자기호.Name = "저자기호"; - this.저자기호.Size = new System.Drawing.Size(122, 22); + this.저자기호.Size = new System.Drawing.Size(180, 22); this.저자기호.Text = "저자기호"; this.저자기호.Click += new System.EventHandler(this.저자기호ToolStripMenuItem_Click); // @@ -551,20 +551,20 @@ this.DLS조회, this.dLS복본조사}); this.DLS.Name = "DLS"; - this.DLS.Size = new System.Drawing.Size(142, 22); + 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(154, 22); + this.DLS조회.Size = new System.Drawing.Size(180, 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(154, 22); + this.dLS복본조사.Size = new System.Drawing.Size(180, 22); this.dLS복본조사.Text = "DLS 복본조사"; this.dLS복본조사.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click); // @@ -575,14 +575,14 @@ this.마크통계, this.장비관리}); this.마크기타.Name = "마크기타"; - this.마크기타.Size = new System.Drawing.Size(142, 22); + this.마크기타.Size = new System.Drawing.Size(180, 22); this.마크기타.Text = "기타"; // // 서류작성 // this.서류작성.Enabled = false; this.서류작성.Name = "서류작성"; - this.서류작성.Size = new System.Drawing.Size(122, 22); + this.서류작성.Size = new System.Drawing.Size(180, 22); this.서류작성.Text = "서류작성"; this.서류작성.Visible = false; this.서류작성.Click += new System.EventHandler(this.서류작성ToolStripMenuItem_Click); @@ -590,7 +590,7 @@ // 마크통계 // this.마크통계.Name = "마크통계"; - this.마크통계.Size = new System.Drawing.Size(122, 22); + this.마크통계.Size = new System.Drawing.Size(180, 22); this.마크통계.Text = "마크통계"; this.마크통계.Click += new System.EventHandler(this.마크통계ToolStripMenuItem_Click); // @@ -598,7 +598,7 @@ // this.장비관리.Enabled = false; this.장비관리.Name = "장비관리"; - this.장비관리.Size = new System.Drawing.Size(122, 22); + this.장비관리.Size = new System.Drawing.Size(180, 22); this.장비관리.Text = "장비관리"; this.장비관리.Visible = false; this.장비관리.Click += new System.EventHandler(this.장비관리ToolStripMenuItem1_Click); @@ -627,14 +627,14 @@ // 캘린더 // 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.채팅.Visible = false; this.채팅.Click += new System.EventHandler(this.채팅ToolStripMenuItem_Click); @@ -642,14 +642,14 @@ // 퀵메뉴 // 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.게시판.Visible = false; this.게시판.Click += new System.EventHandler(this.게시판ToolStripMenuItem_Click); @@ -657,7 +657,7 @@ // 공지발송 // this.공지발송.Name = "공지발송"; - this.공지발송.Size = new System.Drawing.Size(180, 22); + this.공지발송.Size = new System.Drawing.Size(122, 22); this.공지발송.Text = "공지발송"; this.공지발송.Visible = false; this.공지발송.Click += new System.EventHandler(this.공지발송ToolStripMenuItem_Click); @@ -670,35 +670,35 @@ this.판매마감, this.회원관리}); this.판매.Name = "판매"; - this.판매.Size = new System.Drawing.Size(180, 22); + 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(180, 22); + 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(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.회원관리ToolStripMenuItem_Click); // @@ -721,41 +721,55 @@ this.신규사업자등록ToolStripMenuItem, this.기존사업자관리ToolStripMenuItem}); this.이용자관리ToolStripMenuItem.Name = "이용자관리ToolStripMenuItem"; - this.이용자관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.이용자관리ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.이용자관리ToolStripMenuItem.Text = "이용자 관리"; // + // 신규사업자등록ToolStripMenuItem + // + this.신규사업자등록ToolStripMenuItem.Name = "신규사업자등록ToolStripMenuItem"; + this.신규사업자등록ToolStripMenuItem.Size = new System.Drawing.Size(166, 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(166, 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(180, 22); + this.공지발송ToolStripMenuItem1.Size = new System.Drawing.Size(178, 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(180, 22); + this.매출내역ToolStripMenuItem.Size = new System.Drawing.Size(178, 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(180, 22); + this.이용자거래처조회ToolStripMenuItem.Size = new System.Drawing.Size(178, 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(180, 22); + this.마크설정ToolStripMenuItem.Size = new System.Drawing.Size(178, 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(180, 22); + this.일괄처리관리ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.일괄처리관리ToolStripMenuItem.Text = "일괄처리 관리"; this.일괄처리관리ToolStripMenuItem.Click += new System.EventHandler(this.일괄처리관리ToolStripMenuItem_Click); // @@ -786,7 +800,7 @@ this.ShortCut12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; 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.Location = new System.Drawing.Point(869, 1); + this.ShortCut12.Location = new System.Drawing.Point(859, 1); this.ShortCut12.Name = "ShortCut12"; this.ShortCut12.Size = new System.Drawing.Size(60, 60); this.ShortCut12.TabIndex = 2; @@ -799,7 +813,7 @@ // 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.Location = new System.Drawing.Point(791, 1); + this.ShortCut11.Location = new System.Drawing.Point(782, 1); this.ShortCut11.Name = "ShortCut11"; this.ShortCut11.Size = new System.Drawing.Size(60, 60); this.ShortCut11.TabIndex = 2; @@ -812,7 +826,7 @@ // 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.Location = new System.Drawing.Point(714, 1); + this.ShortCut10.Location = new System.Drawing.Point(705, 1); this.ShortCut10.Name = "ShortCut10"; this.ShortCut10.Size = new System.Drawing.Size(60, 60); this.ShortCut10.TabIndex = 2; @@ -825,7 +839,7 @@ // 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.Location = new System.Drawing.Point(636, 1); + this.ShortCut9.Location = new System.Drawing.Point(628, 1); this.ShortCut9.Name = "ShortCut9"; this.ShortCut9.Size = new System.Drawing.Size(60, 60); this.ShortCut9.TabIndex = 2; @@ -838,7 +852,7 @@ // 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.Location = new System.Drawing.Point(558, 1); + this.ShortCut8.Location = new System.Drawing.Point(551, 1); this.ShortCut8.Name = "ShortCut8"; this.ShortCut8.Size = new System.Drawing.Size(60, 60); this.ShortCut8.TabIndex = 1; @@ -851,7 +865,7 @@ // 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.Location = new System.Drawing.Point(402, 1); + this.ShortCut6.Location = new System.Drawing.Point(397, 1); this.ShortCut6.Name = "ShortCut6"; this.ShortCut6.Size = new System.Drawing.Size(60, 60); this.ShortCut6.TabIndex = 2; @@ -864,7 +878,7 @@ // 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.Location = new System.Drawing.Point(324, 1); + this.ShortCut5.Location = new System.Drawing.Point(320, 1); this.ShortCut5.Name = "ShortCut5"; this.ShortCut5.Size = new System.Drawing.Size(60, 60); this.ShortCut5.TabIndex = 1; @@ -877,7 +891,7 @@ // 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.Location = new System.Drawing.Point(480, 1); + this.ShortCut7.Location = new System.Drawing.Point(474, 1); this.ShortCut7.Name = "ShortCut7"; this.ShortCut7.Size = new System.Drawing.Size(60, 60); this.ShortCut7.TabIndex = 0; @@ -890,7 +904,7 @@ // 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.Location = new System.Drawing.Point(168, 1); + this.ShortCut3.Location = new System.Drawing.Point(166, 1); this.ShortCut3.Name = "ShortCut3"; this.ShortCut3.Size = new System.Drawing.Size(60, 60); this.ShortCut3.TabIndex = 2; @@ -903,7 +917,7 @@ // 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.Location = new System.Drawing.Point(246, 1); + this.ShortCut4.Location = new System.Drawing.Point(243, 1); this.ShortCut4.Name = "ShortCut4"; this.ShortCut4.Size = new System.Drawing.Size(60, 60); this.ShortCut4.TabIndex = 0; @@ -916,7 +930,7 @@ // 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.Location = new System.Drawing.Point(90, 1); + this.ShortCut2.Location = new System.Drawing.Point(89, 1); this.ShortCut2.Name = "ShortCut2"; this.ShortCut2.Size = new System.Drawing.Size(60, 60); this.ShortCut2.TabIndex = 1; @@ -977,20 +991,6 @@ this.botUserLabel.Size = new System.Drawing.Size(43, 22); this.botUserLabel.Text = "이용자"; // - // 신규사업자등록ToolStripMenuItem - // - this.신규사업자등록ToolStripMenuItem.Name = "신규사업자등록ToolStripMenuItem"; - this.신규사업자등록ToolStripMenuItem.Size = new System.Drawing.Size(180, 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(180, 22); - this.기존사업자관리ToolStripMenuItem.Text = "기존 사업자 관리"; - this.기존사업자관리ToolStripMenuItem.Click += new System.EventHandler(this.기존사업자관리ToolStripMenuItem_Click); - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index ebbd38f..995083b 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -285,6 +285,12 @@ Search_Infor_Sub.cs + + Form + + + ShowDeleteMarc.cs + Form @@ -822,6 +828,9 @@ Search_Infor_Sub.cs + + ShowDeleteMarc.cs + Zoom_Picture.cs diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 12adbdb..be1cddd 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb index f27afb4..38faff0 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll index 8a43c5f..9d84cde 100644 Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 3bbe158..1a5052d 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 483885c..cca7e0f 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll b/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll index 5cb26f5..c4d7d95 100644 Binary files a/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll and b/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache index 6019835..f5e894a 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache index aa4a2ff..6e779c9 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1fd060b5ba68124a025af15107f533baf35268ce +1ecfc96fa7aa0f793ee63064b7359ce4e043fc6d diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt index f626f6f..6a6846f 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt @@ -134,3 +134,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크. C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.MarcCopySelect.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Mac_List_Add.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_Plan_PrintLabel.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.ShowDeleteMarc.resources diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index 06ebbd3..3783035 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache index 4131a87..b4feb23 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.ResolveComReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 12adbdb..be1cddd 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb index f27afb4..38faff0 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.마크.ShowDeleteMarc.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.ShowDeleteMarc.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.ShowDeleteMarc.resources differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index 8a43c5f..9d84cde 100644 Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/마크/Check_ISBN_Sub.Designer.cs b/unimarc/unimarc/마크/Check_ISBN_Sub.Designer.cs index b8f7da2..0292469 100644 --- a/unimarc/unimarc/마크/Check_ISBN_Sub.Designer.cs +++ b/unimarc/unimarc/마크/Check_ISBN_Sub.Designer.cs @@ -259,6 +259,7 @@ namespace WindowsFormsApp1.마크 this.Controls.Add(this.tb_author); this.Controls.Add(this.tb_book_name); this.Name = "Check_ISBN_Sub"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "ISBN 상세 조회"; this.Load += new System.EventHandler(this.Check_ISBN_Sub_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); diff --git a/unimarc/unimarc/마크/DLS_Manage.Designer.cs b/unimarc/unimarc/마크/DLS_Manage.Designer.cs index 3cfd001..c8affa8 100644 --- a/unimarc/unimarc/마크/DLS_Manage.Designer.cs +++ b/unimarc/unimarc/마크/DLS_Manage.Designer.cs @@ -29,35 +29,25 @@ namespace UniMarc.마크 /// private void InitializeComponent() { - this.btn_ImageDown = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); this.textBox1 = new System.Windows.Forms.TextBox(); this.webBrowser1 = new System.Windows.Forms.WebBrowser(); this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); + this.btn_Close = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); this.SuspendLayout(); // - // btn_ImageDown - // - this.btn_ImageDown.Location = new System.Drawing.Point(854, 8); - this.btn_ImageDown.Name = "btn_ImageDown"; - this.btn_ImageDown.Size = new System.Drawing.Size(103, 27); - this.btn_ImageDown.TabIndex = 1; - this.btn_ImageDown.Text = "이미지다운"; - this.btn_ImageDown.UseVisualStyleBackColor = true; - this.btn_ImageDown.Click += new System.EventHandler(this.btn_ImageDown_Click); - // // panel1 // + this.panel1.Controls.Add(this.btn_Close); this.panel1.Controls.Add(this.textBox1); - this.panel1.Controls.Add(this.btn_ImageDown); 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(968, 42); + this.panel1.Size = new System.Drawing.Size(1104, 42); this.panel1.TabIndex = 4; // // textBox1 @@ -66,6 +56,7 @@ namespace UniMarc.마크 this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(366, 21); this.textBox1.TabIndex = 2; + this.textBox1.Click += new System.EventHandler(this.textBox1_Click); // // webBrowser1 // @@ -73,7 +64,7 @@ namespace UniMarc.마크 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(968, 623); + this.webBrowser1.Size = new System.Drawing.Size(1104, 866); this.webBrowser1.TabIndex = 0; this.webBrowser1.DocumentCompleted += new System.Windows.Forms.WebBrowserDocumentCompletedEventHandler(this.webBrowser1_DocumentCompleted); // @@ -84,7 +75,7 @@ namespace UniMarc.마크 this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(968, 665); + this.panel2.Size = new System.Drawing.Size(1104, 908); this.panel2.TabIndex = 5; // // panel3 @@ -93,16 +84,27 @@ namespace UniMarc.마크 this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Location = new System.Drawing.Point(0, 42); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(968, 623); + this.panel3.Size = new System.Drawing.Size(1104, 866); this.panel3.TabIndex = 5; // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(989, 8); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(103, 27); + this.btn_Close.TabIndex = 3; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // // DLS_Manage // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(968, 665); + this.ClientSize = new System.Drawing.Size(1104, 908); this.Controls.Add(this.panel2); this.Name = "DLS_Manage"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "DLS_Manage"; this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); @@ -113,11 +115,11 @@ namespace UniMarc.마크 } #endregion - private System.Windows.Forms.Button btn_ImageDown; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.TextBox textBox1; public System.Windows.Forms.WebBrowser webBrowser1; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Button btn_Close; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/DLS_Manage.cs b/unimarc/unimarc/마크/DLS_Manage.cs index 1a12ad3..fa62d68 100644 --- a/unimarc/unimarc/마크/DLS_Manage.cs +++ b/unimarc/unimarc/마크/DLS_Manage.cs @@ -5,6 +5,7 @@ using System.Data; using System.Drawing; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows.Forms; @@ -24,22 +25,32 @@ namespace UniMarc.마크 private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e) { this.Text = webBrowser1.Url.ToString(); + if (webBrowser1.Url.ToString() == "about:blank") this.Close(); } - private void btn_ImageDown_Click(object sender, EventArgs e) + private void textBox1_Click(object sender, EventArgs e) { string isbn = ""; + foreach (HtmlElement he in webBrowser1.Document.GetElementsByTagName("input")) { if (he.Id == "isbn_issn") isbn = he.GetAttribute("value"); } if (isbn == "") return; + string isbn3 = isbn.Substring(10); string url = string.Format("http://image.kyobobook.co.kr/images/book/xlarge/{0}/x{1}.jpg", isbn3, isbn); textBox1.Text = url; + + ((TextBox)sender).SelectAll(); + } + + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); } } } diff --git a/unimarc/unimarc/마크/Mac_Stat.Designer.cs b/unimarc/unimarc/마크/Mac_Stat.Designer.cs index 09d0341..7688162 100644 --- a/unimarc/unimarc/마크/Mac_Stat.Designer.cs +++ b/unimarc/unimarc/마크/Mac_Stat.Designer.cs @@ -86,7 +86,7 @@ this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1130, 461); + this.dataGridView1.Size = new System.Drawing.Size(1100, 461); this.dataGridView1.TabIndex = 8; this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // @@ -155,12 +155,12 @@ 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(1130, 34); + this.panel2.Size = new System.Drawing.Size(1100, 34); this.panel2.TabIndex = 7; // // btn_Close // - this.btn_Close.Location = new System.Drawing.Point(1021, 5); + this.btn_Close.Location = new System.Drawing.Point(1018, 5); this.btn_Close.Name = "btn_Close"; this.btn_Close.Size = new System.Drawing.Size(75, 23); this.btn_Close.TabIndex = 222; @@ -170,7 +170,7 @@ // // btn_Lookup // - this.btn_Lookup.Location = new System.Drawing.Point(859, 5); + this.btn_Lookup.Location = new System.Drawing.Point(862, 5); this.btn_Lookup.Name = "btn_Lookup"; this.btn_Lookup.Size = new System.Drawing.Size(75, 23); this.btn_Lookup.TabIndex = 222; @@ -296,14 +296,14 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 34); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1130, 461); + this.panel1.Size = new System.Drawing.Size(1100, 461); this.panel1.TabIndex = 9; // // Mac_Stat // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1130, 495); + this.ClientSize = new System.Drawing.Size(1100, 495); this.Controls.Add(this.panel1); this.Controls.Add(this.panel2); this.Name = "Mac_Stat"; diff --git a/unimarc/unimarc/마크/Mac_Stat.cs b/unimarc/unimarc/마크/Mac_Stat.cs index 2fd2520..44c8e94 100644 --- a/unimarc/unimarc/마크/Mac_Stat.cs +++ b/unimarc/unimarc/마크/Mac_Stat.cs @@ -56,7 +56,6 @@ namespace WindowsFormsApp1.Mac private void btn_Lookup_Click(object sender, EventArgs e) { - dataGridView1.Rows.Clear(); string cmd = Make_CMD(); string res = db.DB_Send_CMD_Search(cmd); @@ -80,7 +79,7 @@ namespace WindowsFormsApp1.Mac } } } - #region Button1_Click_Sub + #region btn_Lookup_Sub /// /// 필터링을 하면서 DB에 건네줄 CMD를 만들어냄 /// diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 4ffbca0..49e21b3 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -112,7 +112,11 @@ namespace ExcelTest lbl_BookList.Text = value; - string cmd = db.More_DB_Search("Obj_List_Book", sear_tbl, sear_col, Area); + string cmd = //db.More_DB_Search("Obj_List_Book", sear_tbl, sear_col, Area); + string.Format("SELECT {0} " + + "FROM {1} " + + "WHERE `{2}` = \"{5}\" AND `{3}` = \"{6}\" AND `{4}` =\"{7}\" " + + "ORDER BY `idx` ASC;", Area, "Obj_List_Book", sear_tbl[0], sear_tbl[1], sear_tbl[2], sear_col[0], sear_col[1], sear_col[2]); string db_res = db.DB_Send_CMD_Search(cmd); string[] db_data = db_res.Split('|'); @@ -867,7 +871,7 @@ namespace ExcelTest if (CountResult == "") btn_CopySelect.Text = "0"; - if (CountResult == "0" || CountResult == "1") { + if (CountResult == "0") { btn_CopySelect.Enabled = false; btn_CopySelect.BackColor = Color.Silver; } @@ -1028,7 +1032,10 @@ namespace ExcelTest string isbn3 = isbn.Substring(isbn.Length - 3, 3); pictureBox1.ImageLocation = "http://image.kyobobook.co.kr/images/book/xlarge/" + isbn3 + "/x" + isbn + ".jpg"; } - catch { } + catch + { + pictureBox1.Image = null; + } } private string Make_Empty() { @@ -1143,7 +1150,6 @@ namespace ExcelTest comboBox5.SelectedIndex = tag008.Biography_008(Tag008[17]); // 전기 comboBox6.SelectedIndex = tag008.Language_008(Tag008[18]); // 언어 - checkBox1.Checked = tag008.CheckBox_008(Tag008[12]); // 회의간행물 checkBox2.Checked = tag008.CheckBox_008(Tag008[13]); // 기념논문집 @@ -1643,6 +1649,7 @@ namespace ExcelTest st.Color_change("▲", richTextBox1); break; case 1: // 메모장 -> 칸채우기 + // 칸을 채우기 전에 텍스트박스와 그리드뷰를 비움. TextReset(); foreach (string Line in SplitLine) { @@ -1862,7 +1869,6 @@ namespace ExcelTest if (GridView490.Rows[count].Cells["text490a"].Value == null && GridView490.Rows[count].Cells["text490v"].Value == null) { - GridView490.Rows[count].Cells["text490a"].Value = Grid[0]; GridView490.Rows[count].Cells["text490v"].Value = Grid[1]; break; @@ -1884,26 +1890,59 @@ namespace ExcelTest string d = GetMiddelString(SplitTag, "▼d", "▼"); 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[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; - } - } + // 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[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; + // } + // } + InputGrid505(SplitTag); //GridView505.Rows.Add(Grid); text505a.Text = a; } + + + private void InputGrid505(string Tag505) + { + string[] Split505 = Tag505.Split('▼'); + + string[] grid = { "", "", "", "" }; // n t d e + string[] clear = { "", "", "", "" }; + char[] Symbol = { 'n', 't', 'd', 'e' }; + int row = 0; + int Before = -1; + int After = -1; + + foreach (string Tag in Split505) + { + if (Tag == "") continue; + Before = After; + for (int a = 0; a < Symbol.Length; a++) + { + if (Tag[0] == Symbol[a]) { + After = a; + break; + } + } + + if (Before >= After) + row++; + + GridView505.Rows[row].Cells[After].Value = Tag.TrimStart(Symbol); + } + + } #endregion #region Text_Input @@ -2166,6 +2205,7 @@ namespace ExcelTest /// 대상 문자열 /// 시작 문자열 /// 마지막 문자열 + /// 불러올 태그 번호 /// 문자 사이값 public string GetMiddelString(string str, string begin, string end, string TagNum = "") { @@ -2184,7 +2224,7 @@ namespace ExcelTest { str = str.Substring(count + begin.Length); if (loop) - //result += "♠"; + // 여러 태그들 구분을 지어줌. result += "▽"; if (str.IndexOf(end) > -1) @@ -2193,10 +2233,10 @@ namespace ExcelTest result += str; result = TrimEndGubun(result, TagNum); - } else break; + loop = true; } @@ -2253,14 +2293,16 @@ namespace ExcelTest "940" }; - List RemainTag = new List(); - List BlankTag = MakeMarcLine(); // 칸채우기의 값들이 여기로 저장이 되어 들어옴 - List TextTag = SplitTag.ToList(); + List RemainTag = new List(); // 메모장으로 출력되는 최종 리스트 - List AllTag = new List(); + List BlankTag = MakeMarcLine(); // 칸채우기의 값들이 여기로 저장이 되어 들어옴 + List TextTag = SplitTag.ToList(); // 칸채우기에 없는 값들이 여기로 저장되어있음. + List AllTag = new List(); // 칸채우기와 나머지 값들을 짱뽕시킨 짬통 리스트 AllTag.AddRange(BlankTag); AllTag.AddRange(TextTag); + AllTag.Sort(); + foreach (string Content in AllTag) { if (Content == "") @@ -2317,6 +2359,7 @@ namespace ExcelTest RemainTag = RemainTag.Distinct().ToList(); + richTextBox1.Text = string.Join("\n", RemainTag); } @@ -2620,11 +2663,11 @@ namespace ExcelTest private string Grid505Insert(DataGridView dgv) { int count = dgv.Rows.Count - 1; - string result = ""; + string result = string.Format("505\t 0\t"); for (int a = 0; a < count; a++) { - if (dgv.Rows[a].Cells[0].Value == null) + if (dgv.Rows[a].Cells[1].Value == null) break; string n505; @@ -2633,31 +2676,25 @@ namespace ExcelTest 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); - + if (n505 != "") result += "▼n" + n505; if (t505 != "") result += "▼t" + t505; if (d505 != "") result += "▼d" + d505; if (e505 != "") result += "▼e" + e505; @@ -2666,7 +2703,6 @@ namespace ExcelTest result += "▲\n"; } - return result; } diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index b098831..f41183f 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -120,10 +120,6 @@ this.groupBox10 = new System.Windows.Forms.GroupBox(); this.text505a = new System.Windows.Forms.TextBox(); this.GridView505 = new System.Windows.Forms.DataGridView(); - this.text505n = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.text505t = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.text505d = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.text505e = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label42 = new System.Windows.Forms.Label(); this.label45 = new System.Windows.Forms.Label(); this.label41 = new System.Windows.Forms.Label(); @@ -250,6 +246,10 @@ this.lbl_SaveData = new System.Windows.Forms.Label(); this.lbl_ISBN = new System.Windows.Forms.Label(); this.lbl_BookList = new System.Windows.Forms.Label(); + this.text505n = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.text505t = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.text505d = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.text505e = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.List_Book)).BeginInit(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -901,7 +901,7 @@ this.panel1.Controls.Add(this.comboBox8); this.panel1.Location = new System.Drawing.Point(12, 36); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(502, 35); + this.panel1.Size = new System.Drawing.Size(508, 35); this.panel1.TabIndex = 226; // // btn_CopySelect @@ -930,7 +930,7 @@ // this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel2.Controls.Add(this.btn_mk_marcList); - this.panel2.Location = new System.Drawing.Point(404, -1); + this.panel2.Location = new System.Drawing.Point(409, -1); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(98, 35); this.panel2.TabIndex = 228; @@ -1177,27 +1177,6 @@ this.GridView505.TabIndex = 246; this.GridView505.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GridView_KeyDown); // - // text505n - // - this.text505n.HeaderText = "505n"; - this.text505n.Name = "text505n"; - this.text505n.Width = 50; - // - // text505t - // - this.text505t.HeaderText = "505t"; - this.text505t.Name = "text505t"; - // - // text505d - // - this.text505d.HeaderText = "505d"; - this.text505d.Name = "text505d"; - // - // text505e - // - this.text505e.HeaderText = "505e"; - this.text505e.Name = "text505e"; - // // label42 // this.label42.AutoSize = true; @@ -2507,6 +2486,28 @@ this.lbl_BookList.TabIndex = 33; this.lbl_BookList.Text = " "; // + // text505n + // + this.text505n.HeaderText = "505n"; + this.text505n.Name = "text505n"; + this.text505n.Width = 50; + // + // text505t + // + this.text505t.HeaderText = "505t"; + this.text505t.Name = "text505t"; + this.text505t.Width = 130; + // + // text505d + // + this.text505d.HeaderText = "505d"; + this.text505d.Name = "text505d"; + // + // text505e + // + this.text505e.HeaderText = "505e"; + this.text505e.Name = "text505e"; + // // Marc // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -2661,10 +2662,6 @@ private System.Windows.Forms.GroupBox groupBox10; private System.Windows.Forms.TextBox text505a; private System.Windows.Forms.DataGridView GridView505; - private System.Windows.Forms.DataGridViewTextBoxColumn text505n; - private System.Windows.Forms.DataGridViewTextBoxColumn text505t; - private System.Windows.Forms.DataGridViewTextBoxColumn text505d; - private System.Windows.Forms.DataGridViewTextBoxColumn text505e; private System.Windows.Forms.Label label42; private System.Windows.Forms.Label label45; private System.Windows.Forms.Label label41; @@ -2813,5 +2810,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn SaveDate; private System.Windows.Forms.Button btn_CopySelect; public System.Windows.Forms.Label lbl_BookList; + private System.Windows.Forms.DataGridViewTextBoxColumn text505n; + private System.Windows.Forms.DataGridViewTextBoxColumn text505t; + private System.Windows.Forms.DataGridViewTextBoxColumn text505d; + private System.Windows.Forms.DataGridViewTextBoxColumn text505e; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/MarcCopySelect.Designer.cs b/unimarc/unimarc/마크/MarcCopySelect.Designer.cs index f1b1476..512460a 100644 --- a/unimarc/unimarc/마크/MarcCopySelect.Designer.cs +++ b/unimarc/unimarc/마크/MarcCopySelect.Designer.cs @@ -29,7 +29,7 @@ namespace UniMarc.마크 /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.compidx = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -41,9 +41,14 @@ namespace UniMarc.마크 this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.btn_Delete = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.btn_ShowDeleteMarc = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); + this.panel3.SuspendLayout(); this.SuspendLayout(); // // dataGridView1 @@ -51,14 +56,14 @@ namespace UniMarc.마크 this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, @@ -73,7 +78,7 @@ namespace UniMarc.마크 this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(718, 135); + this.dataGridView1.Size = new System.Drawing.Size(720, 106); this.dataGridView1.TabIndex = 0; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); @@ -132,20 +137,22 @@ namespace UniMarc.마크 // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.dataGridView1); + this.panel1.Controls.Add(this.btn_ShowDeleteMarc); + this.panel1.Controls.Add(this.btn_Close); + this.panel1.Controls.Add(this.btn_Delete); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(720, 137); + this.panel1.Size = new System.Drawing.Size(720, 33); this.panel1.TabIndex = 1; // // panel2 // - this.panel2.Controls.Add(this.richTextBox1); - this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(0, 137); + this.panel2.Controls.Add(this.dataGridView1); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 33); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(720, 542); + this.panel2.Size = new System.Drawing.Size(720, 106); this.panel2.TabIndex = 2; // // richTextBox1 @@ -156,15 +163,55 @@ namespace UniMarc.마크 this.richTextBox1.Font = new System.Drawing.Font("굴림체", 11.25F); this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(720, 542); + this.richTextBox1.Size = new System.Drawing.Size(720, 540); this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; // + // panel3 + // + this.panel3.Controls.Add(this.richTextBox1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 139); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(720, 540); + this.panel3.TabIndex = 3; + // + // btn_Delete + // + this.btn_Delete.Location = new System.Drawing.Point(561, 4); + this.btn_Delete.Name = "btn_Delete"; + this.btn_Delete.Size = new System.Drawing.Size(75, 23); + this.btn_Delete.TabIndex = 0; + this.btn_Delete.Text = "마크 삭제"; + this.btn_Delete.UseVisualStyleBackColor = true; + this.btn_Delete.Click += new System.EventHandler(this.btn_Delete_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(639, 4); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(75, 23); + this.btn_Close.TabIndex = 0; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // btn_ShowDeleteMarc + // + this.btn_ShowDeleteMarc.Location = new System.Drawing.Point(462, 4); + this.btn_ShowDeleteMarc.Name = "btn_ShowDeleteMarc"; + this.btn_ShowDeleteMarc.Size = new System.Drawing.Size(93, 23); + this.btn_ShowDeleteMarc.TabIndex = 1; + this.btn_ShowDeleteMarc.Text = "삭제 마크 확인"; + this.btn_ShowDeleteMarc.UseVisualStyleBackColor = true; + this.btn_ShowDeleteMarc.Click += new System.EventHandler(this.btn_ShowDeleteMarc_Click); + // // MarcCopySelect // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(720, 679); + this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); this.Name = "MarcCopySelect"; @@ -172,6 +219,7 @@ namespace UniMarc.마크 ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel1.ResumeLayout(false); this.panel2.ResumeLayout(false); + this.panel3.ResumeLayout(false); this.ResumeLayout(false); } @@ -189,5 +237,9 @@ namespace UniMarc.마크 private System.Windows.Forms.DataGridViewTextBoxColumn grade; private System.Windows.Forms.DataGridViewTextBoxColumn tag008; private System.Windows.Forms.DataGridViewTextBoxColumn marc; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.Button btn_Delete; + private System.Windows.Forms.Button btn_ShowDeleteMarc; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/MarcCopySelect.cs b/unimarc/unimarc/마크/MarcCopySelect.cs index 5abc93c..1fe6efa 100644 --- a/unimarc/unimarc/마크/MarcCopySelect.cs +++ b/unimarc/unimarc/마크/MarcCopySelect.cs @@ -179,6 +179,8 @@ namespace UniMarc.마크 String_Text st = new String_Text(); int row = e.RowIndex; + if (row < 0) return; + view_Marc(row); st.Color_change("▼", richTextBox1); @@ -256,5 +258,79 @@ namespace UniMarc.마크 this.Close(); } + + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btn_Delete_Click(object sender, EventArgs e) + { + if (dataGridView1.CurrentCell.RowIndex < -1) + return; + + int row = dataGridView1.CurrentCell.RowIndex; + + string idx = dataGridView1.Rows[row].Cells["idx"].Value.ToString(); + + string User = Properties.Settings.Default.User; + string compidx = Properties.Settings.Default.compidx; + string NowDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + string SelectArea = "`compidx`, `grade`, `ISBN`, `서명`, `총서명`, " + + "`저자`, `출판사`, `출판년월`, `가격`, `008tag`, " + + "`division`, `user`, `비고1`, `비고2`, `url`, " + + "`marc`, `marc_chk`, `marc1`, `marc_chk1`, `marc2`, `marc_chk2`"; + + string SelectCMD = string.Format("SELECT {0} FROM {1} WHERE `idx` = {2};", SelectArea, "Marc", idx); + string SelectRes = db.self_Made_Cmd(SelectCMD); + string[] SelectAry = SelectRes.Split('|'); + + if (SelectAry[0] != compidx) + { + MessageBox.Show("해당 마크를 삭제할 권한이 없습니다.", "삭제"); + return; + } + + if (MessageBox.Show("삭제하시겠습니까?", "삭제!", MessageBoxButtons.OKCancel) == DialogResult.Cancel) + return; + + string[] InsertCol = { + "compidx", "grade", "ISBN", "서명", "총서명", + "저자", "출판사", "출판년월", "가격", "008tag", + "division", "user", "비고1", "비고2", "url", + "date", "user_Del", "marc" + }; + + string marc = ""; + + if (SelectAry[16] == "1") + marc = SelectAry[15]; + else if (SelectAry[18] == "1") + marc = SelectAry[17]; + else if (SelectAry[20] == "1") + marc = SelectAry[19]; + + string[] InsertData = { + SelectAry[0], SelectAry[1], SelectAry[2], SelectAry[3], SelectAry[4], + SelectAry[5], SelectAry[6], SelectAry[7], SelectAry[8], SelectAry[9], + SelectAry[10], SelectAry[11], SelectAry[12], SelectAry[13], SelectAry[14], + NowDate, User, marc + }; + + string InsertCmd = db.DB_INSERT("Marc_Del", InsertCol, InsertData); + db.DB_Send_CMD_reVoid(InsertCmd); + + string DeleteCmd = string.Format("DELETE FROM `Marc` WHERE `idx` = {0};", idx); + db.DB_Send_CMD_reVoid(DeleteCmd); + + dataGridView1.Rows.Remove(dataGridView1.Rows[row]); + } + + private void btn_ShowDeleteMarc_Click(object sender, EventArgs e) + { + ShowDeleteMarc showDeleteMarc = new ShowDeleteMarc(); + showDeleteMarc.Show(); + } } } diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs index 241785e..0098f03 100644 --- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs @@ -302,7 +302,7 @@ // // btn_ChangeTag // - this.btn_ChangeTag.Location = new System.Drawing.Point(317, 2); + this.btn_ChangeTag.Location = new System.Drawing.Point(322, 2); this.btn_ChangeTag.Name = "btn_ChangeTag"; this.btn_ChangeTag.Size = new System.Drawing.Size(86, 23); this.btn_ChangeTag.TabIndex = 5; diff --git a/unimarc/unimarc/마크/ShowDeleteMarc.Designer.cs b/unimarc/unimarc/마크/ShowDeleteMarc.Designer.cs new file mode 100644 index 0000000..bdd4881 --- /dev/null +++ b/unimarc/unimarc/마크/ShowDeleteMarc.Designer.cs @@ -0,0 +1,201 @@ + +namespace UniMarc.마크 +{ + partial class ShowDeleteMarc + { + /// + /// 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() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + this.btn_Close = new System.Windows.Forms.Button(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.user = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.BookName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Author = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.BookComp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.SuspendLayout(); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(1008, 5); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(75, 23); + this.btn_Close.TabIndex = 0; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // dataGridView1 + // + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.idx, + this.grade, + this.user, + this.date, + this.ISBN, + this.BookName, + this.Author, + this.BookComp, + this.Price, + this.marc}); + this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView1.Location = new System.Drawing.Point(0, 0); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(1095, 579); + this.dataGridView1.TabIndex = 1; + this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); + // + // panel1 + // + 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(1095, 32); + this.panel1.TabIndex = 2; + // + // panel2 + // + this.panel2.Controls.Add(this.dataGridView1); + 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(1095, 579); + this.panel2.TabIndex = 2; + // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; + // + // grade + // + this.grade.HeaderText = "등급"; + this.grade.Name = "grade"; + this.grade.Width = 55; + // + // user + // + this.user.HeaderText = "삭제한 사람"; + this.user.Name = "user"; + // + // date + // + this.date.HeaderText = "삭제시점"; + this.date.Name = "date"; + // + // ISBN + // + this.ISBN.HeaderText = "ISBN"; + this.ISBN.Name = "ISBN"; + // + // BookName + // + this.BookName.HeaderText = "도서명"; + this.BookName.Name = "BookName"; + this.BookName.Width = 200; + // + // Author + // + this.Author.HeaderText = "저자"; + this.Author.Name = "Author"; + // + // BookComp + // + this.BookComp.HeaderText = "출판사"; + this.BookComp.Name = "BookComp"; + // + // Price + // + this.Price.HeaderText = "가격"; + this.Price.Name = "Price"; + this.Price.Width = 80; + // + // marc + // + this.marc.HeaderText = "마크"; + this.marc.Name = "marc"; + this.marc.Width = 200; + // + // ShowDeleteMarc + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1095, 611); + this.Controls.Add(this.panel2); + this.Controls.Add(this.panel1); + this.Name = "ShowDeleteMarc"; + this.Text = "삭제 마크 확인"; + this.Load += new System.EventHandler(this.ShowDeleteMarc_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.DataGridViewTextBoxColumn idx; + private System.Windows.Forms.DataGridViewTextBoxColumn grade; + private System.Windows.Forms.DataGridViewTextBoxColumn user; + private System.Windows.Forms.DataGridViewTextBoxColumn date; + private System.Windows.Forms.DataGridViewTextBoxColumn ISBN; + private System.Windows.Forms.DataGridViewTextBoxColumn BookName; + private System.Windows.Forms.DataGridViewTextBoxColumn Author; + private System.Windows.Forms.DataGridViewTextBoxColumn BookComp; + private System.Windows.Forms.DataGridViewTextBoxColumn Price; + private System.Windows.Forms.DataGridViewTextBoxColumn marc; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/ShowDeleteMarc.cs b/unimarc/unimarc/마크/ShowDeleteMarc.cs new file mode 100644 index 0000000..7b1f128 --- /dev/null +++ b/unimarc/unimarc/마크/ShowDeleteMarc.cs @@ -0,0 +1,73 @@ +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 WindowsFormsApp1; + +namespace UniMarc.마크 +{ + public partial class ShowDeleteMarc : Form + { + Helper_DB db = new Helper_DB(); + + public ShowDeleteMarc() + { + InitializeComponent(); + } + + private void ShowDeleteMarc_Load(object sender, EventArgs e) + { + db.DBcon(); + + string Area = + "`idx`, `grade`, `user_Del`, `date`, `ISBN`, " + + "`서명`, `저자`, `출판사`, `가격`, `marc`"; + string compidx = Properties.Settings.Default.compidx; + string cmd = string.Format("SELECT {0} FROM {1} WHERE `compidx` = {2};", Area, "Marc_Del", compidx); + string res = db.self_Made_Cmd(cmd); + InputGrid(res); + } + + void InputGrid(string Query) + { + string[] QueryArray = Query.Split('|'); + string[] Grid = { + "", "", "", "", "", + "", "", "", "", "" }; + + int count = Grid.Length; + for (int a = 0; a < QueryArray.Length; a++) + { + if (a % count == 0) Grid[0] = QueryArray[a]; + if (a % count == 1) Grid[1] = QueryArray[a]; + if (a % count == 2) Grid[2] = QueryArray[a]; + if (a % count == 3) Grid[3] = QueryArray[a]; + if (a % count == 4) Grid[4] = QueryArray[a]; + if (a % count == 5) Grid[5] = QueryArray[a]; + if (a % count == 6) Grid[6] = QueryArray[a]; + if (a % count == 7) Grid[7] = QueryArray[a]; + if (a % count == 8) Grid[8] = QueryArray[a]; + if (a % count == 9) { + Grid[9] = QueryArray[a]; + dataGridView1.Rows.Add(Grid); + } + } + } + + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } + } +} diff --git a/unimarc/unimarc/마크/ShowDeleteMarc.resx b/unimarc/unimarc/마크/ShowDeleteMarc.resx new file mode 100644 index 0000000..2867541 --- /dev/null +++ b/unimarc/unimarc/마크/ShowDeleteMarc.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file