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

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

1. 회원 관리
ㄴ> 아이디 영어 숫자 조합으로만 적용.

2. 복본 조사
ㄴ> 복본 조사 속도 업그레이드 중.
This commit is contained in:
SeungHo Yang
2022-03-10 08:32:03 +09:00
parent ab823c9249
commit 90a4380e83
19 changed files with 761 additions and 338 deletions

Binary file not shown.

View File

@@ -96,7 +96,9 @@ namespace WindowsFormsApp1
if (Ary.Length < 1)
return;
ID_text.Text = Ary[0].Replace("ID=", "");
//System.Text.RegularExpressions.Regex.Replace()
Ary[0] = Ary[0].Replace("ID=", "");
ID_text.Text = System.Text.RegularExpressions.Regex.Replace(Ary[0], @"[^a-zA-Z0-9]", "");
PW_text.Text = Ary[1].Replace("PW=", "");
}
#endregion

View File

@@ -122,11 +122,14 @@ namespace UniMarc.마크
string cmd = db.More_DB_Search("Specs_Marc", search_col, search_data, area);
Result(db.DB_Send_CMD_Search(cmd));
cc.btn_SearchList.Text = list_name;
cc.SearchCount.Value = cc.dataGridView1.Rows.Count - 1;
this.Close();
}
void Result(string query)
{
cc.dataGridView1.Rows.Clear();
string[] ary = query.Split('|');
string[] grid = { "", "", "" };

View File

@@ -58,6 +58,7 @@ namespace UniMarc.마크
if (e.KeyCode == Keys.Enter)
{
int row = dataGridView1.CurrentRow.Index;
if (row < 0) return;
SetCode(row);
this.Close();
}

View File

@@ -28,8 +28,10 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
this.rb_isNumber = new System.Windows.Forms.RadioButton();
this.rb_isHave = new System.Windows.Forms.RadioButton();
this.btn_SearchList = new System.Windows.Forms.Button();
this.btn_Start = new System.Windows.Forms.Button();
this.btn_Stop = new System.Windows.Forms.Button();
@@ -49,8 +51,11 @@
this.panel6 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.chk_RemoveBrit = new System.Windows.Forms.CheckBox();
this.btn_GridReset = new System.Windows.Forms.Button();
this.btn_OpenMemo = new System.Windows.Forms.Button();
this.chk_spChar = new System.Windows.Forms.CheckBox();
this.panel5 = new System.Windows.Forms.Panel();
this.btn_ResultEmpty = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.SearchCount)).BeginInit();
this.panel2.SuspendLayout();
@@ -64,6 +69,8 @@
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel1.Controls.Add(this.rb_isNumber);
this.panel1.Controls.Add(this.rb_isHave);
this.panel1.Controls.Add(this.btn_SearchList);
this.panel1.Controls.Add(this.btn_Start);
this.panel1.Controls.Add(this.btn_Stop);
@@ -73,11 +80,34 @@
this.panel1.Size = new System.Drawing.Size(635, 34);
this.panel1.TabIndex = 0;
//
// rb_isNumber
//
this.rb_isNumber.AutoSize = true;
this.rb_isNumber.Location = new System.Drawing.Point(394, 8);
this.rb_isNumber.Name = "rb_isNumber";
this.rb_isNumber.Size = new System.Drawing.Size(71, 16);
this.rb_isNumber.TabIndex = 5;
this.rb_isNumber.TabStop = true;
this.rb_isNumber.Text = "숫자표출";
this.rb_isNumber.UseVisualStyleBackColor = true;
//
// rb_isHave
//
this.rb_isHave.AutoSize = true;
this.rb_isHave.Checked = true;
this.rb_isHave.Location = new System.Drawing.Point(318, 8);
this.rb_isHave.Name = "rb_isHave";
this.rb_isHave.Size = new System.Drawing.Size(71, 16);
this.rb_isHave.TabIndex = 5;
this.rb_isHave.TabStop = true;
this.rb_isHave.Text = "소장표출";
this.rb_isHave.UseVisualStyleBackColor = true;
//
// btn_SearchList
//
this.btn_SearchList.Location = new System.Drawing.Point(4, 4);
this.btn_SearchList.Name = "btn_SearchList";
this.btn_SearchList.Size = new System.Drawing.Size(356, 24);
this.btn_SearchList.Size = new System.Drawing.Size(305, 24);
this.btn_SearchList.TabIndex = 3;
this.btn_SearchList.Text = "목록 검색";
this.btn_SearchList.UseVisualStyleBackColor = true;
@@ -139,7 +169,7 @@
//
this.tb_SearchTarget.Location = new System.Drawing.Point(66, 6);
this.tb_SearchTarget.Name = "tb_SearchTarget";
this.tb_SearchTarget.Size = new System.Drawing.Size(294, 21);
this.tb_SearchTarget.Size = new System.Drawing.Size(243, 21);
this.tb_SearchTarget.TabIndex = 1;
this.tb_SearchTarget.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_SearchTarget_KeyDown);
//
@@ -172,14 +202,14 @@
this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
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.book_name,
@@ -189,7 +219,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(635, 630);
this.dataGridView1.Size = new System.Drawing.Size(635, 636);
this.dataGridView1.TabIndex = 1;
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
@@ -219,12 +249,12 @@
this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
this.webBrowser1.Name = "webBrowser1";
this.webBrowser1.ScriptErrorsSuppressed = true;
this.webBrowser1.Size = new System.Drawing.Size(717, 732);
this.webBrowser1.Size = new System.Drawing.Size(673, 738);
this.webBrowser1.TabIndex = 2;
//
// btn_ApplyFilter
//
this.btn_ApplyFilter.Location = new System.Drawing.Point(473, 4);
this.btn_ApplyFilter.Location = new System.Drawing.Point(311, 4);
this.btn_ApplyFilter.Name = "btn_ApplyFilter";
this.btn_ApplyFilter.Size = new System.Drawing.Size(75, 24);
this.btn_ApplyFilter.TabIndex = 2;
@@ -241,7 +271,7 @@
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(635, 732);
this.panel3.Size = new System.Drawing.Size(635, 738);
this.panel3.TabIndex = 3;
//
// panel6
@@ -250,13 +280,16 @@
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 102);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(635, 630);
this.panel6.Size = new System.Drawing.Size(635, 636);
this.panel6.TabIndex = 3;
//
// panel4
//
this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel4.Controls.Add(this.chk_RemoveBrit);
this.panel4.Controls.Add(this.btn_ResultEmpty);
this.panel4.Controls.Add(this.btn_GridReset);
this.panel4.Controls.Add(this.btn_OpenMemo);
this.panel4.Controls.Add(this.btn_ApplyFilter);
this.panel4.Controls.Add(this.chk_spChar);
this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
@@ -275,6 +308,26 @@
this.chk_RemoveBrit.Text = "괄호안의 문자 제거";
this.chk_RemoveBrit.UseVisualStyleBackColor = true;
//
// btn_GridReset
//
this.btn_GridReset.Location = new System.Drawing.Point(553, 4);
this.btn_GridReset.Name = "btn_GridReset";
this.btn_GridReset.Size = new System.Drawing.Size(75, 24);
this.btn_GridReset.TabIndex = 2;
this.btn_GridReset.Text = "표 비우기";
this.btn_GridReset.UseVisualStyleBackColor = true;
this.btn_GridReset.Click += new System.EventHandler(this.btn_GridReset_Click);
//
// btn_OpenMemo
//
this.btn_OpenMemo.Location = new System.Drawing.Point(392, 4);
this.btn_OpenMemo.Name = "btn_OpenMemo";
this.btn_OpenMemo.Size = new System.Drawing.Size(75, 24);
this.btn_OpenMemo.TabIndex = 2;
this.btn_OpenMemo.Text = "메모장열기";
this.btn_OpenMemo.UseVisualStyleBackColor = true;
this.btn_OpenMemo.Click += new System.EventHandler(this.btn_OpenMemo_Click);
//
// chk_spChar
//
this.chk_spChar.AutoSize = true;
@@ -291,19 +344,30 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(635, 0);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(717, 732);
this.panel5.Size = new System.Drawing.Size(673, 738);
this.panel5.TabIndex = 4;
//
// btn_ResultEmpty
//
this.btn_ResultEmpty.Location = new System.Drawing.Point(473, 4);
this.btn_ResultEmpty.Name = "btn_ResultEmpty";
this.btn_ResultEmpty.Size = new System.Drawing.Size(75, 24);
this.btn_ResultEmpty.TabIndex = 2;
this.btn_ResultEmpty.Text = "결과 비움";
this.btn_ResultEmpty.UseVisualStyleBackColor = true;
this.btn_ResultEmpty.Click += new System.EventHandler(this.btn_ResultEmpty_Click);
//
// Check_copy
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1352, 732);
this.ClientSize = new System.Drawing.Size(1308, 738);
this.Controls.Add(this.panel5);
this.Controls.Add(this.panel3);
this.Name = "Check_copy";
this.Text = "복본조사";
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.SearchCount)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
@@ -322,7 +386,6 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.NumericUpDown SearchCount;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Button btn_Close;
private System.Windows.Forms.Button btn_Stop;
@@ -341,5 +404,11 @@
private System.Windows.Forms.DataGridViewTextBoxColumn book_name;
private System.Windows.Forms.DataGridViewTextBoxColumn book_comp;
private System.Windows.Forms.DataGridViewTextBoxColumn Count;
public System.Windows.Forms.NumericUpDown SearchCount;
private System.Windows.Forms.RadioButton rb_isNumber;
private System.Windows.Forms.RadioButton rb_isHave;
private System.Windows.Forms.Button btn_GridReset;
private System.Windows.Forms.Button btn_OpenMemo;
private System.Windows.Forms.Button btn_ResultEmpty;
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -29,7 +29,7 @@ namespace UniMarc.마크
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
this.tb_Search = new System.Windows.Forms.TextBox();
this.cb_gu = new System.Windows.Forms.ComboBox();
@@ -49,8 +49,8 @@ namespace UniMarc.마크
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.panel2 = new System.Windows.Forms.Panel();
this.btn_Morge = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
this.btn_OpenFile = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel2.SuspendLayout();
@@ -172,14 +172,14 @@ namespace UniMarc.마크
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCellsExceptHeaders;
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;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.idx,
@@ -193,7 +193,7 @@ namespace UniMarc.마크
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView1.Size = new System.Drawing.Size(806, 324);
this.dataGridView1.Size = new System.Drawing.Size(805, 324);
this.dataGridView1.TabIndex = 2;
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
@@ -248,7 +248,7 @@ namespace UniMarc.마크
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(806, 33);
this.panel2.Size = new System.Drawing.Size(805, 33);
this.panel2.TabIndex = 3;
//
// btn_Morge
@@ -261,17 +261,9 @@ namespace UniMarc.마크
this.btn_Morge.UseVisualStyleBackColor = true;
this.btn_Morge.Click += new System.EventHandler(this.btn_Morge_Click);
//
// panel3
//
this.panel3.Controls.Add(this.dataGridView1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 33);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(806, 324);
this.panel3.TabIndex = 4;
//
// btn_OpenFile
//
this.btn_OpenFile.Enabled = false;
this.btn_OpenFile.Location = new System.Drawing.Point(680, 1);
this.btn_OpenFile.Name = "btn_OpenFile";
this.btn_OpenFile.Size = new System.Drawing.Size(61, 29);
@@ -280,11 +272,20 @@ namespace UniMarc.마크
this.btn_OpenFile.UseVisualStyleBackColor = true;
this.btn_OpenFile.Click += new System.EventHandler(this.btn_OpenFile_Click);
//
// panel3
//
this.panel3.Controls.Add(this.dataGridView1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 33);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(805, 324);
this.panel3.TabIndex = 4;
//
// Marc_Plan_Sub_SelectList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(806, 357);
this.ClientSize = new System.Drawing.Size(805, 357);
this.Controls.Add(this.panel3);
this.Controls.Add(this.panel2);
this.Name = "Marc_Plan_Sub_SelectList";

View File

@@ -224,13 +224,13 @@ namespace UniMarc.마크
private void btn_OpenFile_Click(object sender, EventArgs e)
{
OpenFileDialog OpenFileDialog = new OpenFileDialog();
string filePath = "";
if (OpenFileDialog.ShowDialog() == DialogResult.OK)
{
filePath = OpenFileDialog.FileName;
string filePath = OpenFileDialog.FileName;
try
{
System.IO.StreamReader r = new System.IO.StreamReader(filePath, Encoding.Default);
InputGrid(r.ReadToEnd());
r.Close();
}
catch (Exception ex)

View File

@@ -169,6 +169,13 @@ namespace WindowsFormsApp1.Home
private void btn_IDOverlap_Click(object sender, EventArgs e)
{
if (!System.Text.RegularExpressions.Regex.IsMatch(tb_ID.Text, @"^[a-zA-Z0-9]"))
{
MessageBox.Show("영어와 숫자 조합으로 작성해주세요!");
overlap = false;
return;
}
string cmd = _DB.DB_Search(Table_User, "id", tb_ID.Text);
string db_res = _DB.DB_Send_CMD_Search(cmd);
if (db_res == "") { MessageBox.Show("사용가능한 아이디입니다. [" + tb_ID.Text + "]"); overlap = true; }