diff --git a/unimarc/unimarc/마크/Mac_List.Designer.cs b/unimarc/unimarc/마크/Mac_List.Designer.cs index 5108f79..c76e4ef 100644 --- a/unimarc/unimarc/마크/Mac_List.Designer.cs +++ b/unimarc/unimarc/마크/Mac_List.Designer.cs @@ -46,20 +46,21 @@ 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(); this.btnSearchISBN = new System.Windows.Forms.Button(); - this.check = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.state = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.unstock = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.stock = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.work_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.end_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.start_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel2 = new System.Windows.Forms.Panel(); 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.dvc_custom = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -110,7 +111,8 @@ this.state, this.etc, this.charge, - this.check}); + this.check, + this.dvc_custom}); 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))); @@ -126,7 +128,7 @@ this.dataGridView1.RowHeadersWidth = 40; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView1.Size = new System.Drawing.Size(1124, 623); + this.dataGridView1.Size = new System.Drawing.Size(1179, 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); @@ -268,18 +270,9 @@ 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.Size = new System.Drawing.Size(1179, 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; - // // btnSearchISBN // this.btnSearchISBN.Location = new System.Drawing.Point(547, 2); @@ -291,36 +284,47 @@ this.btnSearchISBN.UseVisualStyleBackColor = true; this.btnSearchISBN.Click += new System.EventHandler(this.btnSearchISBN_Click); // - // check + // panel2 // - this.check.HeaderText = "V"; - this.check.Name = "check"; - this.check.Width = 35; + 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(1179, 623); + this.panel2.TabIndex = 53; // - // charge + // idx // - this.charge.HeaderText = "담당자"; - this.charge.Name = "charge"; - this.charge.Width = 70; + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; // - // etc + // start_date // - this.etc.HeaderText = "비고"; - this.etc.Name = "etc"; - this.etc.Width = 280; + this.start_date.HeaderText = "목록일자"; + this.start_date.Name = "start_date"; // - // state + // end_date // - this.state.HeaderText = "상태"; - this.state.Name = "state"; - this.state.Width = 70; + this.end_date.HeaderText = "완료일자"; + this.end_date.Name = "end_date"; // - // unstock + // list_name // - this.unstock.HeaderText = "미입고"; - this.unstock.Name = "unstock"; - this.unstock.Visible = false; - this.unstock.Width = 70; + 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 // @@ -329,44 +333,47 @@ this.stock.Visible = false; this.stock.Width = 70; // - // count + // unstock // - this.count.HeaderText = "수량"; - this.count.Name = "count"; - this.count.Width = 80; + this.unstock.HeaderText = "미입고"; + this.unstock.Name = "unstock"; + this.unstock.Visible = false; + this.unstock.Width = 70; // - // work_name + // state // - this.work_name.HeaderText = "작업명"; - this.work_name.Name = "work_name"; + this.state.HeaderText = "상태"; + this.state.Name = "state"; + this.state.Width = 70; // - // list_name + // etc // - this.list_name.HeaderText = "목록명"; - this.list_name.Name = "list_name"; - this.list_name.Width = 200; + this.etc.HeaderText = "비고"; + this.etc.Name = "etc"; + this.etc.Width = 280; // - // end_date + // charge // - this.end_date.HeaderText = "완료일자"; - this.end_date.Name = "end_date"; + this.charge.HeaderText = "담당자"; + this.charge.Name = "charge"; + this.charge.Width = 70; // - // start_date + // check // - this.start_date.HeaderText = "목록일자"; - this.start_date.Name = "start_date"; + this.check.HeaderText = "V"; + this.check.Name = "check"; + this.check.Width = 35; // - // idx + // dvc_custom // - this.idx.HeaderText = "idx"; - this.idx.Name = "idx"; - this.idx.Visible = false; + this.dvc_custom.HeaderText = "납품처"; + this.dvc_custom.Name = "dvc_custom"; // // 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.ClientSize = new System.Drawing.Size(1179, 661); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); this.Name = "Mac_List"; @@ -413,5 +420,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn etc; private System.Windows.Forms.DataGridViewTextBoxColumn charge; private System.Windows.Forms.DataGridViewTextBoxColumn check; + private System.Windows.Forms.DataGridViewTextBoxColumn dvc_custom; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs index 8e7e02a..1ab735f 100644 --- a/unimarc/unimarc/마크/Mac_List.cs +++ b/unimarc/unimarc/마크/Mac_List.cs @@ -57,7 +57,7 @@ namespace WindowsFormsApp1.Mac * 마크담당자 */ string Area = "`idx`, `date`, `date_res`, `list_name`, `work_name`, " + "`vol`, `stock`, `unstock`, `state`, `m_etc`, " + - "`m_charge`"; + "`m_charge`,`customer`"; string search = tb_Search.Text; string state = cb_state.Text; @@ -89,8 +89,8 @@ namespace WindowsFormsApp1.Mac string[] grid = { "", "", "", "", "", "", "", "", "", "", - "", "" }; - int area_count = 11; + "", "" ,"",""}; + int area_count = 12; dataGridView1.Rows.Clear(); for (int a = 0; a < data.Length; a++) { @@ -104,7 +104,9 @@ namespace WindowsFormsApp1.Mac if (a % area_count == 7) { grid[7] = data[a]; } if (a % area_count == 8) { grid[8] = data[a]; } if (a % area_count == 9) { grid[9] = data[a]; } - if (a % area_count == 10) { grid[10] = data[a]; + if (a % area_count == 10) { grid[10] = data[a]; } + if (a % area_count == 11) { + grid[11] = data[a]; dataGridView1.Rows.Add(grid); } } @@ -129,7 +131,7 @@ namespace WindowsFormsApp1.Mac if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { string[] edit_col = { "date", "date_res", "list_name", "work_name", "vol", - "stock", "unstock", "state", "m_etc", "m_charge" + "stock", "unstock", "state", "m_etc", "m_charge","customer" }; string[] edit_tbl = { dataGridView1.Rows[a].Cells["start_date"].Value.ToString(), @@ -141,7 +143,8 @@ namespace WindowsFormsApp1.Mac dataGridView1.Rows[a].Cells["unstock"].Value.ToString(), dataGridView1.Rows[a].Cells["state"].Value.ToString(), dataGridView1.Rows[a].Cells["etc"].Value.ToString(), - dataGridView1.Rows[a].Cells["charge"].Value.ToString() + dataGridView1.Rows[a].Cells["charge"].Value.ToString(), + dataGridView1.Rows[a].Cells["customer"].Value.ToString() }; string[] sear_col = { "idx", "comp_num" }; string[] sear_tbl = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(), compidx }; @@ -161,7 +164,7 @@ namespace WindowsFormsApp1.Mac string[] Excel_title = { "NO", "목록일자", "완료일자", "목록명", "마크담당자", //"작업명", "수량", "입고", "미입고", "상태", "비고" }; - "작업명", "수량", "상태", "비고" }; + "작업명", "수량", "상태", "비고","납품처코드" }; int rowCount = dataGridView1.RowCount; // string[,] inputExcel = new string[rowCount, 11]; string[,] inputExcel = new string[rowCount, 9]; @@ -180,6 +183,8 @@ namespace WindowsFormsApp1.Mac inputExcel[a, 7] = dataGridView1.Rows[a].Cells["state"].Value.ToString(); inputExcel[a, 8] = dataGridView1.Rows[a].Cells["etc"].Value.ToString(); + inputExcel[a, 9] = dataGridView1.Rows[a].Cells["customer"]?.Value.ToString() ?? ""; + // inputExcel[a, 7] = dataGridView1.Rows[a].Cells["stock"].Value.ToString(); // inputExcel[a, 8] = dataGridView1.Rows[a].Cells["unstock"].Value.ToString(); // inputExcel[a, 9] = dataGridView1.Rows[a].Cells["state"].Value.ToString(); diff --git a/unimarc/unimarc/마크/Mac_List.resx b/unimarc/unimarc/마크/Mac_List.resx index 1647749..8b35e24 100644 --- a/unimarc/unimarc/마크/Mac_List.resx +++ b/unimarc/unimarc/마크/Mac_List.resx @@ -153,6 +153,9 @@ True + + True + 17, 17 diff --git a/unimarc/unimarc/마크/Symbol_Sub.cs b/unimarc/unimarc/마크/Symbol_Sub.cs index dac5f03..069373d 100644 --- a/unimarc/unimarc/마크/Symbol_Sub.cs +++ b/unimarc/unimarc/마크/Symbol_Sub.cs @@ -19,6 +19,7 @@ namespace AuthorSymbol /// public string[] authorFirst = { "첫음", "초성" }; + public string[] authorFour = { "서명+출판사","출판사+서명" }; /// /// 저자기호표 /// diff --git a/unimarc/unimarc/홈/Transaction_manage.Designer.cs b/unimarc/unimarc/홈/Transaction_manage.Designer.cs index d45ce3f..7218925 100644 --- a/unimarc/unimarc/홈/Transaction_manage.Designer.cs +++ b/unimarc/unimarc/홈/Transaction_manage.Designer.cs @@ -110,6 +110,14 @@ this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); + this.panel9 = new System.Windows.Forms.Panel(); + this.cb_authorTypeK = new System.Windows.Forms.ComboBox(); + this.cb_divType = new System.Windows.Forms.ComboBox(); + this.cb_divNum = new System.Windows.Forms.ComboBox(); + this.cb_FirstBook = new System.Windows.Forms.ComboBox(); + this.cb_FirstAuthor = new System.Windows.Forms.ComboBox(); + this.label20 = new System.Windows.Forms.Label(); + this.label21 = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.label19 = new System.Windows.Forms.Label(); this.tbSearch = new System.Windows.Forms.TextBox(); @@ -135,19 +143,16 @@ this.panel7 = new System.Windows.Forms.Panel(); this.panel6 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel(); - this.panel9 = new System.Windows.Forms.Panel(); - this.cb_authorType = new System.Windows.Forms.ComboBox(); - this.cb_divType = new System.Windows.Forms.ComboBox(); - this.cb_divNum = new System.Windows.Forms.ComboBox(); - this.cb_FirstBook = new System.Windows.Forms.ComboBox(); - this.cb_FirstAuthor = new System.Windows.Forms.ComboBox(); - this.label20 = new System.Windows.Forms.Label(); - this.label21 = new System.Windows.Forms.Label(); + this.cb_authorTypeE = new System.Windows.Forms.ComboBox(); + this.label22 = new System.Windows.Forms.Label(); + this.cb_author_four = new System.Windows.Forms.ComboBox(); + this.chk_pijunja = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); + this.panel9.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gearGrid)).BeginInit(); @@ -156,7 +161,6 @@ this.panel7.SuspendLayout(); this.panel6.SuspendLayout(); this.panel5.SuspendLayout(); - this.panel9.SuspendLayout(); this.SuspendLayout(); // // NameLabel @@ -886,6 +890,90 @@ this.panel2.Size = new System.Drawing.Size(967, 417); this.panel2.TabIndex = 48; // + // panel9 + // + this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel9.Controls.Add(this.chk_pijunja); + this.panel9.Controls.Add(this.cb_author_four); + this.panel9.Controls.Add(this.label22); + this.panel9.Controls.Add(this.cb_authorTypeE); + this.panel9.Controls.Add(this.cb_authorTypeK); + this.panel9.Controls.Add(this.cb_divType); + this.panel9.Controls.Add(this.cb_divNum); + this.panel9.Controls.Add(this.cb_FirstBook); + this.panel9.Controls.Add(this.cb_FirstAuthor); + this.panel9.Controls.Add(this.label20); + this.panel9.Controls.Add(this.label21); + this.panel9.Location = new System.Drawing.Point(844, 124); + this.panel9.Name = "panel9"; + this.panel9.Size = new System.Drawing.Size(118, 269); + this.panel9.TabIndex = 45; + // + // cb_authorTypeK + // + this.cb_authorTypeK.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_authorTypeK.FormattingEnabled = true; + this.cb_authorTypeK.Location = new System.Drawing.Point(4, 49); + this.cb_authorTypeK.Name = "cb_authorTypeK"; + this.cb_authorTypeK.Size = new System.Drawing.Size(104, 20); + this.cb_authorTypeK.TabIndex = 1; + this.cb_authorTypeK.SelectedIndexChanged += new System.EventHandler(this.cb_authorTypeK_SelectedIndexChanged); + this.cb_authorTypeK.Click += new System.EventHandler(this.cb_authorTypeK_Click); + // + // cb_divType + // + this.cb_divType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_divType.FormattingEnabled = true; + this.cb_divType.Location = new System.Drawing.Point(4, 145); + this.cb_divType.Name = "cb_divType"; + this.cb_divType.Size = new System.Drawing.Size(104, 20); + this.cb_divType.TabIndex = 1; + // + // cb_divNum + // + this.cb_divNum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_divNum.FormattingEnabled = true; + this.cb_divNum.Location = new System.Drawing.Point(4, 171); + this.cb_divNum.Name = "cb_divNum"; + this.cb_divNum.Size = new System.Drawing.Size(104, 20); + this.cb_divNum.TabIndex = 1; + // + // cb_FirstBook + // + this.cb_FirstBook.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_FirstBook.FormattingEnabled = true; + this.cb_FirstBook.Location = new System.Drawing.Point(4, 99); + this.cb_FirstBook.Name = "cb_FirstBook"; + this.cb_FirstBook.Size = new System.Drawing.Size(104, 20); + this.cb_FirstBook.TabIndex = 1; + // + // cb_FirstAuthor + // + this.cb_FirstAuthor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_FirstAuthor.FormattingEnabled = true; + this.cb_FirstAuthor.Location = new System.Drawing.Point(4, 24); + this.cb_FirstAuthor.Name = "cb_FirstAuthor"; + this.cb_FirstAuthor.Size = new System.Drawing.Size(104, 20); + this.cb_FirstAuthor.TabIndex = 1; + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(2, 130); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(29, 12); + this.label20.TabIndex = 1; + this.label20.Text = "구분"; + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(2, 7); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(53, 12); + this.label21.TabIndex = 1; + this.label21.Text = "저자기호"; + // // tableLayoutPanel1 // this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; @@ -1187,83 +1275,42 @@ this.panel5.Size = new System.Drawing.Size(830, 35); this.panel5.TabIndex = 51; // - // panel9 + // cb_authorTypeE // - this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel9.Controls.Add(this.cb_authorType); - this.panel9.Controls.Add(this.cb_divType); - this.panel9.Controls.Add(this.cb_divNum); - this.panel9.Controls.Add(this.cb_FirstBook); - this.panel9.Controls.Add(this.cb_FirstAuthor); - this.panel9.Controls.Add(this.label20); - this.panel9.Controls.Add(this.label21); - this.panel9.Location = new System.Drawing.Point(844, 124); - this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(118, 174); - this.panel9.TabIndex = 45; + this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_authorTypeE.FormattingEnabled = true; + this.cb_authorTypeE.Location = new System.Drawing.Point(4, 74); + this.cb_authorTypeE.Name = "cb_authorTypeE"; + this.cb_authorTypeE.Size = new System.Drawing.Size(104, 20); + this.cb_authorTypeE.TabIndex = 2; // - // cb_authorType + // label22 // - this.cb_authorType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_authorType.FormattingEnabled = true; - this.cb_authorType.Location = new System.Drawing.Point(4, 50); - this.cb_authorType.Name = "cb_authorType"; - this.cb_authorType.Size = new System.Drawing.Size(104, 20); - this.cb_authorType.TabIndex = 1; + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(5, 198); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(79, 12); + this.label22.TabIndex = 3; + this.label22.Text = "4인 이상 저자"; // - // cb_divType + // cb_author_four // - this.cb_divType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_divType.FormattingEnabled = true; - this.cb_divType.Location = new System.Drawing.Point(4, 119); - this.cb_divType.Name = "cb_divType"; - this.cb_divType.Size = new System.Drawing.Size(104, 20); - this.cb_divType.TabIndex = 1; + this.cb_author_four.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_author_four.FormattingEnabled = true; + this.cb_author_four.Location = new System.Drawing.Point(4, 213); + this.cb_author_four.Name = "cb_author_four"; + this.cb_author_four.Size = new System.Drawing.Size(104, 20); + this.cb_author_four.TabIndex = 4; // - // cb_divNum + // chk_pijunja // - this.cb_divNum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_divNum.FormattingEnabled = true; - this.cb_divNum.Location = new System.Drawing.Point(4, 145); - this.cb_divNum.Name = "cb_divNum"; - this.cb_divNum.Size = new System.Drawing.Size(104, 20); - this.cb_divNum.TabIndex = 1; - // - // cb_FirstBook - // - this.cb_FirstBook.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_FirstBook.FormattingEnabled = true; - this.cb_FirstBook.Location = new System.Drawing.Point(4, 74); - this.cb_FirstBook.Name = "cb_FirstBook"; - this.cb_FirstBook.Size = new System.Drawing.Size(104, 20); - this.cb_FirstBook.TabIndex = 1; - // - // cb_FirstAuthor - // - this.cb_FirstAuthor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_FirstAuthor.FormattingEnabled = true; - this.cb_FirstAuthor.Location = new System.Drawing.Point(4, 24); - this.cb_FirstAuthor.Name = "cb_FirstAuthor"; - this.cb_FirstAuthor.Size = new System.Drawing.Size(104, 20); - this.cb_FirstAuthor.TabIndex = 1; - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(2, 104); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(29, 12); - this.label20.TabIndex = 1; - this.label20.Text = "구분"; - // - // label21 - // - this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(2, 7); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(53, 12); - this.label21.TabIndex = 1; - this.label21.Text = "저자기호"; + this.chk_pijunja.AutoSize = true; + this.chk_pijunja.Location = new System.Drawing.Point(7, 241); + this.chk_pijunja.Name = "chk_pijunja"; + this.chk_pijunja.Size = new System.Drawing.Size(88, 16); + this.chk_pijunja.TabIndex = 5; + this.chk_pijunja.Text = "피전자 적용"; + this.chk_pijunja.UseVisualStyleBackColor = true; // // Transaction_manage // @@ -1281,6 +1328,8 @@ this.panel3.ResumeLayout(false); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + this.panel9.ResumeLayout(false); + this.panel9.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).EndInit(); @@ -1292,8 +1341,6 @@ this.panel6.ResumeLayout(false); this.panel5.ResumeLayout(false); this.panel5.PerformLayout(); - this.panel9.ResumeLayout(false); - this.panel9.PerformLayout(); this.ResumeLayout(false); } @@ -1399,12 +1446,16 @@ private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem btExportList; private System.Windows.Forms.Panel panel9; - private System.Windows.Forms.ComboBox cb_authorType; + private System.Windows.Forms.ComboBox cb_authorTypeK; private System.Windows.Forms.ComboBox cb_divType; private System.Windows.Forms.ComboBox cb_divNum; private System.Windows.Forms.ComboBox cb_FirstBook; private System.Windows.Forms.ComboBox cb_FirstAuthor; private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label21; + private System.Windows.Forms.ComboBox cb_authorTypeE; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.ComboBox cb_author_four; + private System.Windows.Forms.CheckBox chk_pijunja; } } \ No newline at end of file diff --git a/unimarc/unimarc/홈/Transaction_manage.cs b/unimarc/unimarc/홈/Transaction_manage.cs index 434721c..0c8fd77 100644 --- a/unimarc/unimarc/홈/Transaction_manage.cs +++ b/unimarc/unimarc/홈/Transaction_manage.cs @@ -44,8 +44,10 @@ namespace WindowsFormsApp1.Home //저자기호 셋팅값 251022 AuthorSymbol.Symbol sb = new AuthorSymbol.Symbol(); cb_FirstAuthor.Items.AddRange(sb.authorBook); - cb_authorType.Items.AddRange(sb.authorType); + cb_authorTypeK.Items.AddRange(sb.authorType); + cb_authorTypeE.Items.AddRange(sb.authorType); cb_FirstBook.Items.AddRange(sb.authorFirst); + cb_author_four.Items.AddRange(sb.authorFour); string[] divType = { "KDC", "DDC" }; cb_divType.Items.AddRange(divType); @@ -55,10 +57,13 @@ namespace WindowsFormsApp1.Home //저자기호 관련 컬럼추가 dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_first", HeaderText = "dvc_author_first", Visible = false }); - dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_type", HeaderText = "dvc_author_type", Visible = false }); + dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_typeK", HeaderText = "dvc_author_typeK", Visible = false }); + dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_typeE", HeaderText = "dvc_author_typeE", Visible = false }); dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_firstbook", HeaderText = "dvc_author_firstbook", Visible = false }); dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_divtype", HeaderText = "dvc_author_divtype", Visible = false }); dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_divnum", HeaderText = "dvc_author_divnum", Visible = false }); + dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_author_four", HeaderText = "dvc_author_four", Visible = false }); + dv1.Columns.Add(new DataGridViewTextBoxColumn() { Name = "dvc_pijunja", HeaderText = "dvc_pijunja", Visible = false }); } @@ -68,7 +73,7 @@ namespace WindowsFormsApp1.Home "`c_uptae`, `c_jongmok`, `c_tel`, `c_fax`, `c_email`, " + "`c_man`, `c_mantel`, `c_user`, `c_zip`, `c_addr`, " + "`c_dlsArea`, `c_dlsID`, `c_dlsPW`, `c_division`, `c_label`, " + - "`c_program`, `c_etc`";//, `c_author_first`, `c_author_type`, `c_author_firstbook`, `c_author_divtype`, `c_author_divnum`"; + "`c_program`, `c_etc`"; string cmd = db.DB_Select_Search(seartempdb, "Client", "campanyidx", compidx); string db_res = db.DB_Send_CMD_Search(cmd); dv1.Rows.Clear(); @@ -127,11 +132,14 @@ namespace WindowsFormsApp1.Home tb_program.Text = ""; rtb_etc.Text = ""; cb_gubun1.SelectedIndex = 0; - cb_authorType.SelectedIndex = -1; + cb_authorTypeK.SelectedIndex = -1; + cb_authorTypeE.SelectedIndex = -1; cb_FirstAuthor.SelectedIndex = -1; cb_FirstBook.SelectedIndex = -1; cb_divNum.SelectedIndex = -1; cb_divType.SelectedIndex = -1; + cb_author_four.SelectedIndex = -1; + chk_pijunja.Checked = false; } private bool Check_Data(string pText) { @@ -189,13 +197,15 @@ namespace WindowsFormsApp1.Home "c_mantel", "c_user", "c_zip", "c_addr", "c_dlsID", "c_dlsPW", "c_division", "c_label", "c_program", "c_etc", "campanyidx", "c_dlsArea" , - "c_author_first", "c_author_type", "c_author_firstbook", "c_author_divtype", "c_author_divnum"}; + "c_author_first", "c_author_typeK","c_author_typeE", "c_author_firstbook", + "c_author_divtype", "c_author_divnum","c_author_four","c_pijunja"}; string[] tmpdb1 = { tb_sangho.Text, cb_gubun2.Text, tb_boss.Text, tb_bubin.Text, tb_uptae.Text, tb_jongmok.Text, tb_tel.Text, tb_fax.Text, tb_mail.Text, tb_man.Text, tb_man1.Text, tb_user.Text, tb_zip.Text, tb_addr.Text, tb_id.Text, tb_pw.Text, tb_division.Text, tb_label.Text, tb_program.Text, rtb_etc.Text, - compidx, cb_dlsArea.Text, cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text }; + compidx, cb_dlsArea.Text, cb_FirstAuthor.Text, cb_authorTypeK.Text, + cb_authorTypeE.Text,cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text ,cb_author_four.Text,(chk_pijunja.Checked ? "1":"0") }; string[] tOldData = { }; string Incmd = db.DB_INSERT("Client", tmpdb, tmpdb1); @@ -249,14 +259,16 @@ namespace WindowsFormsApp1.Home "c_mantel", "c_user", "c_zip", "c_addr", "c_dlsID", "c_dlsPW", "c_division", "c_label", "c_program", "c_etc", "c_dlsArea" , - "c_author_first", "c_author_type", "c_author_firstbook", "c_author_divtype", "c_author_divnum"}; + "c_author_first", "c_author_typeK", "c_author_typeE","c_author_firstbook", + "c_author_divtype", "c_author_divnum","c_author_four","c_pijunja"}; string[] editname = { tb_sangho.Text, cb_gubun2.Text, tb_boss.Text, tb_bubin.Text, tb_uptae.Text, tb_jongmok.Text, tb_tel.Text, tb_fax.Text, tb_mail.Text, tb_man.Text, tb_man1.Text, tb_user.Text, tb_zip.Text, tb_addr.Text, tb_id.Text, tb_pw.Text, tb_division.Text, tb_label.Text, tb_program.Text, rtb_etc.Text, cb_dlsArea.Text, - cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text }; + cb_FirstAuthor.Text, cb_authorTypeK.Text,cb_authorTypeE.Text, cb_FirstBook.Text, + cb_divType.Text, cb_divNum.Text ,cb_author_four.Text,(chk_pijunja.Checked ? "1":"0") }; string[] searchcol = { "idx", "campanyidx" }; string[] searchname = { lbl_idx.Text, compidx }; @@ -349,22 +361,30 @@ namespace WindowsFormsApp1.Home //저자기호값 셋팅 var author_first = dv1.Rows[RowIndex].Cells["dvc_author_first"].Value?.ToString() ?? string.Empty; - var author_type = dv1.Rows[RowIndex].Cells["dvc_author_type"].Value?.ToString() ?? string.Empty; + var author_typeK = dv1.Rows[RowIndex].Cells["dvc_author_typeK"].Value?.ToString() ?? string.Empty; + var author_typeE = dv1.Rows[RowIndex].Cells["dvc_author_typeE"].Value?.ToString() ?? string.Empty; var author_firstbook = dv1.Rows[RowIndex].Cells["dvc_author_firstbook"].Value?.ToString() ?? string.Empty; var author_divtype = dv1.Rows[RowIndex].Cells["dvc_author_divtype"].Value?.ToString() ?? string.Empty; var author_divnum = dv1.Rows[RowIndex].Cells["dvc_author_divnum"].Value?.ToString() ?? string.Empty; + var author_four = dv1.Rows[RowIndex].Cells["dvc_author_four"].Value?.ToString() ?? string.Empty; + var pijunja = dv1.Rows[RowIndex].Cells["dvc_pijunja"].Value?.ToString() ?? "0"; + + if (author_typeK.isEmpty() == false) cb_authorTypeK.Text = author_typeK; + else cb_authorTypeK.SelectedIndex = -1; + if (author_typeE.isEmpty() == false) cb_authorTypeE.Text = author_typeE; + else cb_authorTypeE.SelectedIndex = -1; if (author_first.isEmpty() == false) cb_FirstAuthor.Text = author_first; else cb_FirstAuthor.SelectedIndex = -1; - if (author_type.isEmpty() == false) cb_authorType.Text = author_type; - else cb_authorType.SelectedIndex = -1; if (author_firstbook.isEmpty() == false) cb_FirstBook.Text = author_firstbook; else cb_FirstBook.SelectedIndex = -1; if (author_divtype.isEmpty() == false) cb_divType.Text = author_divtype; else cb_divType.SelectedIndex = -1; if (author_divnum.isEmpty() == false) cb_divNum.Text = author_divnum; else cb_divNum.SelectedIndex = -1; + if (author_four.isEmpty() == false) cb_author_four.Text = author_four; + else cb_author_four.SelectedIndex = -1; - + chk_pijunja.Checked = pijunja == "1"; Select_Gubun(RowIndex); } private void Select_Gubun(int pRowIndex) @@ -435,8 +455,9 @@ namespace WindowsFormsApp1.Home "`c_uptae`, `c_jongmok`, `c_tel`, `c_fax`, `c_email`, " + "`c_man`, `c_mantel`, `c_user`, `c_zip`, `c_addr`, " + "`c_dlsArea`, `c_dlsID`, `c_dlsPW`, `c_division`, `c_label`," + - "`c_program`, `c_etc`,"+ - "`c_author_first`, `c_author_type`, `c_author_firstbook`, `c_author_divtype`, `c_author_divnum`"; + "`c_program`, `c_etc`," + + "`c_author_first`, `c_author_typeK`, `c_author_typeE`,`c_author_firstbook`, " + + "`c_author_divtype`, `c_author_divnum`, `c_author_four`, `c_pijunja`"; string cmd = db.DB_Contains("Client", compidx, "c_sangho", tbSearch.Text, search); db.DB_Send_CMD_Search_ApplyGrid(cmd, dv1); @@ -626,5 +647,20 @@ namespace WindowsFormsApp1.Home } } + + private void cb_authorTypeK_Click(object sender, EventArgs e) + { + + } + + private void cb_authorTypeK_SelectedIndexChanged(object sender, EventArgs e) + { + this.cb_authorTypeE.SelectedIndex = cb_authorTypeK.SelectedIndex; + if (cb_authorTypeK.Text.Contains("장일세")) + { + cb_FirstAuthor.Text = "초성"; + cb_FirstBook.Text = "초성"; + } + } } }