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

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

Browse Source 
** ERP 작업 전면 중단 (마크우선) **

1. 마크 추가
ㄴ> 마크 검색 시 내부DB보다 외부DB를 먼저 가져오는 경우가 있음. => 정렬로 해결.
ㄴ> 검색 후 내부DB마크 선택하고 저장할 경우, UPDATE가 아닌 INSERT로 들어가는 버그 해결
ㄴ> "코리스 검색" -> "미소장마크 코리스 일괄 검색기능" 으로 변경. => 미소장마크 일괄 검색하여 목록으로 가져옴. (저장은 하지않음)

2. 자잘한 버그 수정
This commit is contained in:
SeungHo Yang
2022-07-26 15:01:07 +09:00
parent 789300b67a
commit 5ec1ca8f58
39 changed files with 1158 additions and 2187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,13 +57,17 @@
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.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(21, 14);
this.label1.Location = new System.Drawing.Point(14, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(57, 12);
this.label1.TabIndex = 5;
@@ -71,7 +75,7 @@
//
// tb_Search
//
this.tb_Search.Location = new System.Drawing.Point(80, 10);
this.tb_Search.Location = new System.Drawing.Point(73, 9);
this.tb_Search.Name = "tb_Search";
this.tb_Search.Size = new System.Drawing.Size(241, 21);
this.tb_Search.TabIndex = 6;
@@ -114,11 +118,12 @@
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, 40);
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersWidth = 40;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(1100, 610);
this.dataGridView1.Size = new System.Drawing.Size(1124, 623);
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);
@@ -199,7 +204,7 @@
//
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.Location = new System.Drawing.Point(365, 9);
this.cb_state.Name = "cb_state";
this.cb_state.Size = new System.Drawing.Size(74, 20);
this.cb_state.TabIndex = 49;
@@ -207,7 +212,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(341, 14);
this.label2.Location = new System.Drawing.Point(334, 13);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(29, 12);
this.label2.TabIndex = 5;
@@ -215,7 +220,7 @@
//
// btn_Lookup
//
this.btn_Lookup.Location = new System.Drawing.Point(516, 4);
this.btn_Lookup.Location = new System.Drawing.Point(489, 3);
this.btn_Lookup.Name = "btn_Lookup";
this.btn_Lookup.Size = new System.Drawing.Size(61, 32);
this.btn_Lookup.TabIndex = 50;
@@ -225,7 +230,7 @@
//
// btn_Excel
//
this.btn_Excel.Location = new System.Drawing.Point(985, 4);
this.btn_Excel.Location = new System.Drawing.Point(958, 3);
this.btn_Excel.Name = "btn_Excel";
this.btn_Excel.Size = new System.Drawing.Size(61, 32);
this.btn_Excel.TabIndex = 50;
@@ -235,7 +240,7 @@
//
// btn_Close
//
this.btn_Close.Location = new System.Drawing.Point(1052, 4);
this.btn_Close.Location = new System.Drawing.Point(1025, 3);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(61, 32);
this.btn_Close.TabIndex = 50;
@@ -245,7 +250,7 @@
//
// btn_Save
//
this.btn_Save.Location = new System.Drawing.Point(918, 4);
this.btn_Save.Location = new System.Drawing.Point(891, 3);
this.btn_Save.Name = "btn_Save";
this.btn_Save.Size = new System.Drawing.Size(61, 32);
this.btn_Save.TabIndex = 50;
@@ -255,7 +260,7 @@
//
// btn_Merge
//
this.btn_Merge.Location = new System.Drawing.Point(650, 4);
this.btn_Merge.Location = new System.Drawing.Point(623, 3);
this.btn_Merge.Name = "btn_Merge";
this.btn_Merge.Size = new System.Drawing.Size(61, 32);
this.btn_Merge.TabIndex = 51;
@@ -265,7 +270,7 @@
//
// btn_Progress
//
this.btn_Progress.Location = new System.Drawing.Point(717, 4);
this.btn_Progress.Location = new System.Drawing.Point(690, 3);
this.btn_Progress.Name = "btn_Progress";
this.btn_Progress.Size = new System.Drawing.Size(61, 32);
this.btn_Progress.TabIndex = 51;
@@ -275,7 +280,7 @@
//
// btn_Completion
//
this.btn_Completion.Location = new System.Drawing.Point(784, 4);
this.btn_Completion.Location = new System.Drawing.Point(757, 3);
this.btn_Completion.Name = "btn_Completion";
this.btn_Completion.Size = new System.Drawing.Size(61, 32);
this.btn_Completion.TabIndex = 51;
@@ -285,7 +290,7 @@
//
// btn_Delete
//
this.btn_Delete.Location = new System.Drawing.Point(851, 4);
this.btn_Delete.Location = new System.Drawing.Point(824, 3);
this.btn_Delete.Name = "btn_Delete";
this.btn_Delete.Size = new System.Drawing.Size(61, 32);
this.btn_Delete.TabIndex = 51;
@@ -295,7 +300,7 @@
//
// btn_AddList
//
this.btn_AddList.Location = new System.Drawing.Point(583, 4);
this.btn_AddList.Location = new System.Drawing.Point(556, 3);
this.btn_AddList.Name = "btn_AddList";
this.btn_AddList.Size = new System.Drawing.Size(61, 32);
this.btn_AddList.TabIndex = 50;
@@ -303,32 +308,52 @@
this.btn_AddList.UseVisualStyleBackColor = true;
this.btn_AddList.Click += new System.EventHandler(this.btn_AddList_Click);
//
// panel1
//
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.btn_Delete);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.btn_Completion);
this.panel1.Controls.Add(this.tb_Search);
this.panel1.Controls.Add(this.btn_Progress);
this.panel1.Controls.Add(this.cb_state);
this.panel1.Controls.Add(this.btn_Merge);
this.panel1.Controls.Add(this.btn_Lookup);
this.panel1.Controls.Add(this.btn_Close);
this.panel1.Controls.Add(this.btn_AddList);
this.panel1.Controls.Add(this.btn_Excel);
this.panel1.Controls.Add(this.btn_Save);
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(1124, 38);
this.panel1.TabIndex = 52;
//
// panel2
//
this.panel2.Controls.Add(this.dataGridView1);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 38);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1124, 623);
this.panel2.TabIndex = 53;
//
// Mac_List
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1124, 661);
this.Controls.Add(this.btn_Delete);
this.Controls.Add(this.btn_Completion);
this.Controls.Add(this.btn_Progress);
this.Controls.Add(this.btn_Merge);
this.Controls.Add(this.btn_Close);
this.Controls.Add(this.btn_Excel);
this.Controls.Add(this.btn_Save);
this.Controls.Add(this.btn_AddList);
this.Controls.Add(this.btn_Lookup);
this.Controls.Add(this.cb_state);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.tb_Search);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
this.Name = "Mac_List";
this.ShowIcon = false;
this.Text = "마크목록";
this.Load += new System.EventHandler(this.Mac_List_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
}
@@ -361,5 +386,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn charge;
private System.Windows.Forms.DataGridViewTextBoxColumn check;
public System.Windows.Forms.Button btn_Lookup;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel2;
}
}