Gloria/Unimarc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
** ERP 작업 전면 중단 (마크우선) **
*** 마크작성 - 칸채우기 버그 수정을 위해 테스트 계정 제외하고 잠금***

1. 마크 작성
ㄴ> 저장버튼을 누를경우 저장시점에 선택되어있는 셀의 값으로 저장되는 버그 수정.
ㄴ> 마크데이터 호출 시 회사인덱스로 구분하여 호출되게 변경
ㄴ> 구분자, 종단기호 단축키 변경. (Alt 삭제)
ㄴ> 마크 오류체크 추가 ( 형식에 맞게 잘 작성이 되어있는지)
ㄴ> 008태그 입력시 발생하는 버그 수정

2. 마크 정리
ㄴ> Grid에서 수정시 마크에 바로 반영이 되게 수정
ㄴ> I로 해놨던거 L로 수정 (오타수정)
This commit is contained in:
SeungHo Yang
2022-03-02 19:03:44 +09:00
parent 00ca47fc5a
commit dc8d5424e6
16 changed files with 485 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
unimarc/.vs/unimarc/v16/.suo
View File

Binary file not shown.

22
unimarc/unimarc/Main.Designer.cs generated
View File

@@ -514,14 +514,14 @@
//
this.마크수집.Enabled = false;
this.마크수집.Name = "마크수집";
this.마크수집.Size = new System.Drawing.Size(180, 22);
this.마크수집.Size = new System.Drawing.Size(122, 22);
this.마크수집.Text = "마크수집";
this.마크수집.Click += new System.EventHandler(this.마크수집ToolStripMenuItem_Click);
//
// 전집관리
//
this.전집관리.Name = "전집관리";
this.전집관리.Size = new System.Drawing.Size(180, 22);
this.전집관리.Size = new System.Drawing.Size(122, 22);
this.전집관리.Text = "전집관리";
this.전집관리.Click += new System.EventHandler(this.전집관리ToolStripMenuItem1_Click);
//
@@ -529,14 +529,14 @@
//
this.검수.Enabled = false;
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);
//
@@ -552,14 +552,14 @@
// DLS조회
//
this.DLS조회.Name = "DLS조회";
this.DLS조회.Size = new System.Drawing.Size(180, 22);
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(180, 22);
this.dLS복본조사.Size = new System.Drawing.Size(154, 22);
this.dLS복본조사.Text = "DLS 복본조사";
this.dLS복본조사.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click);
//
@@ -575,6 +575,7 @@
//
// 서류작성
//
this.서류작성.Enabled = false;
this.서류작성.Name = "서류작성";
this.서류작성.Size = new System.Drawing.Size(180, 22);
this.서류작성.Text = "서류작성";
@@ -589,6 +590,7 @@
//
// 장비관리
//
this.장비관리.Enabled = false;
this.장비관리.Name = "장비관리";
this.장비관리.Size = new System.Drawing.Size(180, 22);
this.장비관리.Text = "장비관리";
@@ -625,7 +627,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);
@@ -640,7 +642,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);
@@ -648,7 +650,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);
@@ -661,7 +663,7 @@
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;
//

BIN
unimarc/unimarc/bin/Debug/UniMarc.exe
View File

Binary file not shown.

BIN
unimarc/unimarc/bin/Debug/UniMarc.pdb
View File

Binary file not shown.

BIN
unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll
View File

Binary file not shown.

BIN
unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
unimarc/unimarc/obj/Debug/UniMarc.exe
View File

Binary file not shown.

BIN
unimarc/unimarc/obj/Debug/UniMarc.pdb
View File

Binary file not shown.

BIN
unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll
View File

Binary file not shown.

283
unimarc/unimarc/마크/Mac_List.Designer.cs generated
View File

@@ -28,23 +28,11 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.label1 = new System.Windows.Forms.Label();
this.tb_Search = new System.Windows.Forms.TextBox();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.cb_state = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.btn_Lookup = new System.Windows.Forms.Button();
this.btn_Excel = new System.Windows.Forms.Button();
this.btn_Close = new System.Windows.Forms.Button();
this.btn_Save = new System.Windows.Forms.Button();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.btn_Merge = new System.Windows.Forms.Button();
this.btn_Progress = new System.Windows.Forms.Button();
this.btn_Completion = new System.Windows.Forms.Button();
this.btn_Delete = new System.Windows.Forms.Button();
this.btn_AddList = new System.Windows.Forms.Button();
this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.start_date = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.end_date = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -57,13 +45,25 @@
this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.check = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.cb_state = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.btn_Lookup = new System.Windows.Forms.Button();
this.btn_Excel = new System.Windows.Forms.Button();
this.btn_Close = new System.Windows.Forms.Button();
this.btn_Save = new System.Windows.Forms.Button();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.btn_Merge = new System.Windows.Forms.Button();
this.btn_Progress = new System.Windows.Forms.Button();
this.btn_Completion = new System.Windows.Forms.Button();
this.btn_Delete = new System.Windows.Forms.Button();
this.btn_AddList = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(21, 13);
this.label1.Location = new System.Drawing.Point(21, 14);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(57, 12);
this.label1.TabIndex = 5;
@@ -71,7 +71,7 @@
//
// tb_Search
//
this.tb_Search.Location = new System.Drawing.Point(80, 9);
this.tb_Search.Location = new System.Drawing.Point(80, 10);
this.tb_Search.Name = "tb_Search";
this.tb_Search.Size = new System.Drawing.Size(241, 21);
this.tb_Search.TabIndex = 6;
@@ -81,14 +81,14 @@
//
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
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;
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,
@@ -103,15 +103,15 @@
this.etc,
this.charge,
this.check});
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle4;
this.dataGridView1.Location = new System.Drawing.Point(12, 39);
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
this.dataGridView1.Location = new System.Drawing.Point(12, 40);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersWidth = 40;
this.dataGridView1.RowTemplate.Height = 23;
@@ -119,114 +119,7 @@
this.dataGridView1.TabIndex = 48;
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
//
// cb_state
//
this.cb_state.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_state.FormattingEnabled = true;
this.cb_state.Location = new System.Drawing.Point(372, 9);
this.cb_state.Name = "cb_state";
this.cb_state.Size = new System.Drawing.Size(74, 20);
this.cb_state.TabIndex = 49;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(341, 13);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(29, 12);
this.label2.TabIndex = 5;
this.label2.Text = "상태";
//
// btn_Lookup
//
this.btn_Lookup.Location = new System.Drawing.Point(516, 3);
this.btn_Lookup.Name = "btn_Lookup";
this.btn_Lookup.Size = new System.Drawing.Size(61, 32);
this.btn_Lookup.TabIndex = 50;
this.btn_Lookup.Text = "조 회";
this.btn_Lookup.UseVisualStyleBackColor = true;
this.btn_Lookup.Click += new System.EventHandler(this.btn_Lookup_Click);
//
// btn_Excel
//
this.btn_Excel.Location = new System.Drawing.Point(985, 3);
this.btn_Excel.Name = "btn_Excel";
this.btn_Excel.Size = new System.Drawing.Size(61, 32);
this.btn_Excel.TabIndex = 50;
this.btn_Excel.Text = "엑셀반출";
this.btn_Excel.UseVisualStyleBackColor = true;
this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click);
//
// btn_Close
//
this.btn_Close.Location = new System.Drawing.Point(1052, 3);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(61, 32);
this.btn_Close.TabIndex = 50;
this.btn_Close.Text = "닫 기";
this.btn_Close.UseVisualStyleBackColor = true;
this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
//
// btn_Save
//
this.btn_Save.Location = new System.Drawing.Point(918, 3);
this.btn_Save.Name = "btn_Save";
this.btn_Save.Size = new System.Drawing.Size(61, 32);
this.btn_Save.TabIndex = 50;
this.btn_Save.Text = "체크사항\r\n저장";
this.btn_Save.UseVisualStyleBackColor = true;
this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
//
// btn_Merge
//
this.btn_Merge.Location = new System.Drawing.Point(650, 3);
this.btn_Merge.Name = "btn_Merge";
this.btn_Merge.Size = new System.Drawing.Size(61, 32);
this.btn_Merge.TabIndex = 51;
this.btn_Merge.Text = "목록병합";
this.btn_Merge.UseVisualStyleBackColor = true;
this.btn_Merge.Click += new System.EventHandler(this.btn_Merge_Click);
//
// btn_Progress
//
this.btn_Progress.Location = new System.Drawing.Point(717, 3);
this.btn_Progress.Name = "btn_Progress";
this.btn_Progress.Size = new System.Drawing.Size(61, 32);
this.btn_Progress.TabIndex = 51;
this.btn_Progress.Text = "진행처리";
this.btn_Progress.UseVisualStyleBackColor = true;
this.btn_Progress.Click += new System.EventHandler(this.btn_Progress_Click);
//
// btn_Completion
//
this.btn_Completion.Location = new System.Drawing.Point(784, 3);
this.btn_Completion.Name = "btn_Completion";
this.btn_Completion.Size = new System.Drawing.Size(61, 32);
this.btn_Completion.TabIndex = 51;
this.btn_Completion.Text = "완료처리";
this.btn_Completion.UseVisualStyleBackColor = true;
this.btn_Completion.Click += new System.EventHandler(this.btn_Completion_Click);
//
// btn_Delete
//
this.btn_Delete.Location = new System.Drawing.Point(851, 3);
this.btn_Delete.Name = "btn_Delete";
this.btn_Delete.Size = new System.Drawing.Size(61, 32);
this.btn_Delete.TabIndex = 51;
this.btn_Delete.Text = "목록삭제";
this.btn_Delete.UseVisualStyleBackColor = true;
this.btn_Delete.Click += new System.EventHandler(this.btn_Delete_Click);
//
// btn_AddList
//
this.btn_AddList.Location = new System.Drawing.Point(583, 3);
this.btn_AddList.Name = "btn_AddList";
this.btn_AddList.Size = new System.Drawing.Size(61, 32);
this.btn_AddList.TabIndex = 50;
this.btn_AddList.Text = "목록생성";
this.btn_AddList.UseVisualStyleBackColor = true;
this.btn_AddList.Click += new System.EventHandler(this.btn_AddList_Click);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
//
// idx
//
@@ -299,6 +192,114 @@
this.check.Name = "check";
this.check.Width = 35;
//
// cb_state
//
this.cb_state.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_state.FormattingEnabled = true;
this.cb_state.Location = new System.Drawing.Point(372, 10);
this.cb_state.Name = "cb_state";
this.cb_state.Size = new System.Drawing.Size(74, 20);
this.cb_state.TabIndex = 49;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(341, 14);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(29, 12);
this.label2.TabIndex = 5;
this.label2.Text = "상태";
//
// btn_Lookup
//
this.btn_Lookup.Location = new System.Drawing.Point(516, 4);
this.btn_Lookup.Name = "btn_Lookup";
this.btn_Lookup.Size = new System.Drawing.Size(61, 32);
this.btn_Lookup.TabIndex = 50;
this.btn_Lookup.Text = "조 회";
this.btn_Lookup.UseVisualStyleBackColor = true;
this.btn_Lookup.Click += new System.EventHandler(this.btn_Lookup_Click);
//
// btn_Excel
//
this.btn_Excel.Location = new System.Drawing.Point(985, 4);
this.btn_Excel.Name = "btn_Excel";
this.btn_Excel.Size = new System.Drawing.Size(61, 32);
this.btn_Excel.TabIndex = 50;
this.btn_Excel.Text = "엑셀반출";
this.btn_Excel.UseVisualStyleBackColor = true;
this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click);
//
// btn_Close
//
this.btn_Close.Location = new System.Drawing.Point(1052, 4);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(61, 32);
this.btn_Close.TabIndex = 50;
this.btn_Close.Text = "닫 기";
this.btn_Close.UseVisualStyleBackColor = true;
this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
//
// btn_Save
//
this.btn_Save.Location = new System.Drawing.Point(918, 4);
this.btn_Save.Name = "btn_Save";
this.btn_Save.Size = new System.Drawing.Size(61, 32);
this.btn_Save.TabIndex = 50;
this.btn_Save.Text = "체크사항\r\n저장";
this.btn_Save.UseVisualStyleBackColor = true;
this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
//
// btn_Merge
//
this.btn_Merge.Location = new System.Drawing.Point(650, 4);
this.btn_Merge.Name = "btn_Merge";
this.btn_Merge.Size = new System.Drawing.Size(61, 32);
this.btn_Merge.TabIndex = 51;
this.btn_Merge.Text = "목록병합";
this.btn_Merge.UseVisualStyleBackColor = true;
this.btn_Merge.Click += new System.EventHandler(this.btn_Merge_Click);
//
// btn_Progress
//
this.btn_Progress.Location = new System.Drawing.Point(717, 4);
this.btn_Progress.Name = "btn_Progress";
this.btn_Progress.Size = new System.Drawing.Size(61, 32);
this.btn_Progress.TabIndex = 51;
this.btn_Progress.Text = "진행처리";
this.btn_Progress.UseVisualStyleBackColor = true;
this.btn_Progress.Click += new System.EventHandler(this.btn_Progress_Click);
//
// btn_Completion
//
this.btn_Completion.Location = new System.Drawing.Point(784, 4);
this.btn_Completion.Name = "btn_Completion";
this.btn_Completion.Size = new System.Drawing.Size(61, 32);
this.btn_Completion.TabIndex = 51;
this.btn_Completion.Text = "완료처리";
this.btn_Completion.UseVisualStyleBackColor = true;
this.btn_Completion.Click += new System.EventHandler(this.btn_Completion_Click);
//
// btn_Delete
//
this.btn_Delete.Location = new System.Drawing.Point(851, 4);
this.btn_Delete.Name = "btn_Delete";
this.btn_Delete.Size = new System.Drawing.Size(61, 32);
this.btn_Delete.TabIndex = 51;
this.btn_Delete.Text = "목록삭제";
this.btn_Delete.UseVisualStyleBackColor = true;
this.btn_Delete.Click += new System.EventHandler(this.btn_Delete_Click);
//
// btn_AddList
//
this.btn_AddList.Location = new System.Drawing.Point(583, 4);
this.btn_AddList.Name = "btn_AddList";
this.btn_AddList.Size = new System.Drawing.Size(61, 32);
this.btn_AddList.TabIndex = 50;
this.btn_AddList.Text = "목록생성";
this.btn_AddList.UseVisualStyleBackColor = true;
this.btn_AddList.Click += new System.EventHandler(this.btn_AddList_Click);
//
// Mac_List
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

62
unimarc/unimarc/마크/Mac_List.cs
View File

@@ -39,8 +39,8 @@ namespace WindowsFormsApp1.Mac
dataGridView1.Columns[a].ReadOnly = true;
}
dataGridView1.Columns["end_date"].ReadOnly = false;
dataGridView1.Columns["work_name"].ReadOnly = false;
dataGridView1.Columns["etc"].ReadOnly = false;
dataGridView1.Columns["charge"].ReadOnly = false;
}
private void tb_Search_KeyDown(object sender, KeyEventArgs e)
{
@@ -89,7 +89,7 @@ namespace WindowsFormsApp1.Mac
string[] grid = { "", "", "", "", "",
"", "", "", "", "",
"", "", "" };
"", "" };
int area_count = 11;
dataGridView1.Rows.Clear();
for (int a = 0; a < data.Length; a++)
@@ -148,6 +148,8 @@ namespace WindowsFormsApp1.Mac
string U_cmd = db.More_Update(table, edit_col, edit_tbl, sear_col, sear_tbl);
db.DB_Send_CMD_reVoid(U_cmd);
dataGridView1.Rows[a].Cells["check"].Value = "";
}
}
MessageBox.Show("저장되었습니다!");
@@ -158,9 +160,12 @@ namespace WindowsFormsApp1.Mac
Excel_text et = new Excel_text();
string[] Excel_title = {
"NO", "목록일자", "완료일자", "목록명", "마크담당자",
"작업명", "수량", "입고", "미입고", "상태", "비고" };
//"작업명", "수량", "입고", "미입고", "상태", "비고" };
"작업명", "수량", "상태", "비고" };
int rowCount = dataGridView1.RowCount;
string[,] inputExcel = new string[rowCount, 11];
// string[,] inputExcel = new string[rowCount, 11];
string[,] inputExcel = new string[rowCount, 9];
for (int a = 0; a < rowCount; a++)
{
int row_idx = dataGridView1.Rows[a].HeaderCell.RowIndex + 1;
@@ -171,10 +176,14 @@ namespace WindowsFormsApp1.Mac
inputExcel[a, 4] = dataGridView1.Rows[a].Cells["charge"].Value.ToString();
inputExcel[a, 5] = dataGridView1.Rows[a].Cells["work_name"].Value.ToString();
inputExcel[a, 6] = dataGridView1.Rows[a].Cells["count"].Value.ToString();
inputExcel[a, 7] = dataGridView1.Rows[a].Cells["stock"].Value.ToString();
inputExcel[a, 8] = dataGridView1.Rows[a].Cells["unstock"].Value.ToString();
inputExcel[a, 9] = dataGridView1.Rows[a].Cells["state"].Value.ToString();
inputExcel[a, 10] =dataGridView1.Rows[a].Cells["etc"].Value.ToString();
inputExcel[a, 7] = dataGridView1.Rows[a].Cells["state"].Value.ToString();
inputExcel[a, 8] = dataGridView1.Rows[a].Cells["etc"].Value.ToString();
// inputExcel[a, 7] = dataGridView1.Rows[a].Cells["stock"].Value.ToString();
// inputExcel[a, 8] = dataGridView1.Rows[a].Cells["unstock"].Value.ToString();
// inputExcel[a, 9] = dataGridView1.Rows[a].Cells["state"].Value.ToString();
// inputExcel[a, 10] =dataGridView1.Rows[a].Cells["etc"].Value.ToString();
}
et.Mk_Excel(Excel_title, inputExcel);
}
@@ -189,7 +198,7 @@ namespace WindowsFormsApp1.Mac
private void btn_Progress_Click(object sender, EventArgs e)
{
for(int a = 0; a < dataGridView1.Rows.Count - 1; a++)
for(int a = 0; a < dataGridView1.Rows.Count; a++)
{
if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") {
if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") {
@@ -198,7 +207,7 @@ namespace WindowsFormsApp1.Mac
}
}
}
for(int a= 0; a < dataGridView1.Rows.Count - 1; a++)
for(int a= 0; a < dataGridView1.Rows.Count; a++)
{
if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") {
if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") {
@@ -207,12 +216,14 @@ namespace WindowsFormsApp1.Mac
}
}
}
MessageBox.Show("진행처리되었습니다.", "목록진행");
btn_Lookup_Click(null, null);
}
private void btn_Completion_Click(object sender, EventArgs e)
{
for (int a = 0; a < dataGridView1.Rows.Count - 1; a++)
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") {
if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") {
@@ -221,7 +232,7 @@ namespace WindowsFormsApp1.Mac
}
}
}
for (int a = 0; a < dataGridView1.Rows.Count - 1; a++)
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") {
if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") {
@@ -230,7 +241,9 @@ namespace WindowsFormsApp1.Mac
}
}
}
MessageBox.Show("완료처리되었습니다.", "목록완료");
btn_Lookup_Click(null, null);
}
#region 진행/완료처리 서브함수
@@ -268,6 +281,7 @@ namespace WindowsFormsApp1.Mac
}
MessageBox.Show("삭제되었습니다.");
btn_Lookup_Click(null, null);
}
private void btn_Close_Click(object sender, EventArgs e)
@@ -285,19 +299,35 @@ namespace WindowsFormsApp1.Mac
marc.WindowState = FormWindowState.Maximized;
marc.Show();
marc.input_list(dataGridView1.Rows[idx_row].Cells["start_date"].Value.ToString(),
dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString());
dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx);
}
if (((DataGridView)sender).Columns[idx_col].Name == "check")
{
if (((DataGridView)sender).Rows[idx_row].Cells[idx_col].Value.ToString() == "V")
{
((DataGridView)sender).Rows[idx_row].Cells[idx_col].Value = "";
}
else
{
((DataGridView)sender).Rows[idx_row].Cells[idx_col].Value = "V";
}
}
private void dataGridView1_KeyDown(object sender, KeyEventArgs e)
{
int row = dataGridView1.CurrentCell.RowIndex;
int col = dataGridView1.CurrentCell.ColumnIndex;
if (dataGridView1.Columns[col].Name == "check")
{
if (e.KeyCode == Keys.Space)
{
if (dataGridView1.Rows[row].Cells[col].Value.ToString() == "V")
dataGridView1.Rows[row].Cells[col].Value = "";
else
dataGridView1.Rows[row].Cells[col].Value = "V";
}
}
}
private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)

107
unimarc/unimarc/마크/Marc.cs
View File

@@ -17,6 +17,7 @@ namespace ExcelTest
/// isbn / 도서명 / 저자 / 출판사 / 가격
/// </summary>
string[] data_book = { "", "", "", "", "" };
int SaveRowIdx = -1;
public string user_name;
string compidx;
public string find;
@@ -90,12 +91,12 @@ namespace ExcelTest
/// </summary>
/// <param name="date">목록일자</param>
/// <param name="value">목록명</param>
public void input_list(string date, string value)
public void input_list(string date, string value, string C_idx)
{
db.DBcon();
string Area = "`idx`, `isbn_marc`, `header`, `num`, `book_name`, `author`, `book_comp`, `count`, `pay`, `image_url`, `m_idx`";
string[] sear_tbl = { "date", "list_name" };
string[] sear_col = { date, value };
string[] sear_tbl = { "date", "list_name", "compidx" };
string[] sear_col = { date, value, C_idx};
lbl_BookList.Text = value;
@@ -254,8 +255,10 @@ namespace ExcelTest
{
call = ((RichTextBox)sender).Name;
richTextBox1.LanguageOption = 0;
if (e.Alt)
{
/*
if (e.KeyValue == 48 || e.KeyValue == 96)
{
richTextBox1.SelectionColor = Color.Blue;
@@ -452,14 +455,7 @@ namespace ExcelTest
default:
break;
}
}
if (e.KeyCode == Keys.Enter)
{
richTextBox1.SelectionColor = Color.Red;
richTextBox1.SelectedText = "▲";
richTextBox1.SelectionColor = Color.Black;
*/
}
if (e.Control) {
@@ -489,6 +485,10 @@ namespace ExcelTest
SaveGrade(Keys.F11);
else if (e.KeyCode == Keys.F12)
SaveGrade(Keys.F12);
else if (e.KeyCode == Keys.F3)
richTextBox1.SelectedText = "▼";
else if (e.KeyCode == Keys.F4)
richTextBox1.SelectedText = "▲";
}
/// <summary>
@@ -559,6 +559,10 @@ namespace ExcelTest
}
private void Btn_Save_Click(object sender, EventArgs e)
{
if (SaveRowIdx < 0) {
MessageBox.Show("마크가 선택되지않았습니다.");
return;
}
int TabIndex = tabControl1.SelectedIndex;
int grade = cb_grade.SelectedIndex;
if (TabIndex == 1) {
@@ -570,19 +574,22 @@ namespace ExcelTest
return;
}
string table_name = "Marc";
int row_idx = List_Book.CurrentCell.RowIndex;
string BaseText = richTextBox1.Text;
string BaseText = richTextBox1.Text + "\n";
if (!isPass(BaseText)) {
MessageBox.Show("입력된 마크의 상태를 확인해주세요.");
return;
}
string tag056 = Tag056();
string[] grid_data = {
List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString(),
List_Book.Rows[row_idx].Cells["book_name"].Value.ToString(),
List_Book.Rows[row_idx].Cells["author"].Value.ToString(),
List_Book.Rows[row_idx].Cells["book_comp"].Value.ToString(),
List_Book.Rows[row_idx].Cells["pay"].Value.ToString(),
List_Book.Rows[row_idx].Cells["url"].Value.ToString() };
List_Book.Rows[SaveRowIdx].Cells["ISBN13"].Value.ToString(),
List_Book.Rows[SaveRowIdx].Cells["book_name"].Value.ToString(),
List_Book.Rows[SaveRowIdx].Cells["author"].Value.ToString(),
List_Book.Rows[SaveRowIdx].Cells["book_comp"].Value.ToString(),
List_Book.Rows[SaveRowIdx].Cells["pay"].Value.ToString(),
List_Book.Rows[SaveRowIdx].Cells["url"].Value.ToString() };
string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
string orimarc = st.made_Ori_marc(richTextBox1).Replace(@"\", "￦");
string Midx = List_Book.Rows[row_idx].Cells["marc_idx"].Value.ToString();
string Midx = List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value.ToString();
// true일 경우 INSERT, false일 경우 UPDATE
bool isNewData = true;
@@ -597,8 +604,8 @@ namespace ExcelTest
return;
}
if (List_Book.Rows[row_idx].DefaultCellStyle.ForeColor == Color.Orange ||
List_Book.Rows[row_idx].DefaultCellStyle.ForeColor == Color.Red)
if (List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor == Color.Orange ||
List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor == Color.Red)
{
string[] Insert_tbl = {
"ISBN", "서명", "저자", "출판사",
@@ -653,12 +660,12 @@ namespace ExcelTest
db.DB_Send_CMD_reVoid(U_cmd);
}
List_Book.Rows[row_idx].Cells["grade"].Value = grade.ToString();
List_Book.Rows[row_idx].Cells["SaveDate"].Value = date;
List_Book.Rows[row_idx].Cells["user"].Value = user_name;
List_Book.Rows[row_idx].Cells["db_marc"].Value = orimarc;
List_Book.Rows[SaveRowIdx].Cells["grade"].Value = grade.ToString();
List_Book.Rows[SaveRowIdx].Cells["SaveDate"].Value = date;
List_Book.Rows[SaveRowIdx].Cells["user"].Value = user_name;
List_Book.Rows[SaveRowIdx].Cells["db_marc"].Value = orimarc;
List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = SetGradeColor(grade.ToString());
List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor = SetGradeColor(grade.ToString());
if (isNewData) {
@@ -667,12 +674,47 @@ namespace ExcelTest
}
string UpdateListIndex = string.Format("UPDATE `Obj_List_Book` SET `m_idx` = {0} WHERE `idx` = {1};",
Midx, List_Book.Rows[row_idx].Cells["list_idx"].Value.ToString());
Midx, List_Book.Rows[SaveRowIdx].Cells["list_idx"].Value.ToString());
db.DB_Send_CMD_reVoid(UpdateListIndex);
MessageBox.Show("저장되었습니다!");
}
#region Save_Click_Sub
/// <summary>
/// 마크 오류체크 (형식체크)
/// </summary>
/// <param name="BaseData">richTextBox에 들어가있는 텍스트</param>
/// <returns>True / False</returns>
private bool isPass(string BaseData)
{
string[] EnterSplit = BaseData.Split('\n');
foreach (string Data in EnterSplit)
{
if (Data == "")
continue;
string[] DataSplit = Data.Split('\t');
if (DataSplit.Length == 3)
{
if (DataSplit[1].Length == 2)
{
continue;
}
else
{
return false;
}
}
else
{
return false;
}
}
return true;
}
private bool isMustTag(string orimarc)
{
String_Text st = new String_Text();
@@ -740,7 +782,7 @@ namespace ExcelTest
string[] tmp = target[a].Split('\t');
string tag = tmp[0];
if (tag == "") break;
int eight = Convert.ToInt32(tag);
int eight = Convert.ToInt32(tag.Substring(0, 3));
if (eight == 008)
{
count = a;
@@ -784,6 +826,7 @@ namespace ExcelTest
{
if (e.RowIndex == -1) { return; }
int row_idx = e.RowIndex;
SaveRowIdx = row_idx;
int col_idx = e.ColumnIndex;
string isbn = List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString();
@@ -988,10 +1031,14 @@ namespace ExcelTest
text008.Text = Empty_008.Replace("▲", "");
data008 = text008.Text;
string Empty_text = string.Format(
"008\t \t{0}\n" +
"020\t \t▼a{1}▼c\\{5}▲\n" +
"056\t \t▼a▼25▲\n" +
"100\t \t▼a▲\n" +
"245\t \t▼a{2}▼d{3}▲\n" +
"260\t \t▼b{4}▲\n" +
"300\t \t▼a▼c▲\n" +
"653\t \t▼a▲\n" +
"700\t \t▼a▲\n" +
"950\t \t▼b￦{5}▲\n",
Empty_008, data_book[0], data_book[1], data_book[2], data_book[3], data_book[4]);
etc1.Text = "";

166
unimarc/unimarc/마크/Marc_Plan.Designer.cs generated
View File

@@ -36,9 +36,13 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
this.btn_Save = new System.Windows.Forms.Button();
this.panel4 = new System.Windows.Forms.Panel();
this.btn_Excel = new System.Windows.Forms.Button();
this.cb_EncodingType = new System.Windows.Forms.ComboBox();
this.btn_Output = new System.Windows.Forms.Button();
this.btn_Excel = new System.Windows.Forms.Button();
this.btn_Close = new System.Windows.Forms.Button();
this.btn_Select_List = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
this.cb_authorType = new System.Windows.Forms.ComboBox();
this.cb_divType = new System.Windows.Forms.ComboBox();
@@ -48,12 +52,10 @@
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.btn_ChangeTag = new System.Windows.Forms.Button();
this.btn_Close = new System.Windows.Forms.Button();
this.tb_SearchTag = new System.Windows.Forms.TextBox();
this.tb_ISBN = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.btn_Select_List = new System.Windows.Forms.Button();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.num = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -78,42 +80,69 @@
this.search_tag = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.panel2 = new System.Windows.Forms.Panel();
this.panel1.SuspendLayout();
this.panel4.SuspendLayout();
this.panel3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel2.SuspendLayout();
this.SuspendLayout();
//
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel1.Controls.Add(this.cb_EncodingType);
this.panel1.Controls.Add(this.btn_Output);
this.panel1.Controls.Add(this.btn_Excel);
this.panel1.Controls.Add(this.panel3);
this.panel1.Controls.Add(this.btn_ChangeTag);
this.panel1.Controls.Add(this.btn_Save);
this.panel1.Controls.Add(this.panel4);
this.panel1.Controls.Add(this.btn_Close);
this.panel1.Controls.Add(this.tb_SearchTag);
this.panel1.Controls.Add(this.tb_ISBN);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.btn_Select_List);
this.panel1.Location = new System.Drawing.Point(11, 12);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1592, 36);
this.panel1.Size = new System.Drawing.Size(1463, 35);
this.panel1.TabIndex = 0;
//
// btn_Save
//
this.btn_Save.Location = new System.Drawing.Point(402, 5);
this.btn_Save.Name = "btn_Save";
this.btn_Save.Size = new System.Drawing.Size(86, 23);
this.btn_Save.TabIndex = 10;
this.btn_Save.Text = "전체 저장";
this.btn_Save.UseVisualStyleBackColor = true;
this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
//
// panel4
//
this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel4.Controls.Add(this.btn_Excel);
this.panel4.Controls.Add(this.cb_EncodingType);
this.panel4.Controls.Add(this.btn_Output);
this.panel4.Location = new System.Drawing.Point(585, 2);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(274, 29);
this.panel4.TabIndex = 9;
//
// btn_Excel
//
this.btn_Excel.Location = new System.Drawing.Point(194, 2);
this.btn_Excel.Name = "btn_Excel";
this.btn_Excel.Size = new System.Drawing.Size(75, 23);
this.btn_Excel.TabIndex = 8;
this.btn_Excel.Text = "엑셀 반출";
this.btn_Excel.UseVisualStyleBackColor = true;
this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click);
//
// cb_EncodingType
//
this.cb_EncodingType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_EncodingType.FormattingEnabled = true;
this.cb_EncodingType.Location = new System.Drawing.Point(916, 7);
this.cb_EncodingType.Location = new System.Drawing.Point(7, 3);
this.cb_EncodingType.Name = "cb_EncodingType";
this.cb_EncodingType.Size = new System.Drawing.Size(81, 20);
this.cb_EncodingType.TabIndex = 9;
//
// btn_Output
//
this.btn_Output.Location = new System.Drawing.Point(1003, 6);
this.btn_Output.Location = new System.Drawing.Point(94, 2);
this.btn_Output.Name = "btn_Output";
this.btn_Output.Size = new System.Drawing.Size(75, 23);
this.btn_Output.TabIndex = 9;
@@ -121,15 +150,26 @@
this.btn_Output.UseVisualStyleBackColor = true;
this.btn_Output.Click += new System.EventHandler(this.btn_Output_Click);
//
// btn_Excel
// btn_Close
//
this.btn_Excel.Location = new System.Drawing.Point(825, 6);
this.btn_Excel.Name = "btn_Excel";
this.btn_Excel.Size = new System.Drawing.Size(75, 23);
this.btn_Excel.TabIndex = 8;
this.btn_Excel.Text = "엑셀 반출";
this.btn_Excel.UseVisualStyleBackColor = true;
this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click);
this.btn_Close.Location = new System.Drawing.Point(903, 5);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(86, 23);
this.btn_Close.TabIndex = 5;
this.btn_Close.Text = "닫 기";
this.btn_Close.UseVisualStyleBackColor = true;
this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
//
// btn_Select_List
//
this.btn_Select_List.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btn_Select_List.Location = new System.Drawing.Point(9, 2);
this.btn_Select_List.Name = "btn_Select_List";
this.btn_Select_List.Size = new System.Drawing.Size(354, 29);
this.btn_Select_List.TabIndex = 0;
this.btn_Select_List.Text = "목록선택";
this.btn_Select_List.UseVisualStyleBackColor = true;
this.btn_Select_List.Click += new System.EventHandler(this.btn_Select_List_Click);
//
// panel3
//
@@ -141,9 +181,9 @@
this.panel3.Controls.Add(this.cb_FirstAuthor);
this.panel3.Controls.Add(this.label3);
this.panel3.Controls.Add(this.label4);
this.panel3.Location = new System.Drawing.Point(251, 2);
this.panel3.Location = new System.Drawing.Point(11, 52);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(562, 30);
this.panel3.Size = new System.Drawing.Size(566, 29);
this.panel3.TabIndex = 7;
//
// cb_authorType
@@ -151,7 +191,7 @@
this.cb_authorType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_authorType.Enabled = false;
this.cb_authorType.FormattingEnabled = true;
this.cb_authorType.Location = new System.Drawing.Point(125, 4);
this.cb_authorType.Location = new System.Drawing.Point(125, 3);
this.cb_authorType.Name = "cb_authorType";
this.cb_authorType.Size = new System.Drawing.Size(171, 20);
this.cb_authorType.TabIndex = 1;
@@ -161,7 +201,7 @@
this.cb_divType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_divType.Enabled = false;
this.cb_divType.FormattingEnabled = true;
this.cb_divType.Location = new System.Drawing.Point(402, 4);
this.cb_divType.Location = new System.Drawing.Point(402, 3);
this.cb_divType.Name = "cb_divType";
this.cb_divType.Size = new System.Drawing.Size(88, 20);
this.cb_divType.TabIndex = 1;
@@ -172,7 +212,7 @@
this.cb_divNum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_divNum.Enabled = false;
this.cb_divNum.FormattingEnabled = true;
this.cb_divNum.Location = new System.Drawing.Point(496, 4);
this.cb_divNum.Location = new System.Drawing.Point(496, 3);
this.cb_divNum.Name = "cb_divNum";
this.cb_divNum.Size = new System.Drawing.Size(61, 20);
this.cb_divNum.TabIndex = 1;
@@ -182,7 +222,7 @@
this.cb_FirstBook.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_FirstBook.Enabled = false;
this.cb_FirstBook.FormattingEnabled = true;
this.cb_FirstBook.Location = new System.Drawing.Point(302, 4);
this.cb_FirstBook.Location = new System.Drawing.Point(302, 3);
this.cb_FirstBook.Name = "cb_FirstBook";
this.cb_FirstBook.Size = new System.Drawing.Size(61, 20);
this.cb_FirstBook.TabIndex = 1;
@@ -192,7 +232,7 @@
this.cb_FirstAuthor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_FirstAuthor.Enabled = false;
this.cb_FirstAuthor.FormattingEnabled = true;
this.cb_FirstAuthor.Location = new System.Drawing.Point(57, 4);
this.cb_FirstAuthor.Location = new System.Drawing.Point(57, 3);
this.cb_FirstAuthor.Name = "cb_FirstAuthor";
this.cb_FirstAuthor.Size = new System.Drawing.Size(61, 20);
this.cb_FirstAuthor.TabIndex = 1;
@@ -200,7 +240,7 @@
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(371, 8);
this.label3.Location = new System.Drawing.Point(371, 7);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(29, 12);
this.label3.TabIndex = 1;
@@ -209,7 +249,7 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(2, 8);
this.label4.Location = new System.Drawing.Point(2, 7);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 1;
@@ -217,7 +257,7 @@
//
// btn_ChangeTag
//
this.btn_ChangeTag.Location = new System.Drawing.Point(1409, 6);
this.btn_ChangeTag.Location = new System.Drawing.Point(317, 2);
this.btn_ChangeTag.Name = "btn_ChangeTag";
this.btn_ChangeTag.Size = new System.Drawing.Size(86, 23);
this.btn_ChangeTag.TabIndex = 5;
@@ -225,19 +265,9 @@
this.btn_ChangeTag.UseVisualStyleBackColor = true;
this.btn_ChangeTag.Click += new System.EventHandler(this.btn_ChangeTag_Click);
//
// btn_Close
//
this.btn_Close.Location = new System.Drawing.Point(1501, 6);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(86, 23);
this.btn_Close.TabIndex = 5;
this.btn_Close.Text = "닫 기";
this.btn_Close.UseVisualStyleBackColor = true;
this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
//
// tb_SearchTag
//
this.tb_SearchTag.Location = new System.Drawing.Point(1303, 7);
this.tb_SearchTag.Location = new System.Drawing.Point(211, 3);
this.tb_SearchTag.Name = "tb_SearchTag";
this.tb_SearchTag.Size = new System.Drawing.Size(100, 21);
this.tb_SearchTag.TabIndex = 4;
@@ -245,7 +275,8 @@
//
// tb_ISBN
//
this.tb_ISBN.Location = new System.Drawing.Point(1130, 7);
this.tb_ISBN.Enabled = false;
this.tb_ISBN.Location = new System.Drawing.Point(39, 3);
this.tb_ISBN.Name = "tb_ISBN";
this.tb_ISBN.Size = new System.Drawing.Size(100, 21);
this.tb_ISBN.TabIndex = 4;
@@ -253,7 +284,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(1244, 11);
this.label2.Location = new System.Drawing.Point(152, 7);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(57, 12);
this.label2.TabIndex = 3;
@@ -262,23 +293,12 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(1095, 11);
this.label1.Location = new System.Drawing.Point(4, 7);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(33, 12);
this.label1.TabIndex = 3;
this.label1.Text = "ISBN";
//
// btn_Select_List
//
this.btn_Select_List.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btn_Select_List.Location = new System.Drawing.Point(9, 2);
this.btn_Select_List.Name = "btn_Select_List";
this.btn_Select_List.Size = new System.Drawing.Size(236, 30);
this.btn_Select_List.TabIndex = 0;
this.btn_Select_List.Text = "목록선택";
this.btn_Select_List.UseVisualStyleBackColor = true;
this.btn_Select_List.Click += new System.EventHandler(this.btn_Select_List_Click);
//
// dataGridView1
//
this.dataGridView1.AllowUserToAddRows = false;
@@ -315,10 +335,10 @@
this.marc,
this.search_tag,
this.colCheck});
this.dataGridView1.Location = new System.Drawing.Point(11, 57);
this.dataGridView1.Location = new System.Drawing.Point(11, 86);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(1592, 647);
this.dataGridView1.Size = new System.Drawing.Size(1463, 646);
this.dataGridView1.TabIndex = 1;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
@@ -510,7 +530,7 @@
this.checkBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.checkBox1.Checked = true;
this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox1.Location = new System.Drawing.Point(1432, 63);
this.checkBox1.Location = new System.Drawing.Point(1432, 92);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(15, 14);
this.checkBox1.TabIndex = 2;
@@ -518,22 +538,39 @@
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel2.Controls.Add(this.label1);
this.panel2.Controls.Add(this.label2);
this.panel2.Controls.Add(this.tb_ISBN);
this.panel2.Controls.Add(this.btn_ChangeTag);
this.panel2.Controls.Add(this.tb_SearchTag);
this.panel2.Location = new System.Drawing.Point(597, 52);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(412, 29);
this.panel2.TabIndex = 8;
//
// Marc_Plan
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1616, 716);
this.ClientSize = new System.Drawing.Size(1487, 715);
this.Controls.Add(this.panel2);
this.Controls.Add(this.checkBox1);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel3);
this.Name = "Marc_Plan";
this.Text = "마크 정리";
this.Load += new System.EventHandler(this.Marc_Plan_Load);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.panel4.ResumeLayout(false);
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -584,5 +621,8 @@
private System.Windows.Forms.Button btn_Excel;
private System.Windows.Forms.Button btn_Output;
private System.Windows.Forms.ComboBox cb_EncodingType;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.Button btn_Save;
}
}

163
unimarc/unimarc/마크/Marc_Plan.cs
View File

@@ -96,21 +96,21 @@ namespace WindowsFormsApp1.Mac
for (int a = 0; a < ary.Length; a++)
{
if (a % 16 == 0) grid[0] = ary[a]; // idx
if (a % 16 == 1) grid[1] = ary[a]; // num
if (a % 16 == 2) grid[2] = ary[a]; // r_num
if (a % 16 == 3) grid[3] = ary[a]; // class_symbol
if (a % 16 == 4) grid[4] = ary[a]; // author_symbol
if (a % 16 == 5) grid[9] = ary[a]; // ISBN
if (a % 16 == 6) grid[10] = ary[a]; // book_name
if (a % 16 == 7) grid[11] = ary[a]; // s_book_name1
if (a % 16 == 8) grid[12] = ary[a]; // s_book_num1
if (a % 16 == 9) grid[13] = ary[a]; // s_book_name2
if (a % 16 == 10) grid[14] = ary[a]; // s_book_num2
if (a % 16 == 11) grid[15] = ary[a]; // author
if (a % 16 == 12) grid[16] = ary[a]; // book_comp
if (a % 16 == 13) grid[17] = ary[a]; // price
if (a % 16 == 14) grid[18] = ary[a]; // midx
if (a % 16 == 0) grid[0] = ary[a]; // idx
if (a % 16 == 1) grid[1] = ary[a]; // num
if (a % 16 == 2) grid[2] = ary[a]; // r_num
if (a % 16 == 3) grid[3] = ary[a]; // class_symbol
if (a % 16 == 4) grid[4] = ary[a]; // author_symbol
if (a % 16 == 5) grid[9] = ary[a]; // ISBN
if (a % 16 == 6) grid[10] = ary[a]; // book_name
if (a % 16 == 7) grid[11] = ary[a]; // s_book_name1
if (a % 16 == 8) grid[12] = ary[a]; // s_book_num1
if (a % 16 == 9) grid[13] = ary[a]; // s_book_name2
if (a % 16 == 10) grid[14] = ary[a]; // s_book_num2
if (a % 16 == 11) grid[15] = ary[a]; // author
if (a % 16 == 12) grid[16] = ary[a]; // book_comp
if (a % 16 == 13) grid[17] = ary[a]; // price
if (a % 16 == 14) grid[18] = ary[a]; // midx
if (a % 16 == 15) { grid[19] = ary[a]; // marc
dataGridView1.Rows.Add(grid);
}
@@ -250,6 +250,33 @@ namespace WindowsFormsApp1.Mac
MessageBox.Show("변경되었습니다!", "태그변경");
}
private void btn_Save_Click(object sender, EventArgs e)
{
string table = "Specs_Marc";
string[] Edit_Col = { "marc", "r_num", "class_symbol", "author_symbol", "prefix", "user", "editDate" };
string[] Where_Col = { "idx" };
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
string[] Edit_Data = {
dataGridView1.Rows[a].Cells["marc"].Value.ToString(),
dataGridView1.Rows[a].Cells["reg_num"].Value.ToString(),
dataGridView1.Rows[a].Cells["class_code"].Value.ToString(),
dataGridView1.Rows[a].Cells["author_code"].Value.ToString(),
dataGridView1.Rows[a].Cells["prefix"].Value.ToString(),
main.botUserLabel.Text,
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") };
string[] Where_Data = {
dataGridView1.Rows[a].Cells["idx"].Value.ToString() };
string Ucmd = db.More_Update(table, Edit_Col, Edit_Data, Where_Col, Where_Data);
db.DB_Send_CMD_reVoid(Ucmd);
}
MessageBox.Show("저장되었습니다.");
}
private void btn_Close_Click(object sender, EventArgs e)
{
this.Close();
@@ -382,59 +409,63 @@ namespace WindowsFormsApp1.Mac
int row = e.RowIndex;
int col = dataGridView1.CurrentCell.ColumnIndex;
if (col < 2 && col > 7)
return;
if (dataGridView1.Rows[row].Cells["marc"].Value.ToString() == "" &&
dataGridView1.Rows[row].Cells["marc"].Value == null)
if (col == 2 || col == 3 || col == 4 || col == 5 || col == 6 || col == 7)
{
MessageBox.Show("저장된 마크가 없습니다!");
return;
if (dataGridView1.Rows[row].Cells["marc"].Value.ToString() == "" &&
dataGridView1.Rows[row].Cells["marc"].Value == null)
{
MessageBox.Show("저장된 마크가 없습니다!");
return;
}
string Marc = dataGridView1.Rows[row].Cells["marc"].Value.ToString();
string AddTag = "";
if (col == 2 || col == 5 || col == 6 || col == 7)
{
string L = dataGridView1.Rows[row].Cells[2].Value.ToString();
string V = dataGridView1.Rows[row].Cells[5].Value.ToString();
string C = dataGridView1.Rows[row].Cells[6].Value.ToString();
string F = dataGridView1.Rows[row].Cells[7].Value.ToString();
if (L != "")
L = string.Format("▼l{0}", L);
if (V != "")
V = string.Format("▼v{0}", V);
if (C != "")
C = string.Format("▼c{0}", C);
if (F != "")
F = string.Format("▼f{0}", F);
AddTag = string.Format("049\t \t{0}{1}{2}{3}▲", L, V, C, F);
}
if (col == 3 || col == 4 || col == 5)
{
string A = dataGridView1.Rows[row].Cells[3].Value.ToString();
string B = dataGridView1.Rows[row].Cells[4].Value.ToString();
string C = dataGridView1.Rows[row].Cells[5].Value.ToString();
if (A != "")
A = string.Format("▼a{0}", A);
if (B != "")
B = string.Format("▼b{0}", B);
if (C != "")
C = string.Format("▼c{0}", C);
AddTag = string.Format("090\t \t{0}{1}{2}▲", A, B, C);
}
string TypeView = ConvertMarcType(Marc);
string AddMarc = AddTagInMarc(AddTag, TypeView);
String_Text st = new String_Text();
dataGridView1.Rows[row].Cells["marc"].Value = st.made_Ori_marc(AddMarc);
}
string Marc = dataGridView1.Rows[row].Cells["marc"].Value.ToString();
string AddTag = "";
if (col == 2 || col == 5 || col == 6 || col == 7)
{
string I = dataGridView1.Rows[row].Cells[2].Value.ToString();
string V = dataGridView1.Rows[row].Cells[5].Value.ToString();
string C = dataGridView1.Rows[row].Cells[6].Value.ToString();
string F = dataGridView1.Rows[row].Cells[7].Value.ToString();
if (I != "")
I = string.Format("▼i{0}", I);
if (V != "")
V = string.Format("▼v{0}", V);
if (C != "")
C = string.Format("▼c{0}", C);
if (F != "")
F = string.Format("▼f{0}", F);
AddTag = string.Format("049\t \t{0}{1}{2}{3}▲", I, V, C, F);
}
else if (col == 3 || col == 4)
{
string A = dataGridView1.Rows[row].Cells[3].Value.ToString();
string B = dataGridView1.Rows[row].Cells[4].Value.ToString();
if (A != "")
A = string.Format("▼a{0}", A);
if (B != "")
B = string.Format("▼b{0}", B);
AddTag = string.Format("090\t \t{0}{1}▲", A, B);
}
string TypeView = ConvertMarcType(Marc);
string AddMarc = AddTagInMarc(AddTag, TypeView);
String_Text st = new String_Text();
dataGridView1.Rows[row].Cells["marc"].Value = st.made_Ori_marc(AddMarc);
}
/// <summary>

12
unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs generated
View File

@@ -507,7 +507,7 @@ namespace UniMarc.마크
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(2, 8);
this.label8.Location = new System.Drawing.Point(3, 8);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(50, 12);
this.label8.TabIndex = 1;
@@ -595,9 +595,9 @@ namespace UniMarc.마크
// pictureBox1
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Location = new System.Drawing.Point(3, 2);
this.pictureBox1.Location = new System.Drawing.Point(2, 2);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(174, 205);
this.pictureBox1.Size = new System.Drawing.Size(175, 206);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -733,7 +733,7 @@ namespace UniMarc.마크
this.etcBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.etcBox1.Location = new System.Drawing.Point(4, 4);
this.etcBox1.Name = "etcBox1";
this.etcBox1.Size = new System.Drawing.Size(228, 218);
this.etcBox1.Size = new System.Drawing.Size(233, 218);
this.etcBox1.TabIndex = 0;
this.etcBox1.Text = "";
//
@@ -743,7 +743,7 @@ namespace UniMarc.마크
this.etcBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.etcBox2.Location = new System.Drawing.Point(4, 229);
this.etcBox2.Name = "etcBox2";
this.etcBox2.Size = new System.Drawing.Size(228, 223);
this.etcBox2.Size = new System.Drawing.Size(233, 223);
this.etcBox2.TabIndex = 0;
this.etcBox2.Text = "";
//
@@ -759,7 +759,7 @@ namespace UniMarc.마크
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 229F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(236, 456);
this.tableLayoutPanel1.Size = new System.Drawing.Size(241, 456);
this.tableLayoutPanel1.TabIndex = 0;
//
// Marc_Plan_Sub_MarcEdit

3
unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs
View File

@@ -596,7 +596,9 @@ namespace UniMarc.마크
Btn_FrontAndBack_Sub();
}
#region btn_FrontAndBack_Sub
private void Btn_FrontAndBack_Sub()
{
if (mp != null)
@@ -635,7 +637,6 @@ namespace UniMarc.마크
Init(Marc);
}
#endregion
private void Marc_Plan_Sub_MarcEdit_Load(object sender, EventArgs e)