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

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

1. 마크 목록
ㄴ> 목록 삭제할 경우 버그 수정.
  ㄴ> 도서 1개만 삭제되고 DB에 계속 남아있는 버그 수정.

2. 마크 목록 생성
ㄴ> 기존 목록을 유지할지 제거할지 선택할 경우 삭제및 수정에 대한 버그 수정.

3. 복본조사
ㄴ> 리미트 500권에서 10,000권으로 증가.

4. 마크 작성
ㄴ> 시방서 마크목록 생성이 안되는 버그 수정.
ㄴ> 칸채우기 버그 수정을 위해 테스트 계정 제외하고 잠금.
ㄴ> 외부마크 저장시 덮어씌워 저장되는 버그 수정.
This commit is contained in:
SeungHo Yang
2022-02-17 17:39:07 +09:00
parent 108f4387d4
commit 87365c903e
20 changed files with 477 additions and 432 deletions

View File

@@ -28,23 +28,11 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.start_date = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.end_date = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.work_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.count = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.stock = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.unstock = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.state = new System.Windows.Forms.DataGridViewTextBoxColumn();
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();
@@ -57,6 +45,18 @@
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();
this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.work_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.count = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.stock = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.unstock = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.state = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.check = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
//
@@ -81,14 +81,14 @@
//
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.idx,
@@ -103,92 +103,23 @@
this.etc,
this.charge,
this.check});
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;
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);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersWidth = 40;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(1094, 610);
this.dataGridView1.Size = new System.Drawing.Size(1100, 610);
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);
//
// idx
//
this.idx.HeaderText = "idx";
this.idx.Name = "idx";
this.idx.Visible = false;
//
// start_date
//
this.start_date.HeaderText = "목록일자";
this.start_date.Name = "start_date";
//
// end_date
//
this.end_date.HeaderText = "완료일자";
this.end_date.Name = "end_date";
//
// list_name
//
this.list_name.HeaderText = "목록명";
this.list_name.Name = "list_name";
this.list_name.Width = 170;
//
// work_name
//
this.work_name.HeaderText = "작업명";
this.work_name.Name = "work_name";
//
// count
//
this.count.HeaderText = "수량";
this.count.Name = "count";
this.count.Width = 80;
//
// stock
//
this.stock.HeaderText = "입고";
this.stock.Name = "stock";
this.stock.Width = 70;
//
// unstock
//
this.unstock.HeaderText = "미입고";
this.unstock.Name = "unstock";
this.unstock.Width = 70;
//
// state
//
this.state.HeaderText = "상태";
this.state.Name = "state";
this.state.Width = 70;
//
// etc
//
this.etc.HeaderText = "비고";
this.etc.Name = "etc";
this.etc.Width = 170;
//
// charge
//
this.charge.HeaderText = "담당자";
this.charge.Name = "charge";
this.charge.Width = 70;
//
// check
//
this.check.HeaderText = "V";
this.check.Name = "check";
this.check.Width = 35;
//
// cb_state
//
this.cb_state.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -209,7 +140,7 @@
//
// btn_Lookup
//
this.btn_Lookup.Location = new System.Drawing.Point(509, 3);
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;
@@ -219,7 +150,7 @@
//
// btn_Excel
//
this.btn_Excel.Location = new System.Drawing.Point(978, 3);
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;
@@ -229,7 +160,7 @@
//
// btn_Close
//
this.btn_Close.Location = new System.Drawing.Point(1045, 3);
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;
@@ -239,7 +170,7 @@
//
// btn_Save
//
this.btn_Save.Location = new System.Drawing.Point(911, 3);
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;
@@ -249,7 +180,7 @@
//
// btn_Merge
//
this.btn_Merge.Location = new System.Drawing.Point(643, 3);
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;
@@ -259,7 +190,7 @@
//
// btn_Progress
//
this.btn_Progress.Location = new System.Drawing.Point(710, 3);
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;
@@ -269,7 +200,7 @@
//
// btn_Completion
//
this.btn_Completion.Location = new System.Drawing.Point(777, 3);
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;
@@ -279,7 +210,7 @@
//
// btn_Delete
//
this.btn_Delete.Location = new System.Drawing.Point(844, 3);
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;
@@ -289,7 +220,7 @@
//
// btn_AddList
//
this.btn_AddList.Location = new System.Drawing.Point(576, 3);
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;
@@ -297,11 +228,82 @@
this.btn_AddList.UseVisualStyleBackColor = true;
this.btn_AddList.Click += new System.EventHandler(this.btn_AddList_Click);
//
// idx
//
this.idx.HeaderText = "idx";
this.idx.Name = "idx";
this.idx.Visible = false;
//
// start_date
//
this.start_date.HeaderText = "목록일자";
this.start_date.Name = "start_date";
//
// end_date
//
this.end_date.HeaderText = "완료일자";
this.end_date.Name = "end_date";
//
// list_name
//
this.list_name.HeaderText = "목록명";
this.list_name.Name = "list_name";
this.list_name.Width = 200;
//
// work_name
//
this.work_name.HeaderText = "작업명";
this.work_name.Name = "work_name";
//
// count
//
this.count.HeaderText = "수량";
this.count.Name = "count";
this.count.Width = 80;
//
// stock
//
this.stock.HeaderText = "입고";
this.stock.Name = "stock";
this.stock.Visible = false;
this.stock.Width = 70;
//
// unstock
//
this.unstock.HeaderText = "미입고";
this.unstock.Name = "unstock";
this.unstock.Visible = false;
this.unstock.Width = 70;
//
// state
//
this.state.HeaderText = "상태";
this.state.Name = "state";
this.state.Width = 70;
//
// etc
//
this.etc.HeaderText = "비고";
this.etc.Name = "etc";
this.etc.Width = 280;
//
// charge
//
this.charge.HeaderText = "담당자";
this.charge.Name = "charge";
this.charge.Width = 70;
//
// check
//
this.check.HeaderText = "V";
this.check.Name = "check";
this.check.Width = 35;
//
// Mac_List
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1122, 661);
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);
@@ -337,6 +339,11 @@
private System.Windows.Forms.Button btn_Save;
public System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.SaveFileDialog saveFileDialog1;
private System.Windows.Forms.Button btn_Merge;
private System.Windows.Forms.Button btn_Progress;
private System.Windows.Forms.Button btn_Completion;
private System.Windows.Forms.Button btn_Delete;
private System.Windows.Forms.Button btn_AddList;
private System.Windows.Forms.DataGridViewTextBoxColumn idx;
private System.Windows.Forms.DataGridViewTextBoxColumn start_date;
private System.Windows.Forms.DataGridViewTextBoxColumn end_date;
@@ -349,10 +356,5 @@
private System.Windows.Forms.DataGridViewTextBoxColumn etc;
private System.Windows.Forms.DataGridViewTextBoxColumn charge;
private System.Windows.Forms.DataGridViewTextBoxColumn check;
private System.Windows.Forms.Button btn_Merge;
private System.Windows.Forms.Button btn_Progress;
private System.Windows.Forms.Button btn_Completion;
private System.Windows.Forms.Button btn_Delete;
private System.Windows.Forms.Button btn_AddList;
}
}