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

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

Browse Source 
** 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
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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/DesignTimeResolveAssemblyReferencesInput.cache
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.

2
unimarc/unimarc/마크/Check_copy.Designer.cs generated
View File

@@ -107,7 +107,7 @@
//
this.SearchCount.Location = new System.Drawing.Point(429, 6);
this.SearchCount.Maximum = new decimal(new int[] {
500,
10000,
0,
0,
0});

232
unimarc/unimarc/마크/Mac_List.Designer.cs generated
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;
}
}

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

@@ -182,6 +182,8 @@ namespace WindowsFormsApp1.Mac
private void btn_Merge_Click(object sender, EventArgs e)
{
Mac_List_Merge merge = new Mac_List_Merge(this);
merge.ListState = cb_state.Text;
merge.UserName = main.User;
merge.Show();
}
@@ -251,14 +253,21 @@ namespace WindowsFormsApp1.Mac
private void btn_Delete_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") {
string D_cmd = db.DB_Delete("Obj_List", "comp_num", compidx,
"idx", dataGridView1.Rows[a].Cells["idx"].Value.ToString());
db.DB_Send_CMD_reVoid(D_cmd);
string[] delete_tbl = { "list_name", "date" };
string[] deleteData = { dataGridView1.Rows[a].Cells["list_name"].Value.ToString(), dataGridView1.Rows[a].Cells["start_date"].Value.ToString() };
D_cmd = db.DB_Delete_No_Limit("Obj_List_Book", "compidx", compidx, delete_tbl, deleteData);
db.DB_Send_CMD_reVoid(D_cmd);
}
}
MessageBox.Show("삭제되었습니다.");
}
private void btn_Close_Click(object sender, EventArgs e)

218
unimarc/unimarc/마크/Mac_List_Add.Designer.cs generated
View File

@@ -37,19 +37,19 @@ namespace UniMarc.마크
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.panel2 = new System.Windows.Forms.Panel();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.tb_divComp = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.btn_AddList = new System.Windows.Forms.Button();
this.tb_divName = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.cb_User = new System.Windows.Forms.ComboBox();
this.tb_ExpectList = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.btn_Close = new System.Windows.Forms.Button();
this.btn_Empty = new System.Windows.Forms.Button();
this.btn_AddList = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.tb_ExpectList = new System.Windows.Forms.TextBox();
this.tb_divName = new System.Windows.Forms.TextBox();
this.tb_divComp = new System.Windows.Forms.TextBox();
this.panel2 = new System.Windows.Forms.Panel();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.header = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.num = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.BookName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -84,6 +84,105 @@ namespace UniMarc.마크
this.panel1.Size = new System.Drawing.Size(897, 59);
this.panel1.TabIndex = 0;
//
// cb_User
//
this.cb_User.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_User.FormattingEnabled = true;
this.cb_User.Location = new System.Drawing.Point(373, 5);
this.cb_User.Name = "cb_User";
this.cb_User.Size = new System.Drawing.Size(82, 20);
this.cb_User.TabIndex = 2;
//
// btn_Close
//
this.btn_Close.Location = new System.Drawing.Point(809, 4);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(75, 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_Empty
//
this.btn_Empty.Location = new System.Drawing.Point(647, 5);
this.btn_Empty.Name = "btn_Empty";
this.btn_Empty.Size = new System.Drawing.Size(75, 23);
this.btn_Empty.TabIndex = 3;
this.btn_Empty.Text = "비 우 기";
this.btn_Empty.UseVisualStyleBackColor = true;
this.btn_Empty.Click += new System.EventHandler(this.btn_Empty_Click);
//
// btn_AddList
//
this.btn_AddList.Location = new System.Drawing.Point(728, 4);
this.btn_AddList.Name = "btn_AddList";
this.btn_AddList.Size = new System.Drawing.Size(75, 23);
this.btn_AddList.TabIndex = 4;
this.btn_AddList.Text = "저 장";
this.btn_AddList.UseVisualStyleBackColor = true;
this.btn_AddList.Click += new System.EventHandler(this.btn_AddList_Click);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(330, 9);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(41, 12);
this.label3.TabIndex = 1;
this.label3.Text = "담당자";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(178, 9);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 12);
this.label2.TabIndex = 1;
this.label2.Text = "납품명";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(27, 35);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(81, 12);
this.label4.TabIndex = 1;
this.label4.Text = "생성될 목록명";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(26, 9);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.TabIndex = 1;
this.label1.Text = "납품처";
//
// tb_ExpectList
//
this.tb_ExpectList.Enabled = false;
this.tb_ExpectList.Location = new System.Drawing.Point(114, 31);
this.tb_ExpectList.Name = "tb_ExpectList";
this.tb_ExpectList.Size = new System.Drawing.Size(250, 21);
this.tb_ExpectList.TabIndex = 0;
//
// tb_divName
//
this.tb_divName.Location = new System.Drawing.Point(221, 5);
this.tb_divName.Name = "tb_divName";
this.tb_divName.Size = new System.Drawing.Size(100, 21);
this.tb_divName.TabIndex = 1;
this.tb_divName.TextChanged += new System.EventHandler(this.Delivery_TextChanged);
//
// tb_divComp
//
this.tb_divComp.Location = new System.Drawing.Point(69, 5);
this.tb_divComp.Name = "tb_divComp";
this.tb_divComp.Size = new System.Drawing.Size(100, 21);
this.tb_divComp.TabIndex = 0;
this.tb_divComp.TextChanged += new System.EventHandler(this.Delivery_TextChanged);
//
// panel2
//
this.panel2.Controls.Add(this.dataGridView1);
@@ -122,105 +221,6 @@ namespace UniMarc.마크
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
//
// tb_divComp
//
this.tb_divComp.Location = new System.Drawing.Point(69, 5);
this.tb_divComp.Name = "tb_divComp";
this.tb_divComp.Size = new System.Drawing.Size(100, 21);
this.tb_divComp.TabIndex = 0;
this.tb_divComp.TextChanged += new System.EventHandler(this.Delivery_TextChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(26, 9);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.TabIndex = 1;
this.label1.Text = "납품처";
//
// btn_AddList
//
this.btn_AddList.Location = new System.Drawing.Point(728, 4);
this.btn_AddList.Name = "btn_AddList";
this.btn_AddList.Size = new System.Drawing.Size(75, 23);
this.btn_AddList.TabIndex = 2;
this.btn_AddList.Text = "저 장";
this.btn_AddList.UseVisualStyleBackColor = true;
this.btn_AddList.Click += new System.EventHandler(this.btn_AddList_Click);
//
// tb_divName
//
this.tb_divName.Location = new System.Drawing.Point(221, 5);
this.tb_divName.Name = "tb_divName";
this.tb_divName.Size = new System.Drawing.Size(100, 21);
this.tb_divName.TabIndex = 0;
this.tb_divName.TextChanged += new System.EventHandler(this.Delivery_TextChanged);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(178, 9);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 12);
this.label2.TabIndex = 1;
this.label2.Text = "납품명";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(330, 9);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(41, 12);
this.label3.TabIndex = 1;
this.label3.Text = "담당자";
//
// cb_User
//
this.cb_User.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_User.FormattingEnabled = true;
this.cb_User.Location = new System.Drawing.Point(373, 5);
this.cb_User.Name = "cb_User";
this.cb_User.Size = new System.Drawing.Size(82, 20);
this.cb_User.TabIndex = 3;
//
// tb_ExpectList
//
this.tb_ExpectList.Enabled = false;
this.tb_ExpectList.Location = new System.Drawing.Point(114, 31);
this.tb_ExpectList.Name = "tb_ExpectList";
this.tb_ExpectList.Size = new System.Drawing.Size(250, 21);
this.tb_ExpectList.TabIndex = 0;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(27, 35);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(81, 12);
this.label4.TabIndex = 1;
this.label4.Text = "생성될 목록명";
//
// btn_Close
//
this.btn_Close.Location = new System.Drawing.Point(809, 4);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(75, 23);
this.btn_Close.TabIndex = 2;
this.btn_Close.Text = "닫 기";
this.btn_Close.UseVisualStyleBackColor = true;
this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
//
// btn_Empty
//
this.btn_Empty.Location = new System.Drawing.Point(647, 5);
this.btn_Empty.Name = "btn_Empty";
this.btn_Empty.Size = new System.Drawing.Size(75, 23);
this.btn_Empty.TabIndex = 2;
this.btn_Empty.Text = "비 우 기";
this.btn_Empty.UseVisualStyleBackColor = true;
this.btn_Empty.Click += new System.EventHandler(this.btn_Empty_Click);
//
// header
//
this.header.HeaderText = "머리글";

5
unimarc/unimarc/마크/Mac_List_Add.cs
View File

@@ -105,8 +105,8 @@ namespace UniMarc.마크
int TotalCount = InBook_List.Count;
string[] InList_Tbl = { "comp_num", "date", "list_name", "charge", "state", "vol" };
string[] InList_Col = { compidx, Today, listName, charge, "진행", TotalCount.ToString()};
string[] InList_Tbl = { "comp_num", "date", "list_name", "m_charge", "state", "vol", "chk_marc" };
string[] InList_Col = { compidx, Today, listName, charge, "진행", TotalCount.ToString(), "1" };
string InList_Cmd = db.DB_INSERT("Obj_List", InList_Tbl, InList_Col);
@@ -116,7 +116,6 @@ namespace UniMarc.마크
db.DB_Send_CMD_reVoid(InList_Cmd);
db.DB_Send_CMD_reVoid(InBook_Cmd);
MessageBox.Show("저장되었습니다!");
}

226
unimarc/unimarc/마크/Mac_List_Merge.Designer.cs generated
View File

@@ -29,27 +29,18 @@ namespace WindowsFormsApp1.마크
/// </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 dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.list_marc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.total = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.flatter = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.unflatter = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1 = new System.Windows.Forms.Panel();
this.rtb_etc = new System.Windows.Forms.RichTextBox();
this.end_date = new System.Windows.Forms.DateTimePicker();
this.rb_Delete = new System.Windows.Forms.RadioButton();
this.rb_Keep = new System.Windows.Forms.RadioButton();
this.cb_grade = new System.Windows.Forms.ComboBox();
this.cb_KDC = new System.Windows.Forms.ComboBox();
this.tb_list_name = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.btn_Close = new System.Windows.Forms.Button();
this.btn_Merge = new System.Windows.Forms.Button();
@@ -57,6 +48,10 @@ namespace WindowsFormsApp1.마크
this.lbl_charge = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.lbl_state = new System.Windows.Forms.Label();
this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.vol = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -65,68 +60,37 @@ namespace WindowsFormsApp1.마크
//
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;
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle13.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.idx,
this.list_marc,
this.total,
this.flatter,
this.unflatter});
this.list_name,
this.list_date,
this.vol});
this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
this.dataGridView1.Location = new System.Drawing.Point(12, 34);
this.dataGridView1.Name = "dataGridView1";
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.RowHeadersDefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle14.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle14;
this.dataGridView1.RowHeadersWidth = 25;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(380, 150);
this.dataGridView1.Size = new System.Drawing.Size(402, 150);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
//
// idx
//
this.idx.HeaderText = "idx";
this.idx.Name = "idx";
this.idx.Visible = false;
//
// list_marc
//
this.list_marc.HeaderText = "작업처";
this.list_marc.Name = "list_marc";
this.list_marc.Width = 325;
//
// total
//
this.total.HeaderText = "합계";
this.total.Name = "total";
this.total.Visible = false;
//
// flatter
//
this.flatter.HeaderText = "편목";
this.flatter.Name = "flatter";
this.flatter.Visible = false;
//
// unflatter
//
this.unflatter.HeaderText = "미편목";
this.unflatter.Name = "unflatter";
this.unflatter.Visible = false;
//
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -134,25 +98,22 @@ namespace WindowsFormsApp1.마크
this.panel1.Controls.Add(this.end_date);
this.panel1.Controls.Add(this.rb_Delete);
this.panel1.Controls.Add(this.rb_Keep);
this.panel1.Controls.Add(this.cb_grade);
this.panel1.Controls.Add(this.cb_KDC);
this.panel1.Controls.Add(this.tb_list_name);
this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.label5);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.label1);
this.panel1.Location = new System.Drawing.Point(12, 190);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(380, 173);
this.panel1.Size = new System.Drawing.Size(402, 179);
this.panel1.TabIndex = 1;
//
// rtb_etc
//
this.rtb_etc.Location = new System.Drawing.Point(46, 96);
this.rtb_etc.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.rtb_etc.Location = new System.Drawing.Point(46, 63);
this.rtb_etc.Name = "rtb_etc";
this.rtb_etc.Size = new System.Drawing.Size(324, 65);
this.rtb_etc.Size = new System.Drawing.Size(348, 108);
this.rtb_etc.TabIndex = 5;
this.rtb_etc.Text = "";
//
@@ -160,7 +121,7 @@ namespace WindowsFormsApp1.마크
//
this.end_date.CustomFormat = "yyyy-MM-dd";
this.end_date.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.end_date.Location = new System.Drawing.Point(288, 38);
this.end_date.Location = new System.Drawing.Point(312, 35);
this.end_date.Name = "end_date";
this.end_date.Size = new System.Drawing.Size(82, 21);
this.end_date.TabIndex = 4;
@@ -168,18 +129,18 @@ namespace WindowsFormsApp1.마크
// rb_Delete
//
this.rb_Delete.AutoSize = true;
this.rb_Delete.Location = new System.Drawing.Point(219, 69);
this.rb_Delete.Location = new System.Drawing.Point(142, 37);
this.rb_Delete.Name = "rb_Delete";
this.rb_Delete.Size = new System.Drawing.Size(95, 16);
this.rb_Delete.TabIndex = 3;
this.rb_Delete.TabStop = true;
this.rb_Delete.Text = "기존목록삭제";
this.rb_Delete.Text = "기존목록제거";
this.rb_Delete.UseVisualStyleBackColor = true;
//
// rb_Keep
//
this.rb_Keep.AutoSize = true;
this.rb_Keep.Location = new System.Drawing.Point(89, 69);
this.rb_Keep.Location = new System.Drawing.Point(46, 37);
this.rb_Keep.Name = "rb_Keep";
this.rb_Keep.Size = new System.Drawing.Size(95, 16);
this.rb_Keep.TabIndex = 3;
@@ -187,90 +148,58 @@ namespace WindowsFormsApp1.마크
this.rb_Keep.Text = "기존목록유지";
this.rb_Keep.UseVisualStyleBackColor = true;
//
// cb_grade
//
this.cb_grade.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_grade.FormattingEnabled = true;
this.cb_grade.Location = new System.Drawing.Point(155, 38);
this.cb_grade.Name = "cb_grade";
this.cb_grade.Size = new System.Drawing.Size(65, 20);
this.cb_grade.TabIndex = 2;
//
// cb_KDC
//
this.cb_KDC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_KDC.FormattingEnabled = true;
this.cb_KDC.Location = new System.Drawing.Point(46, 38);
this.cb_KDC.Name = "cb_KDC";
this.cb_KDC.Size = new System.Drawing.Size(65, 20);
this.cb_KDC.TabIndex = 2;
//
// tb_list_name
//
this.tb_list_name.Location = new System.Drawing.Point(46, 9);
this.tb_list_name.Location = new System.Drawing.Point(46, 6);
this.tb_list_name.Name = "tb_list_name";
this.tb_list_name.Size = new System.Drawing.Size(324, 21);
this.tb_list_name.Size = new System.Drawing.Size(348, 21);
this.tb_list_name.TabIndex = 1;
this.tb_list_name.Text = "변경할 작업처의 이름";
this.tb_list_name.Text = "설정할 목록명";
this.tb_list_name.Click += new System.EventHandler(this.tb_list_name_Click);
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(10, 71);
this.label4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label4.Location = new System.Drawing.Point(2, 39);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(29, 12);
this.label4.Size = new System.Drawing.Size(41, 12);
this.label4.TabIndex = 0;
this.label4.Text = "목록";
this.label4.Text = "목 록";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(10, 100);
this.label3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label3.Location = new System.Drawing.Point(2, 67);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(29, 12);
this.label3.Size = new System.Drawing.Size(41, 12);
this.label3.TabIndex = 0;
this.label3.Text = "비고";
this.label3.Text = "비 고";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(224, 42);
this.label6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label6.Location = new System.Drawing.Point(243, 39);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(65, 12);
this.label6.Size = new System.Drawing.Size(70, 12);
this.label6.TabIndex = 0;
this.label6.Text = "마감예정일";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(115, 42);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(41, 12);
this.label5.TabIndex = 0;
this.label5.Text = "중요도";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(10, 42);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(29, 12);
this.label2.TabIndex = 0;
this.label2.Text = "구분";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(4, 13);
this.label1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label1.Location = new System.Drawing.Point(2, 10);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.Size = new System.Drawing.Size(44, 12);
this.label1.TabIndex = 0;
this.label1.Text = "작업처";
this.label1.Text = "목록명";
//
// btn_Close
//
this.btn_Close.Location = new System.Drawing.Point(317, 6);
this.btn_Close.Location = new System.Drawing.Point(339, 6);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(75, 23);
this.btn_Close.TabIndex = 2;
@@ -280,7 +209,7 @@ namespace WindowsFormsApp1.마크
//
// btn_Merge
//
this.btn_Merge.Location = new System.Drawing.Point(236, 6);
this.btn_Merge.Location = new System.Drawing.Point(258, 6);
this.btn_Merge.Name = "btn_Merge";
this.btn_Merge.Size = new System.Drawing.Size(75, 23);
this.btn_Merge.TabIndex = 2;
@@ -291,9 +220,10 @@ namespace WindowsFormsApp1.마크
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(17, 11);
this.label7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label7.Location = new System.Drawing.Point(15, 11);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(53, 12);
this.label7.Size = new System.Drawing.Size(59, 12);
this.label7.TabIndex = 3;
this.label7.Text = "담당자 : ";
//
@@ -309,9 +239,10 @@ namespace WindowsFormsApp1.마크
// label8
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label8.Location = new System.Drawing.Point(133, 11);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(41, 12);
this.label8.Size = new System.Drawing.Size(46, 12);
this.label8.TabIndex = 3;
this.label8.Text = "상태 : ";
//
@@ -324,11 +255,35 @@ namespace WindowsFormsApp1.마크
this.lbl_state.TabIndex = 4;
this.lbl_state.Text = "상태상태";
//
// idx
//
this.idx.HeaderText = "idx";
this.idx.Name = "idx";
this.idx.Visible = false;
//
// list_name
//
this.list_name.HeaderText = "목록명";
this.list_name.Name = "list_name";
this.list_name.Width = 350;
//
// list_date
//
this.list_date.HeaderText = "목록일자";
this.list_date.Name = "list_date";
this.list_date.Visible = false;
//
// vol
//
this.vol.HeaderText = "수량";
this.vol.Name = "vol";
this.vol.Visible = false;
//
// Mac_List_Merge
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(402, 373);
this.ClientSize = new System.Drawing.Size(424, 381);
this.Controls.Add(this.lbl_state);
this.Controls.Add(this.label8);
this.Controls.Add(this.lbl_charge);
@@ -354,27 +309,22 @@ namespace WindowsFormsApp1.마크
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.DateTimePicker end_date;
private System.Windows.Forms.RadioButton rb_Keep;
private System.Windows.Forms.ComboBox cb_grade;
private System.Windows.Forms.ComboBox cb_KDC;
private System.Windows.Forms.TextBox tb_list_name;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.RichTextBox rtb_etc;
private System.Windows.Forms.RadioButton rb_Delete;
private System.Windows.Forms.Button btn_Close;
private System.Windows.Forms.Button btn_Merge;
private System.Windows.Forms.DataGridViewTextBoxColumn idx;
private System.Windows.Forms.DataGridViewTextBoxColumn list_marc;
private System.Windows.Forms.DataGridViewTextBoxColumn total;
private System.Windows.Forms.DataGridViewTextBoxColumn flatter;
private System.Windows.Forms.DataGridViewTextBoxColumn unflatter;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label lbl_charge;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label lbl_state;
private System.Windows.Forms.DataGridViewTextBoxColumn idx;
private System.Windows.Forms.DataGridViewTextBoxColumn list_name;
private System.Windows.Forms.DataGridViewTextBoxColumn list_date;
private System.Windows.Forms.DataGridViewTextBoxColumn vol;
}
}

180
unimarc/unimarc/마크/Mac_List_Merge.cs
View File

@@ -16,54 +16,56 @@ namespace WindowsFormsApp1.마크
Mac_List ml;
Helper_DB db = new Helper_DB();
Skill_Grid skill = new Skill_Grid();
public string UserName = "";
public string ListState = "";
public Mac_List_Merge(Mac_List _ml)
{
InitializeComponent();
ml = _ml;
}
private void Mac_List_Merge_Load(object sender, EventArgs e)
{
lbl_charge.Text = UserName;
lbl_state.Text = ListState;
db.DBcon();
data_Input();
string[] list_kdc = { "KDC4", "KDC5", "KDC6" };
string[] list_grade = { "A", "B", "C", "D" };
cb_KDC.Items.AddRange(list_kdc);
cb_grade.Items.AddRange(list_grade);
cb_KDC.SelectedIndex = 0;
cb_grade.SelectedItem = "C";
}
void data_Input()
{
string[] input_data = { "", "", "", "", "" };
string[] input_data = { "", "", "", "" };
int count = ml.dataGridView1.Rows.Count;
for(int a = 0; a < count; a++)
{
if (ml.dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") {
input_data[0] = ml.dataGridView1.Rows[a].Cells["idx"].Value.ToString();
input_data[1] = ml.dataGridView1.Rows[a].Cells["list_marc"].Value.ToString();
input_data[2] = ml.dataGridView1.Rows[a].Cells["total"].Value.ToString();
input_data[3] = ml.dataGridView1.Rows[a].Cells["flatter"].Value.ToString();
input_data[4] = ml.dataGridView1.Rows[a].Cells["unflatter"].Value.ToString();
lbl_charge.Text = ml.dataGridView1.Rows[a].Cells["charge"].Value.ToString();
lbl_state.Text = ml.dataGridView1.Rows[a].Cells["state"].Value.ToString();
input_data[1] = ml.dataGridView1.Rows[a].Cells["list_name"].Value.ToString();
input_data[2] = ml.dataGridView1.Rows[a].Cells["start_date"].Value.ToString();
input_data[3] = ml.dataGridView1.Rows[a].Cells["count"].Value.ToString();
dataGridView1.Rows.Add(input_data);
}
}
}
private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)
{
skill.Print_Grid_Num(sender, e);
}
private void tb_list_name_Click(object sender, EventArgs e)
{
if (tb_list_name.Text == "변경할 작업처의 이름") {
if (tb_list_name.Text == "설정할 목록명") {
tb_list_name.Text = "";
}
}
private void btn_Merge_Click(object sender, EventArgs e)
{
if (rb_Delete.Checked == false && rb_Keep.Checked == false) {
if (!rb_Delete.Checked && !rb_Keep.Checked) {
MessageBox.Show("기존목록의 유지여부를 선택해주세요.");
return;
}
@@ -71,7 +73,7 @@ namespace WindowsFormsApp1.마크
MessageBox.Show("작업처의 이름을 입력해주세요.");
return;
}
if (chk_Overlap() == false) {
if (!chk_Overlap()) {
MessageBox.Show("작업처의 이름이 중복됩니다. 다시 설정해주세요.");
return;
}
@@ -79,68 +81,144 @@ namespace WindowsFormsApp1.마크
// TODO: 생각나는 필터링있으면 if문 추가할 것.
// 이 밑으론 DB적용사항. 기존목록유지시 INSERT만 / 기존목록삭제시 INSERT이후 기존목록DELETE
data_Insert();
if (rb_Delete.Checked == true) {
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
book_Insert(a);
}
if (rb_Delete.Checked) {
// 삭제 함수
data_delete();
}
}
void data_Insert()
{
string table = "Obj_List_Marc";
string table = "Obj_List";
string start = DateTime.Now.ToString("yyyy-MM-dd");
string end = end_date.Value.ToString().Substring(0, 10);
string[] in_col = { "compidx", "date", "date_res", "list_name", "KDC",
"m_charge", "total", "flatter", "unflatter", "state",
"grade", "etc" };
string[] in_data = { ml.compidx, start, end, tb_list_name.Text, cb_KDC.Text,
lbl_charge.Text, cal_Total("total").ToString(), cal_Total("flatter").ToString(), cal_Total("unflatter").ToString(), lbl_state.Text,
cb_grade.Text, rtb_etc.Text };
string[] in_col = {
"comp_num", "date", "date_res", "list_name", "m_charge",
"vol","state", "m_etc", "chk_marc"
};
string[] in_data = {
ml.compidx, start, end, tb_list_name.Text, lbl_charge.Text,
cal_Total("vol").ToString(), lbl_state.Text, rtb_etc.Text, "1"
};
string Incmd = db.DB_INSERT(table, in_col, in_data);
db.DB_Send_CMD_reVoid(Incmd);
}
void data_delete()
{
string table = "Obj_List_Marc";
string[] target_area = { "idx" };
string[] target = { "" };
for(int a = 0; a < dataGridView1.Rows.Count - 1; a++)
{
target[0] = dataGridView1.Rows[a].Cells["idx"].Value.ToString();
string cmd = db.DB_Delete_More_term(table, "compidx", ml.compidx, target_area, target);
db.DB_Send_CMD_reVoid(cmd);
}
}
bool chk_Overlap()
void book_Insert(int row)
{
string cmd = db.DB_Select_Search("list_name", "Obj_List_Marc", "compidx", ml.compidx);
string db_res = db.DB_Send_CMD_Search(cmd);
string[] db_data = db_res.Split('|');
for(int a = 0; a < db_data.Length; a++)
string table = "Obj_List_Book";
string Area = "`compidx`, `header`, `num`, `isbn_marc`, `book_name`, `author`, `book_comp`, `pay`, `count`, `total`";
string[] sear_col = {
"compidx",
"list_name",
"date"
};
string[] sear_data = {
ml.compidx,
dataGridView1.Rows[row].Cells["list_name"].Value.ToString(),
dataGridView1.Rows[row].Cells["list_date"].Value.ToString()
};
string cmd = db.More_DB_Search(table, sear_col, sear_data, Area);
string[] Search_Data = db.DB_Send_CMD_Search(cmd).Split('|');
List<string> tmpList = new List<string>();
for (int a = 0; a < Search_Data.Length; a++)
{
if (tb_list_name.Text == db_data[a]) {
return false;
if (a % 10 == 9)
{
string tmpString = string.Format(
"(\"{0}\", \"{1}\", \"{2}\", \"{3}\", \"{4}\", " +
"\"{5}\", \"{6}\", \"{7}\", \"{8}\", \"{9}\", " +
"\"{10}\", \"{11}\")",
Search_Data[a - 9], Search_Data[a - 8], Search_Data[a - 7], tb_list_name.Text, DateTime.Now.ToString("yyyy-MM-dd"),
Search_Data[a - 6], Search_Data[a - 5], Search_Data[a - 4], Search_Data[a - 3], Search_Data[a - 2],
Search_Data[a - 1], Search_Data[a]);
tmpList.Add(tmpString);
}
}
string Insert_Col =
"`compidx`, `header`, `num`, `list_name`, `date`, " +
"`isbn_marc`, `book_name`, `author`, `book_comp`, `pay`, " +
"`count`, `total`";
string InsertData = string.Join(", ", tmpList);
string InCmd = string.Format("INSERT INTO `{0}` ({1}) VALUES {2};", table, Insert_Col, InsertData);
db.DB_Send_CMD_reVoid(InCmd);
}
void data_delete()
{
string table = "Obj_List";
string[] target_area = { "idx" };
string[] target = { "" };
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
target[0] = dataGridView1.Rows[a].Cells["idx"].Value.ToString();
string cmd = db.DB_Delete_More_term(table, "comp_num", ml.compidx, target_area, target);
db.DB_Send_CMD_reVoid(cmd);
book_Delete(a);
}
}
void book_Delete(int row)
{
string table = "Obj_List_Book";
string[] target_Col = {
"list_name", "date"
};
string[] targetData = {
dataGridView1.Rows[row].Cells["list_name"].Value.ToString(), dataGridView1.Rows[row].Cells["list_date"].Value.ToString()
};
string cmd = db.DB_Delete_No_Limit(table, "compidx", ml.compidx, target_Col, targetData);
db.DB_Send_CMD_reVoid(cmd);
}
bool chk_Overlap()
{
string cmd = db.DB_Select_Search("list_name", "Obj_List", "comp_num", ml.compidx);
string db_res = db.DB_Send_CMD_Search(cmd);
string[] db_data = db_res.Split('|');
for (int a = 0; a < db_data.Length; a++)
{
if (tb_list_name.Text == db_data[a])
return false;
}
return true;
}
/// <summary>
/// 전체 / 편목 / 미편목의 합계를 구하는 함수.
/// 합계를 구하는 함수.
/// </summary>
/// <param name="column">total / flatter / unflatter 만 사용 가능</param>
/// <param name="column">현 Grid의 컬럼명</param>
/// <returns></returns>
int cal_Total(string column)
{
int result = 0;
List<int> total = new List<int>();
for(int a = 0; a < dataGridView1.Rows.Count - 1; a++)
for (int a = 0; a < dataGridView1.Rows.Count - 1; a++)
{
total.Add(Convert.ToInt32(dataGridView1.Rows[a].Cells[column].Value.ToString()));
}
for(int a = 0; a < total.Count; a++)
for (int a = 0; a < total.Count; a++)
{
result += total[a];
}

9
unimarc/unimarc/마크/Mac_List_Merge.resx
View File

@@ -120,16 +120,13 @@
<metadata name="idx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="list_marc.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="list_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="total.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="list_date.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="flatter.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="unflatter.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="vol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

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

@@ -79,7 +79,11 @@ namespace ExcelTest
comboBox8.SelectedIndex = 0;
#endregion
compidx = UniMarc.Properties.Settings.Default.compidx;
if (compidx != "3")
this.tabControl1.TabPages.Remove(this.tabPage2);
}
/// <summary>
/// 가져온 목록을 책목록과 연동하여 Grid에 집어넣음.
@@ -593,7 +597,7 @@ namespace ExcelTest
return;
}
if (List_Book.Rows[row_idx].Cells["db_marc"].Value.ToString() != "")
if (List_Book.Rows[row_idx].DefaultCellStyle.BackColor != Color.LightGray)
{
string[] Edit_tbl = {
"compidx", "marc", "marc_chk", "marc_chk1", "비고1",
@@ -1397,6 +1401,7 @@ namespace ExcelTest
if (checkMarc)
{
ReadRemark(row);
OnSaveData(row);
st.Color_change("▼", richTextBox1);
st.Color_change("▲", richTextBox1);
}
@@ -1527,7 +1532,7 @@ namespace ExcelTest
private void btn_FillBlank_Click(object sender, EventArgs e)
{
tabControl1.SelectedIndex = 1;
// tabControl1.SelectedIndex = 1;
int row = List_Book.CurrentRow.Index;
string ISBN = List_Book.Rows[row].Cells["ISBN13"].Value.ToString();
@@ -1538,7 +1543,6 @@ namespace ExcelTest
return;
}
UniMarc.Marc_FillBlank fb = new UniMarc.Marc_FillBlank(this);
fb.ISBN = ISBN;
fb.Show();

11
unimarc/unimarc/마크/Marc_FillBlank.cs
View File

@@ -199,9 +199,9 @@ namespace UniMarc
private void btn_Move_Click(object sender, EventArgs e)
{
marc.TextReset();
// 종단기호 제거
string Text = richTextBox1.Text.Replace("▲", "");
marc.richTextBox1.Text = "";
string Text = richTextBox1.Text;
string[] SplitLine = Text.Split('\n');
foreach (string Line in SplitLine)
@@ -210,7 +210,10 @@ namespace UniMarc
// [0]:태그번호, [1]:지시기호, [2]:마크내용
string[] SplitTag = Line.Split('\t');
marc.InputTotal(SplitTag);
SplitTag[1] = SplitTag[1].PadRight(2, ' ');
marc.richTextBox1.Text += string.Format("{0}\t{1}\t{2}\n", SplitTag[0], SplitTag[1], SplitTag[2]);
// marc.InputTotal(SplitTag);
}
}
}

5
unimarc/unimarc/마크/Marc_mkList.cs
View File

@@ -147,7 +147,11 @@ namespace UniMarc.마크
// 필터링하여 DB에 집어넣는 작업
for (int a = 0; a < row.Length; a++)
{
if (marc.List_Book.Rows[row[a]].Cells["db_marc"].Value.ToString() == "")
continue;
num += 1;
// ISBN, book_name, s_book_name1, s_book_num1, author, book_comp, pubdate, price, tag008, class_symbol
string[] Search = { "020a", "245a", "440a", "440v", "245d", "260b", "260c", "950b", "008", "056a" };
insert_marc_data[14] = marc.List_Book.Rows[row[a]].Cells["db_marc"].Value.ToString();
@@ -215,7 +219,6 @@ namespace UniMarc.마크
cmdByMarc = cmdByMarc.TrimEnd(',');
cmdByMarc += ";";
MessageBox.Show(cmdByMarc);
db.DB_Send_CMD_reVoid(cmdByList);
db.DB_Send_CMD_reVoid(cmdByMarc);
progressBar1.PerformStep();