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

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);