diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 2ff12b6..89a9491 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index e459c43..457481e 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -230,6 +230,12 @@ Marc_Plan_Sub_SelectList_Edit.cs + + Form + + + Marc_Plan_Sub_SelectList_Morge.cs + Form @@ -771,6 +777,9 @@ Marc_Plan_Sub_SelectList_Edit.cs + + Marc_Plan_Sub_SelectList_Morge.cs + Marc_Preview.cs diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index eabee89..9ce89d2 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb index ac6380a..8024ba0 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll index 5982604..2e7b280 100644 Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 99bbcfd..e1a373c 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index c61869f..e38ba92 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache index b62ac16..c7de5e7 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e389acb7eef955ad255f844c6635f1ef64cd635 +b7eebfc1802ee64e77975fa6be9507e86387e8be diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt index 2dac21b..a6190a2 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt @@ -130,3 +130,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크. C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\Interop.SHDocVw.dll C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.DLS_Manage.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.Marc_FillBlank.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_Plan_Sub_SelectList_Morge.resources diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index fb55eb5..87ce804 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index eabee89..9ce89d2 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb index ac6380a..8024ba0 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_Plan_Sub_SelectList_Morge.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_Plan_Sub_SelectList_Morge.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_Plan_Sub_SelectList_Morge.resources differ diff --git a/unimarc/unimarc/obj/Debug/WindowsFormsApp1.DLS.School_Lookup.resources b/unimarc/unimarc/obj/Debug/WindowsFormsApp1.DLS.School_Lookup.resources index dc21949..1f44296 100644 Binary files a/unimarc/unimarc/obj/Debug/WindowsFormsApp1.DLS.School_Lookup.resources and b/unimarc/unimarc/obj/Debug/WindowsFormsApp1.DLS.School_Lookup.resources differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index 5982604..2e7b280 100644 Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/납품관리/Commodity_Edit.cs b/unimarc/unimarc/납품관리/Commodity_Edit.cs index 24a3576..5658d4b 100644 --- a/unimarc/unimarc/납품관리/Commodity_Edit.cs +++ b/unimarc/unimarc/납품관리/Commodity_Edit.cs @@ -71,7 +71,7 @@ namespace WindowsFormsApp1.Delivery string[] marc_data = { date, New_Name.Text, New_User.Text }; U_cmd = DB.More_Update("Obj_List_Marc", marc_col, marc_data, marc_search_col, marc_search_data); - DB.DB_Send_CMD_reVoid(U_cmd); + //DB.DB_Send_CMD_reVoid(U_cmd); ///////////////////////////////////////// diff --git a/unimarc/unimarc/마크/Check_ISBN.Designer.cs b/unimarc/unimarc/마크/Check_ISBN.Designer.cs index e8a6124..dda7afe 100644 --- a/unimarc/unimarc/마크/Check_ISBN.Designer.cs +++ b/unimarc/unimarc/마크/Check_ISBN.Designer.cs @@ -28,22 +28,10 @@ /// 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.btn_lookup = new System.Windows.Forms.Button(); - this.cb_filter = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.tb_list_name = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.btn_Save = new System.Windows.Forms.Button(); - this.btn_Close = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.cb_api = new System.Windows.Forms.ComboBox(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.btn_yes24 = new System.Windows.Forms.Button(); this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -65,6 +53,19 @@ this.sold_out = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.image = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.api_data = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_lookup = new System.Windows.Forms.Button(); + this.cb_filter = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.tb_list_name = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.btn_Save = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.cb_api = new System.Windows.Forms.ComboBox(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.btn_yes24 = new System.Windows.Forms.Button(); + this.Check_Marc = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // @@ -73,13 +74,13 @@ this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control; - 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; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, @@ -106,17 +107,17 @@ this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2; this.dataGridView1.Location = new System.Drawing.Point(12, 35); 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; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dataGridView1.RowHeadersWidth = 20; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle6; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.Size = new System.Drawing.Size(1608, 547); this.dataGridView1.TabIndex = 0; @@ -124,116 +125,6 @@ this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // - // btn_lookup - // - this.btn_lookup.Location = new System.Drawing.Point(706, 7); - this.btn_lookup.Name = "btn_lookup"; - this.btn_lookup.Size = new System.Drawing.Size(99, 23); - this.btn_lookup.TabIndex = 1; - this.btn_lookup.Text = "ISBN 자동 조회"; - this.btn_lookup.UseVisualStyleBackColor = true; - this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); - // - // cb_filter - // - this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_filter.FormattingEnabled = true; - this.cb_filter.Location = new System.Drawing.Point(516, 8); - this.cb_filter.Name = "cb_filter"; - this.cb_filter.Size = new System.Drawing.Size(161, 20); - this.cb_filter.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(16, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 12); - this.label1.TabIndex = 3; - this.label1.Text = "목록명"; - // - // tb_list_name - // - this.tb_list_name.Enabled = false; - this.tb_list_name.Location = new System.Drawing.Point(59, 8); - this.tb_list_name.Name = "tb_list_name"; - this.tb_list_name.Size = new System.Drawing.Size(213, 21); - this.tb_list_name.TabIndex = 4; - this.tb_list_name.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_list_name_KeyDown); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(457, 12); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(57, 12); - this.label2.TabIndex = 3; - this.label2.Text = "검색 조건"; - // - // btn_Save - // - this.btn_Save.Location = new System.Drawing.Point(815, 7); - this.btn_Save.Name = "btn_Save"; - this.btn_Save.Size = new System.Drawing.Size(99, 23); - this.btn_Save.TabIndex = 1; - this.btn_Save.Text = "전 체 저 장"; - this.btn_Save.UseVisualStyleBackColor = true; - this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); - // - // btn_Close - // - this.btn_Close.Location = new System.Drawing.Point(1033, 7); - this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(99, 23); - this.btn_Close.TabIndex = 1; - this.btn_Close.Text = "닫 기"; - this.btn_Close.UseVisualStyleBackColor = true; - this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(278, 12); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(57, 12); - this.label3.TabIndex = 5; - this.label3.Text = "검색 엔진"; - // - // cb_api - // - this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_api.FormattingEnabled = true; - this.cb_api.Location = new System.Drawing.Point(337, 8); - this.cb_api.Name = "cb_api"; - this.cb_api.Size = new System.Drawing.Size(93, 20); - this.cb_api.TabIndex = 6; - this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); - // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(1166, 7); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(219, 23); - this.progressBar1.TabIndex = 7; - // - // richTextBox1 - // - this.richTextBox1.Location = new System.Drawing.Point(12, 589); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1608, 123); - this.richTextBox1.TabIndex = 8; - this.richTextBox1.Text = ""; - // - // btn_yes24 - // - this.btn_yes24.Location = new System.Drawing.Point(924, 7); - this.btn_yes24.Name = "btn_yes24"; - this.btn_yes24.Size = new System.Drawing.Size(99, 23); - this.btn_yes24.TabIndex = 1; - this.btn_yes24.Text = "예스 양식 반출"; - this.btn_yes24.UseVisualStyleBackColor = true; - this.btn_yes24.Click += new System.EventHandler(this.btn_yes24_Click); - // // idx // this.idx.HeaderText = "idx"; @@ -350,11 +241,132 @@ this.api_data.Name = "api_data"; this.api_data.Visible = false; // + // btn_lookup + // + this.btn_lookup.Location = new System.Drawing.Point(706, 7); + this.btn_lookup.Name = "btn_lookup"; + this.btn_lookup.Size = new System.Drawing.Size(99, 23); + this.btn_lookup.TabIndex = 1; + this.btn_lookup.Text = "ISBN 자동 조회"; + this.btn_lookup.UseVisualStyleBackColor = true; + this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); + // + // cb_filter + // + this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_filter.FormattingEnabled = true; + this.cb_filter.Location = new System.Drawing.Point(516, 8); + this.cb_filter.Name = "cb_filter"; + this.cb_filter.Size = new System.Drawing.Size(161, 20); + this.cb_filter.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(16, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(41, 12); + this.label1.TabIndex = 3; + this.label1.Text = "목록명"; + // + // tb_list_name + // + this.tb_list_name.Enabled = false; + this.tb_list_name.Location = new System.Drawing.Point(59, 8); + this.tb_list_name.Name = "tb_list_name"; + this.tb_list_name.Size = new System.Drawing.Size(213, 21); + this.tb_list_name.TabIndex = 4; + this.tb_list_name.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_list_name_KeyDown); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(457, 12); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 12); + this.label2.TabIndex = 3; + this.label2.Text = "검색 조건"; + // + // btn_Save + // + this.btn_Save.Location = new System.Drawing.Point(815, 6); + this.btn_Save.Name = "btn_Save"; + this.btn_Save.Size = new System.Drawing.Size(99, 23); + this.btn_Save.TabIndex = 1; + this.btn_Save.Text = "전 체 저 장"; + this.btn_Save.UseVisualStyleBackColor = true; + this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(1033, 7); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(99, 23); + this.btn_Close.TabIndex = 1; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(278, 12); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(57, 12); + this.label3.TabIndex = 5; + this.label3.Text = "검색 엔진"; + // + // cb_api + // + this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_api.FormattingEnabled = true; + this.cb_api.Location = new System.Drawing.Point(337, 8); + this.cb_api.Name = "cb_api"; + this.cb_api.Size = new System.Drawing.Size(93, 20); + this.cb_api.TabIndex = 6; + this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); + // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(1166, 7); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(219, 23); + this.progressBar1.TabIndex = 7; + // + // richTextBox1 + // + this.richTextBox1.Location = new System.Drawing.Point(12, 589); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(1608, 123); + this.richTextBox1.TabIndex = 8; + this.richTextBox1.Text = ""; + // + // btn_yes24 + // + this.btn_yes24.Location = new System.Drawing.Point(924, 7); + this.btn_yes24.Name = "btn_yes24"; + this.btn_yes24.Size = new System.Drawing.Size(99, 23); + this.btn_yes24.TabIndex = 1; + this.btn_yes24.Text = "예스 양식 반출"; + this.btn_yes24.UseVisualStyleBackColor = true; + this.btn_yes24.Click += new System.EventHandler(this.btn_yes24_Click); + // + // Check_Marc + // + this.Check_Marc.AutoSize = true; + this.Check_Marc.Location = new System.Drawing.Point(1422, 10); + this.Check_Marc.Name = "Check_Marc"; + this.Check_Marc.Size = new System.Drawing.Size(132, 16); + this.Check_Marc.TabIndex = 9; + this.Check_Marc.Text = "마크ISBN 동시 저장"; + this.Check_Marc.UseVisualStyleBackColor = true; + // // Check_ISBN // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1632, 724); + this.Controls.Add(this.Check_Marc); this.Controls.Add(this.richTextBox1); this.Controls.Add(this.progressBar1); this.Controls.Add(this.cb_api); @@ -413,5 +425,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn sold_out; private System.Windows.Forms.DataGridViewTextBoxColumn image; private System.Windows.Forms.DataGridViewTextBoxColumn api_data; + private System.Windows.Forms.CheckBox Check_Marc; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_ISBN.cs b/unimarc/unimarc/마크/Check_ISBN.cs index 3c732ef..dc2340d 100644 --- a/unimarc/unimarc/마크/Check_ISBN.cs +++ b/unimarc/unimarc/마크/Check_ISBN.cs @@ -238,6 +238,9 @@ namespace WindowsFormsApp1.Mac // else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray) // gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty; + if (gridview.Rows[a].Cells["isbn"].Value == null) + gridview.Rows[a].Cells["isbn"].Value = ""; + string isbn = gridview.Rows[a].Cells["isbn"].Value.ToString(); if (cb_filter.SelectedIndex == 3) { if (!CheckData(isbn)) @@ -294,7 +297,12 @@ namespace WindowsFormsApp1.Mac // continue; // else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray) // gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty; + + if (gridview.Rows[a].Cells["isbn"].Value == null) + gridview.Rows[a].Cells["isbn"].Value = ""; + string isbn = gridview.Rows[a].Cells["isbn"].Value.ToString(); + if (CheckData(isbn)) continue; else @@ -368,6 +376,10 @@ namespace WindowsFormsApp1.Mac for(int a = 0; a < gridview.Rows.Count; a++) { progressBar1.PerformStep(); + + if (gridview.Rows[a].Cells["isbn"].Value == null) + gridview.Rows[a].Cells["isbn"].Value = ""; + string isbn = gridview.Rows[a].Cells["isbn"].Value.ToString(); // if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.Yellow) @@ -648,6 +660,8 @@ namespace WindowsFormsApp1.Mac private void btn_Save_Click(object sender, EventArgs e) { string[] Edit_tbl = { "isbn", "price", "pubDate", "category", "image_url" }; + + for (int a = 0; a < dataGridView1.Rows.Count; a++) { if (dataGridView1.Rows[a].Cells["isbn"].Value == null) continue; @@ -658,11 +672,14 @@ namespace WindowsFormsApp1.Mac else Edit_tbl[0] = "isbn"; - string[] Edit_Col = { dataGridView1.Rows[a].Cells["isbn"].Value.ToString(), - dataGridView1.Rows[a].Cells["price"].Value.ToString(), - dataGridView1.Rows[a].Cells["pubDate"].Value.ToString(), - dataGridView1.Rows[a].Cells["category"].Value.ToString(), - dataGridView1.Rows[a].Cells["image"].Value.ToString() }; + string[] Edit_Col = { + dataGridView1.Rows[a].Cells["isbn"].Value.ToString(), + dataGridView1.Rows[a].Cells["price"].Value.ToString(), + dataGridView1.Rows[a].Cells["pubDate"].Value.ToString(), + dataGridView1.Rows[a].Cells["category"].Value.ToString(), + dataGridView1.Rows[a].Cells["image"].Value.ToString() + }; + string[] Search_tbl = { "idx", "list_name", "compidx" }; string[] Search_col = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(), list_name, compidx }; @@ -672,6 +689,12 @@ namespace WindowsFormsApp1.Mac string U_cmd = db.More_Update("Obj_List_Book", Edit_tbl, Edit_Col, Search_tbl, Search_col, 1); db.DB_Send_CMD_reVoid(U_cmd); + + if (Check_Marc.Checked) { + string CMcmd = string.Format("UPDATE `Obj_List_Book` SET `isbn_marc` = \"{0}\" WHERE `idx` = \"{1}\"", + Edit_Col[0], Search_col[0]); + db.DB_Send_CMD_reVoid(CMcmd); + } } MessageBox.Show("저장되었습니다!"); save = true; diff --git a/unimarc/unimarc/마크/Check_copy.Designer.cs b/unimarc/unimarc/마크/Check_copy.Designer.cs index 50a868c..fee80ea 100644 --- a/unimarc/unimarc/마크/Check_copy.Designer.cs +++ b/unimarc/unimarc/마크/Check_copy.Designer.cs @@ -28,37 +28,37 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); + this.btn_SearchList = new System.Windows.Forms.Button(); + this.btn_Start = new System.Windows.Forms.Button(); + this.btn_Stop = new System.Windows.Forms.Button(); this.SearchCount = new System.Windows.Forms.NumericUpDown(); this.btn_Close = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); this.tb_SearchTarget = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); - this.btn_SearchList = new System.Windows.Forms.Button(); - this.btn_Stop = new System.Windows.Forms.Button(); - this.btn_Start = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.webBrowser1 = new System.Windows.Forms.WebBrowser(); this.btn_ApplyFilter = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); - this.panel4 = new System.Windows.Forms.Panel(); - this.panel5 = new System.Windows.Forms.Panel(); this.panel6 = new System.Windows.Forms.Panel(); - this.chk_spChar = new System.Windows.Forms.CheckBox(); + this.panel4 = new System.Windows.Forms.Panel(); this.chk_RemoveBrit = new System.Windows.Forms.CheckBox(); + this.chk_spChar = new System.Windows.Forms.CheckBox(); + this.panel5 = new System.Windows.Forms.Panel(); + this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.SearchCount)).BeginInit(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel3.SuspendLayout(); + this.panel6.SuspendLayout(); this.panel4.SuspendLayout(); this.panel5.SuspendLayout(); - this.panel6.SuspendLayout(); this.SuspendLayout(); // // panel1 @@ -73,6 +73,35 @@ this.panel1.Size = new System.Drawing.Size(635, 34); this.panel1.TabIndex = 0; // + // btn_SearchList + // + this.btn_SearchList.Location = new System.Drawing.Point(4, 4); + this.btn_SearchList.Name = "btn_SearchList"; + this.btn_SearchList.Size = new System.Drawing.Size(356, 24); + this.btn_SearchList.TabIndex = 3; + this.btn_SearchList.Text = "목록 검색"; + this.btn_SearchList.UseVisualStyleBackColor = true; + this.btn_SearchList.Click += new System.EventHandler(this.btn_SearchList_Click); + // + // btn_Start + // + this.btn_Start.Location = new System.Drawing.Point(473, 4); + this.btn_Start.Name = "btn_Start"; + this.btn_Start.Size = new System.Drawing.Size(75, 24); + this.btn_Start.TabIndex = 2; + this.btn_Start.Text = "검색시작"; + this.btn_Start.UseVisualStyleBackColor = true; + this.btn_Start.Click += new System.EventHandler(this.btn_Start_Click); + // + // btn_Stop + // + this.btn_Stop.Location = new System.Drawing.Point(554, 4); + this.btn_Stop.Name = "btn_Stop"; + this.btn_Stop.Size = new System.Drawing.Size(75, 24); + this.btn_Stop.TabIndex = 2; + this.btn_Stop.Text = "검색중지"; + this.btn_Stop.UseVisualStyleBackColor = true; + // // SearchCount // this.SearchCount.Location = new System.Drawing.Point(429, 6); @@ -136,46 +165,17 @@ this.panel2.Size = new System.Drawing.Size(635, 34); this.panel2.TabIndex = 0; // - // btn_SearchList - // - this.btn_SearchList.Location = new System.Drawing.Point(4, 4); - this.btn_SearchList.Name = "btn_SearchList"; - this.btn_SearchList.Size = new System.Drawing.Size(356, 24); - this.btn_SearchList.TabIndex = 3; - this.btn_SearchList.Text = "목록 검색"; - this.btn_SearchList.UseVisualStyleBackColor = true; - this.btn_SearchList.Click += new System.EventHandler(this.btn_SearchList_Click); - // - // btn_Stop - // - this.btn_Stop.Location = new System.Drawing.Point(554, 4); - this.btn_Stop.Name = "btn_Stop"; - this.btn_Stop.Size = new System.Drawing.Size(75, 24); - this.btn_Stop.TabIndex = 2; - this.btn_Stop.Text = "검색중지"; - this.btn_Stop.UseVisualStyleBackColor = true; - // - // btn_Start - // - this.btn_Start.Location = new System.Drawing.Point(473, 4); - this.btn_Start.Name = "btn_Start"; - this.btn_Start.Size = new System.Drawing.Size(75, 24); - this.btn_Start.TabIndex = 2; - this.btn_Start.Text = "검색시작"; - this.btn_Start.UseVisualStyleBackColor = true; - this.btn_Start.Click += new System.EventHandler(this.btn_Start_Click); - // // dataGridView1 // this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.book_name, @@ -190,24 +190,6 @@ this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // - // book_name - // - this.book_name.HeaderText = "도서명"; - this.book_name.Name = "book_name"; - this.book_name.Width = 350; - // - // book_comp - // - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - this.book_comp.Width = 150; - // - // Count - // - this.Count.HeaderText = "검색 수"; - this.Count.Name = "Count"; - this.Count.Width = 70; - // // webBrowser1 // this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -240,6 +222,15 @@ this.panel3.Size = new System.Drawing.Size(635, 732); this.panel3.TabIndex = 3; // + // panel6 + // + this.panel6.Controls.Add(this.dataGridView1); + this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel6.Location = new System.Drawing.Point(0, 102); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(635, 630); + this.panel6.TabIndex = 3; + // // panel4 // this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -252,23 +243,15 @@ this.panel4.Size = new System.Drawing.Size(635, 34); this.panel4.TabIndex = 2; // - // panel5 + // chk_RemoveBrit // - this.panel5.Controls.Add(this.webBrowser1); - this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(635, 0); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(717, 732); - this.panel5.TabIndex = 4; - // - // panel6 - // - this.panel6.Controls.Add(this.dataGridView1); - this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel6.Location = new System.Drawing.Point(0, 102); - this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(635, 630); - this.panel6.TabIndex = 3; + this.chk_RemoveBrit.AutoSize = true; + this.chk_RemoveBrit.Location = new System.Drawing.Point(131, 8); + this.chk_RemoveBrit.Name = "chk_RemoveBrit"; + this.chk_RemoveBrit.Size = new System.Drawing.Size(128, 16); + this.chk_RemoveBrit.TabIndex = 0; + this.chk_RemoveBrit.Text = "괄호안의 문자 제거"; + this.chk_RemoveBrit.UseVisualStyleBackColor = true; // // chk_spChar // @@ -280,15 +263,32 @@ this.chk_spChar.Text = "특수문자 제거"; this.chk_spChar.UseVisualStyleBackColor = true; // - // chk_RemoveBrit + // panel5 // - this.chk_RemoveBrit.AutoSize = true; - this.chk_RemoveBrit.Location = new System.Drawing.Point(131, 8); - this.chk_RemoveBrit.Name = "chk_RemoveBrit"; - this.chk_RemoveBrit.Size = new System.Drawing.Size(128, 16); - this.chk_RemoveBrit.TabIndex = 0; - this.chk_RemoveBrit.Text = "괄호안의 문자 제거"; - this.chk_RemoveBrit.UseVisualStyleBackColor = true; + this.panel5.Controls.Add(this.webBrowser1); + this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel5.Location = new System.Drawing.Point(635, 0); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(717, 732); + this.panel5.TabIndex = 4; + // + // book_name + // + this.book_name.HeaderText = "도서명(총서명)"; + this.book_name.Name = "book_name"; + this.book_name.Width = 350; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.Width = 150; + // + // Count + // + this.Count.HeaderText = "검색 수"; + this.Count.Name = "Count"; + this.Count.Width = 70; // // Check_copy // @@ -305,10 +305,10 @@ this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel3.ResumeLayout(false); + this.panel6.ResumeLayout(false); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); this.panel5.ResumeLayout(false); - this.panel6.ResumeLayout(false); this.ResumeLayout(false); } @@ -324,9 +324,6 @@ private System.Windows.Forms.Button btn_Stop; private System.Windows.Forms.Button btn_Start; private System.Windows.Forms.WebBrowser webBrowser1; - private System.Windows.Forms.DataGridViewTextBoxColumn book_name; - private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; - private System.Windows.Forms.DataGridViewTextBoxColumn Count; public System.Windows.Forms.TextBox tb_SearchTarget; public System.Windows.Forms.DataGridView dataGridView1; public System.Windows.Forms.Button btn_SearchList; @@ -337,5 +334,8 @@ private System.Windows.Forms.Panel panel5; private System.Windows.Forms.CheckBox chk_spChar; private System.Windows.Forms.CheckBox chk_RemoveBrit; + private System.Windows.Forms.DataGridViewTextBoxColumn book_name; + private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; + private System.Windows.Forms.DataGridViewTextBoxColumn Count; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs index 93afc17..6262ee7 100644 --- a/unimarc/unimarc/마크/Check_copy.cs +++ b/unimarc/unimarc/마크/Check_copy.cs @@ -68,8 +68,15 @@ namespace WindowsFormsApp1.Mac { for (int a = 0; a < dataGridView1.Rows.Count - 1; a++) { + if (dataGridView1.Rows[a].Cells["book_name"].Value == null) + continue; + + if (dataGridView1.Rows[a].Cells["book_name"].Value.ToString() == "") + continue; + dataGridView1.Rows[a].Cells["Count"].Value = CopyCount(dataGridView1.Rows[a].Cells["book_name"].Value.ToString()); + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; } } diff --git a/unimarc/unimarc/마크/DLS_Lookup.Designer.cs b/unimarc/unimarc/마크/DLS_Lookup.Designer.cs index 1536657..cc84b73 100644 --- a/unimarc/unimarc/마크/DLS_Lookup.Designer.cs +++ b/unimarc/unimarc/마크/DLS_Lookup.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(School_Lookup)); this.btn_Back = new System.Windows.Forms.Button(); this.tb_URL = new System.Windows.Forms.TextBox(); this.panel7 = new System.Windows.Forms.Panel(); @@ -40,15 +39,10 @@ this.lbl_ID = new System.Windows.Forms.Label(); this.lbl_Client = new System.Windows.Forms.Label(); this.tb_SearchClient = new System.Windows.Forms.TextBox(); - this.btn_Reflesh008 = new System.Windows.Forms.Button(); - this.rBtn_ISBN = new System.Windows.Forms.RadioButton(); - this.rBtn_BookName = new System.Windows.Forms.RadioButton(); this.lbl_PW = new System.Windows.Forms.Label(); this.lbl_Area = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); this.btn_Connect = new System.Windows.Forms.Button(); this.panel5 = new System.Windows.Forms.Panel(); - this.btn_Search = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); this.Check = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -60,7 +54,6 @@ this.panel7.SuspendLayout(); this.panel6.SuspendLayout(); this.panel4.SuspendLayout(); - this.panel5.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel3.SuspendLayout(); @@ -175,41 +168,6 @@ this.tb_SearchClient.TabIndex = 1; this.tb_SearchClient.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_SearchClient_KeyDown); // - // btn_Reflesh008 - // - this.btn_Reflesh008.BackColor = System.Drawing.SystemColors.WindowText; - this.btn_Reflesh008.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_Reflesh008.BackgroundImage"))); - this.btn_Reflesh008.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btn_Reflesh008.Dock = System.Windows.Forms.DockStyle.Right; - this.btn_Reflesh008.Location = new System.Drawing.Point(329, 0); - this.btn_Reflesh008.Name = "btn_Reflesh008"; - this.btn_Reflesh008.Size = new System.Drawing.Size(29, 29); - this.btn_Reflesh008.TabIndex = 208; - this.btn_Reflesh008.UseVisualStyleBackColor = false; - this.btn_Reflesh008.Click += new System.EventHandler(this.btn_Reflesh008_Click); - // - // rBtn_ISBN - // - this.rBtn_ISBN.AutoSize = true; - this.rBtn_ISBN.Checked = true; - this.rBtn_ISBN.Location = new System.Drawing.Point(185, 7); - this.rBtn_ISBN.Name = "rBtn_ISBN"; - this.rBtn_ISBN.Size = new System.Drawing.Size(51, 16); - this.rBtn_ISBN.TabIndex = 4; - this.rBtn_ISBN.TabStop = true; - this.rBtn_ISBN.Text = "ISBN"; - this.rBtn_ISBN.UseVisualStyleBackColor = true; - // - // rBtn_BookName - // - this.rBtn_BookName.AutoSize = true; - this.rBtn_BookName.Location = new System.Drawing.Point(98, 7); - this.rBtn_BookName.Name = "rBtn_BookName"; - this.rBtn_BookName.Size = new System.Drawing.Size(59, 16); - this.rBtn_BookName.TabIndex = 4; - this.rBtn_BookName.Text = "도서명"; - this.rBtn_BookName.UseVisualStyleBackColor = true; - // // lbl_PW // this.lbl_PW.AutoSize = true; @@ -228,15 +186,6 @@ this.lbl_Area.TabIndex = 3; this.lbl_Area.Text = "Area"; // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(6, 9); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 12); - this.label2.TabIndex = 3; - this.label2.Text = "검색조건"; - // // btn_Connect // this.btn_Connect.Location = new System.Drawing.Point(278, 8); @@ -250,32 +199,16 @@ // panel5 // this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel5.Controls.Add(this.btn_Reflesh008); - this.panel5.Controls.Add(this.rBtn_ISBN); - this.panel5.Controls.Add(this.rBtn_BookName); - this.panel5.Controls.Add(this.label2); - this.panel5.Controls.Add(this.btn_Search); - this.panel5.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel5.Location = new System.Drawing.Point(0, 37); + this.panel5.Dock = System.Windows.Forms.DockStyle.Top; + this.panel5.Location = new System.Drawing.Point(0, 38); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(360, 31); + this.panel5.Size = new System.Drawing.Size(362, 38); this.panel5.TabIndex = 4; // - // btn_Search - // - this.btn_Search.Location = new System.Drawing.Point(242, 4); - this.btn_Search.Name = "btn_Search"; - this.btn_Search.Size = new System.Drawing.Size(75, 23); - this.btn_Search.TabIndex = 2; - this.btn_Search.Text = "검 색"; - this.btn_Search.UseVisualStyleBackColor = true; - this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click); - // // panel2 // this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel2.Controls.Add(this.btn_Connect); - this.panel2.Controls.Add(this.panel5); this.panel2.Controls.Add(this.lbl_PW); this.panel2.Controls.Add(this.lbl_Area); this.panel2.Controls.Add(this.lbl_ID); @@ -285,7 +218,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(362, 70); + this.panel2.Size = new System.Drawing.Size(362, 38); this.panel2.TabIndex = 3; // // label1 @@ -326,7 +259,7 @@ this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersWidth = 31; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(360, 642); + this.dataGridView1.Size = new System.Drawing.Size(301, 287); this.dataGridView1.TabIndex = 0; this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); @@ -335,16 +268,16 @@ // this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel3.Controls.Add(this.dataGridView1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 70); + this.panel3.Location = new System.Drawing.Point(34, 382); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(362, 644); + this.panel3.Size = new System.Drawing.Size(303, 289); this.panel3.TabIndex = 4; // // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel1.Controls.Add(this.panel3); + this.panel1.Controls.Add(this.panel5); this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Left; this.panel1.Location = new System.Drawing.Point(0, 0); @@ -366,8 +299,6 @@ this.panel6.ResumeLayout(false); this.panel6.PerformLayout(); this.panel4.ResumeLayout(false); - this.panel5.ResumeLayout(false); - this.panel5.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); @@ -390,15 +321,10 @@ public System.Windows.Forms.Label lbl_ID; public System.Windows.Forms.Label lbl_Client; public System.Windows.Forms.TextBox tb_SearchClient; - private System.Windows.Forms.Button btn_Reflesh008; - private System.Windows.Forms.RadioButton rBtn_ISBN; - private System.Windows.Forms.RadioButton rBtn_BookName; public System.Windows.Forms.Label lbl_PW; public System.Windows.Forms.Label lbl_Area; - private System.Windows.Forms.Label label2; private System.Windows.Forms.Button btn_Connect; private System.Windows.Forms.Panel panel5; - private System.Windows.Forms.Button btn_Search; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Label label1; private System.Windows.Forms.DataGridViewTextBoxColumn Check; diff --git a/unimarc/unimarc/마크/DLS_Lookup.cs b/unimarc/unimarc/마크/DLS_Lookup.cs index 2b44d0b..27375ca 100644 --- a/unimarc/unimarc/마크/DLS_Lookup.cs +++ b/unimarc/unimarc/마크/DLS_Lookup.cs @@ -160,136 +160,6 @@ namespace WindowsFormsApp1.DLS } #endregion - private void btn_Search_Click(object sender, EventArgs e) - { - - if (dataGridView1.Rows[0].Cells["ISBN"].Value == null && rBtn_ISBN.Checked) - { - MessageBox.Show("ISBN이 입력되지않았습니다!"); - return; - } - if (dataGridView1.Rows[0].Cells["Book_name"].Value == null && rBtn_BookName.Checked) - { - MessageBox.Show("도서명이 입력되지않았습니다!"); - return; - } - - bool isISBN = rBtn_ISBN.Checked; - if (!SearchCopy(isISBN)) - return; - - MessageBox.Show("완료되었습니다."); - } - #region SearchClick_Sub - - private bool SearchCopy(bool isISBN) - { - if (!webBrowser1.Url.AbsoluteUri.Contains("collectionFormMA")) - { - MessageBox.Show("자료관리 창이 아닙니다!"); - return false; - } - - int count = dataGridView1.Rows.Count; - - for (int a = 0; a < count; a++) - { - string Check = ""; - if (isISBN) - { - string Target = dataGridView1.Rows[a].Cells["ISBN"].Value.ToString(); - Check = SearchISBN(Target); - } - else - { - string Target = dataGridView1.Rows[a].Cells["Book_name"].Value.ToString(); - Check = SearchName(Target); - } - dataGridView1.Rows[a].Cells["Check"].Value = Check; - } - return true; - } - /// - /// 도서명 필터로 DLS복본 검색 - /// - /// 도서명 - /// 행 번호 - private string SearchName(string Target) - { - HtmlElementCollection search = webBrowser1.Document.GetElementsByTagName("input"); - foreach (HtmlElement Search in search) - { - if (Search.Id == "bib1") - Search.SetAttribute("value", Target); - - if (Search.GetAttribute("className") == "button_search") - Search.InvokeMember("click"); - } - Delay(5000); - - string InnerText = ""; - - HtmlElementCollection paging_nav = webBrowser1.Document.GetElementsByTagName("div"); - foreach (HtmlElement div in paging_nav) - { - if (div.GetAttribute("className") == "paging_nav") - { - HtmlElementCollection span = div.GetElementsByTagName("span"); - foreach (HtmlElement count in span) - { - InnerText = count.InnerText; - break; - } - } - } - - return InnerText; - } - /// - /// ISBN 필터로 DLS복본 검색 - /// - /// ISBN - /// 행 번호 - private string SearchISBN(string Target) - { - HtmlElementCollection combo = webBrowser1.Document.GetElementsByTagName("select"); - foreach (HtmlElement Search in combo) - { - if (Search.Id == "bibKind2") - Search.SetAttribute("selectedIndex", "2"); - } - - HtmlElementCollection search = webBrowser1.Document.GetElementsByTagName("input"); - foreach (HtmlElement Search in search) - { - if (Search.Id == "bib2") - Search.SetAttribute("value", Target); - - if (Search.GetAttribute("className") == "button_search") - Search.InvokeMember("click"); - } - Delay(5000); - - string InnerText = ""; - - HtmlElementCollection paging_nav = webBrowser1.Document.GetElementsByTagName("div"); - foreach (HtmlElement div in paging_nav) - { - if (div.GetAttribute("className") == "paging_nav") - { - HtmlElementCollection span = div.GetElementsByTagName("span"); - foreach (HtmlElement count in span) - { - InnerText = count.InnerText; - break; - } - } - } - - return InnerText; - } - #endregion - /// /// DLS지역 코드 변환 /// @@ -368,13 +238,5 @@ namespace WindowsFormsApp1.DLS webBrowser1.Navigate(url); } } - - private void btn_Reflesh008_Click(object sender, EventArgs e) - { - for (int a = 0; a < dataGridView1.Rows.Count; a++) - { - dataGridView1.Rows[a].Cells["Check"].Value = ""; - } - } } } diff --git a/unimarc/unimarc/마크/DLS_Lookup.resx b/unimarc/unimarc/마크/DLS_Lookup.resx index 0fac076..8ef1124 100644 --- a/unimarc/unimarc/마크/DLS_Lookup.resx +++ b/unimarc/unimarc/마크/DLS_Lookup.resx @@ -117,45 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - iVBORw0KGgoAAAANSUhEUgAAAOEAAADhCAMAAAAJbSJIAAAABGdBTUEAALGPC/xhBQAAAIFQTFRF//// - AAAAlJSU4ODgU1NT6enp+Pj4w8PDxMTEkpKS/Pz81tbW5eXlRERE3NzcmZmZzMzMZGRkTU1Nb29vg4OD - urq6KioqW1tb8vLyf39/sbGxEhISPz8/i4uL0NDQZmZmIyMjoqKiNTU1tLS0GRkZp6end3d3Li4uOjo6 - Dg4OJSUlLUB5vgAABwxJREFUeF7tnX97ojAMx6ceIqDi/DXndJ47vZt7/y/wFOMUSKG0SWE8+fxz9zxl - ZN8BaZq26ZMgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCELrWHnDsb8+7uNuvD+u/fHQW0GLOT34t276kb99 - nn51siynu60f9eEqA7Zb+E+d9P1g9AaKcN42gR/C1dUIOl34X12E43gDMsrYxGP4IX26nZoVRtt/8Ovr - 8bmtJvIssE6Fq/3n9feuxOao73wuAutTGD0nv7AJM80HmQisS6E/TaybMh3AfYq4CqxH4ULXuagp1wgC - 61A4MPn88kzf4X44N4HuFQ5/gWV7dh7cE+FboGuF/S3YpSFWhQF3gY4VTqp1f+V8RnDnNA8C3Sr8C0Yp - wcLOR4EuFUYnsEnLMjd4SAl0qDAGi/SswQKQFuhMYWgewpTzF4wkZAS6Ujj8DfZ4+LzHqlmBjhROwBob - p1uomhPoRuEajJUzms3jtT+JxtHEP3bnM/3w7hrF5QU6UbgHW8V8BAsvl60I+8M/2w+4opjF+XJEoAuF - mNkMy3lhIB0uZhrf8RG3xK8wAEtKvrZ4YJJmMitO5ZzB3TW7wrIn+OLrJtJWa73XNQO3wpJvcFYtmzkY - wc9VgFnhHzCDMysY/iiYVNbIq/AdrKC8VE8OXlhUHJ+wKvTACMZJJ9WCEpb6rhScCsN8kv6bV7MU9pVe - lTwPp8IZ2MhzmMAlpmj0sTcYFard6LP9jNKktHe8wadwDBbyBHCFFStdp8qnUBlnGbuYDJo5ETaFr2Ag - y5tOiKaHnk/lUqjqCQ9DuIACrUELk8JQEUIe7H3MI8Uh0xUmhQpvTixQK7vFo1ARzLxRvqJntHpFHoU7 - uHsGOieToNftsyhUuBkfmonQjGtYFOLTn8SmdAM3DoV47vAZWonQFciiEH2ExG5UWyCHQvwR2o4m0ugL - 5FD4ArdO8QqNNFQQyKCwB3dOcbIZ8OaoIpBBIRryU40nEioJpFfYhxuneIFGEqoJpFeIzsKYZdVwKgqk - V4h1FTNoo6CqQHKFqJ+pnvhVUi2TeIFaITaeIXyElZ8gvUIsP0S30tpAILVCbGBI50hNBFIrPMJtHyEb - NBkJpFaIRGxLi4X2KcwEUiuEuz5CtRvAUCCxQmxwT5S6MBVIrBD5DP9BkyXGAokVIp/hHJrsMBdIrBCZ - qyAZVVSPZO6QKhzCTR+BJitsBNIqRBzNBppssHhFz5AqRBwNwVyhnUBahcjw/rLazA6rV/QMqULElVoP - nGwF0sw430AGFrYhWzjuWUKZp10dQNadETS1BGToRJm/aABId0gT0TQGJEcTQ1NLQCYsMlshfjoLkPUA - 8aRo3SAKaWecagdJdxPP3NcNEpZSpvMbQPufYfu/w/b70vb3h+2Padofl7Z/bNH+8SHHGL9hcORpmgVL - rq1R8ORLmwRTzrtBcM1bNAiuuafmwDZ/2BgQV7OEppbAOI/fFEDVI+5e02D6Kwc00YFs+idbT1PGCqnw - k6rrQgLyITob52PbvOhDKt51bcVgiwYZ3h9sAa2bKrARWHuEeBdLAvP60gKQvpglTcS9RliJO8Pc67xV - YKVbdtBGC/tafRx0QyBPTMy/3wIFqzd5gjZq0D0z3H0ikm7nS9Zig0TifU850BenQ7yt+g7mton3rmVB - 3xv6iO2Gi/2HaQZgIw1joOFiD+kjWMjN1VVccbIP+AH0s+DtodCHyJZYxAv3cj5CRffL1WWgHUWnQ1y+ - IYubmgoJir8md2ZBURfjRP+HRQPuM+yJBcXKZXKH6inKRfHProeKuuvEEhXvSmcK7ZwoPg/aAi69/JTs - FSdZBQd1opTlsx2tj1DW+qLqNHy4Xw5X813qem00+wPUi/idzTuz1txb4aHaBYfTzuq6iW+2I42Jysdw - j9MyLMEoglXty1Dlxs64Xd+i6q4unMwdjl9wBMHB8fIWVa+YYFiDdqz+As84X7JLXkfYQxMW39Qwp05b - C7qndl4JtazeKds9qF/PO/QL388zR7jSMaXb677mOoFcNC+tAb2HS52jsQe0pK7+02Be0PHcqOkJXtAq - M9r5xM5GeOp7i0Cv8nOtC64rnW/RPSbnW7z763g+0y0WXPua+cJ+kYTa17R4BcXLCfjgSzdrEyrSbyQ0 - ZDU533lPNTrRNJF6xGPD7ybtHiuOKc1wOhwsh/zsvI/GbR0jPv8w4J1aNmNYFj7r88I8+2LMwP6c1Quj - Ju9tJDhLdtT0jRy+fsCJMao5CtXC5kznn7Kw2tubvKyb+EdtpYo0z8W7sdRKBzSLcBzrfpIf8biJ3Z8O - fT8YFR/9c9gE2gmrptKP/O3zNJ+N+Zrutovop6u7s/KG48H6uI+78X6/9qOh14ChrSAIgiAIgiAIgiAI - giAIgiAIgiAIgiAIAilPT/8BzuZT5uV+S2QAAAAASUVORK5CYII= - - True diff --git a/unimarc/unimarc/마크/Mac_Chack_Up.Designer.cs b/unimarc/unimarc/마크/Mac_Chack_Up.Designer.cs index 579d570..e790404 100644 --- a/unimarc/unimarc/마크/Mac_Chack_Up.Designer.cs +++ b/unimarc/unimarc/마크/Mac_Chack_Up.Designer.cs @@ -28,33 +28,279 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel4 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.button1 = new System.Windows.Forms.Button(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.dataGridView2 = new System.Windows.Forms.DataGridView(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.dataGridView3 = new System.Windows.Forms.DataGridView(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.dataGridView4 = new System.Windows.Forms.DataGridView(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.r_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.panel1.SuspendLayout(); + this.panel4.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel2.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit(); + this.tabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView3)).BeginInit(); + this.tabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView4)).BeginInit(); this.SuspendLayout(); // - // label1 + // dataGridView1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(276, 259); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(57, 12); - this.label1.TabIndex = 0; - this.label1.Text = "마크 검수"; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.idx, + this.num, + this.r_num, + this.count, + this.book_name, + this.author, + this.book_comp}); + this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView1.Location = new System.Drawing.Point(0, 0); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowHeadersWidth = 21; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(462, 597); + this.dataGridView1.TabIndex = 0; + // + // panel1 + // + this.panel1.Controls.Add(this.panel4); + this.panel1.Controls.Add(this.panel3); + this.panel1.Controls.Add(this.panel2); + this.panel1.Dock = System.Windows.Forms.DockStyle.Left; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(462, 734); + this.panel1.TabIndex = 1; + // + // panel4 + // + this.panel4.Controls.Add(this.dataGridView1); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(0, 137); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(462, 597); + this.panel4.TabIndex = 3; + // + // panel3 + // + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.richTextBox1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Top; + this.panel3.Location = new System.Drawing.Point(0, 40); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(462, 97); + this.panel3.TabIndex = 2; + // + // richTextBox1 + // + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(0, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(460, 95); + this.richTextBox1.TabIndex = 0; + this.richTextBox1.Text = ""; + // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.button1); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(462, 40); + this.panel2.TabIndex = 1; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Fill; + this.button1.Location = new System.Drawing.Point(0, 0); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(460, 38); + this.button1.TabIndex = 0; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Location = new System.Drawing.Point(468, 40); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(634, 682); + this.tabControl1.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.dataGridView2); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(626, 656); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "검 수"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // dataGridView2 + // + this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView2.Location = new System.Drawing.Point(79, 74); + this.dataGridView2.Name = "dataGridView2"; + this.dataGridView2.RowTemplate.Height = 23; + this.dataGridView2.Size = new System.Drawing.Size(240, 150); + this.dataGridView2.TabIndex = 0; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.dataGridView3); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(626, 656); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "입고 확인"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // dataGridView3 + // + this.dataGridView3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView3.Location = new System.Drawing.Point(116, 246); + this.dataGridView3.Name = "dataGridView3"; + this.dataGridView3.RowTemplate.Height = 23; + this.dataGridView3.Size = new System.Drawing.Size(240, 150); + this.dataGridView3.TabIndex = 0; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.dataGridView4); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Padding = new System.Windows.Forms.Padding(3); + this.tabPage3.Size = new System.Drawing.Size(626, 656); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "데이터 저장"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // dataGridView4 + // + this.dataGridView4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView4.Location = new System.Drawing.Point(112, 326); + this.dataGridView4.Name = "dataGridView4"; + this.dataGridView4.RowTemplate.Height = 23; + this.dataGridView4.Size = new System.Drawing.Size(240, 150); + this.dataGridView4.TabIndex = 0; + // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; + // + // num + // + this.num.HeaderText = "연번"; + this.num.Name = "num"; + this.num.Width = 40; + // + // r_num + // + this.r_num.HeaderText = "등록번호"; + this.r_num.Name = "r_num"; + this.r_num.Width = 70; + // + // count + // + this.count.HeaderText = "수량"; + this.count.Name = "count"; + this.count.Width = 40; + // + // book_name + // + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + // + // author + // + this.author.HeaderText = "저자"; + this.author.Name = "author"; + this.author.Width = 80; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.Width = 80; // // Mac_Chack_Up // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.label1); + this.ClientSize = new System.Drawing.Size(1314, 734); + this.Controls.Add(this.tabControl1); + this.Controls.Add(this.panel1); this.Name = "Mac_Chack_Up"; this.Text = "마크 검수"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel4.ResumeLayout(false); + this.panel3.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit(); + this.tabPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView3)).EndInit(); + this.tabPage3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView4)).EndInit(); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private System.Windows.Forms.Label label1; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.RichTextBox richTextBox1; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.DataGridView dataGridView2; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.DataGridView dataGridView3; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.DataGridView dataGridView4; + private System.Windows.Forms.DataGridViewTextBoxColumn idx; + private System.Windows.Forms.DataGridViewTextBoxColumn num; + private System.Windows.Forms.DataGridViewTextBoxColumn r_num; + private System.Windows.Forms.DataGridViewTextBoxColumn count; + private System.Windows.Forms.DataGridViewTextBoxColumn book_name; + private System.Windows.Forms.DataGridViewTextBoxColumn author; + private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_Chack_Up.resx b/unimarc/unimarc/마크/Mac_Chack_Up.resx index 1af7de1..d269a0f 100644 --- a/unimarc/unimarc/마크/Mac_Chack_Up.resx +++ b/unimarc/unimarc/마크/Mac_Chack_Up.resx @@ -117,4 +117,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_List.Designer.cs b/unimarc/unimarc/마크/Mac_List.Designer.cs index d04ce05..7e1c8e7 100644 --- a/unimarc/unimarc/마크/Mac_List.Designer.cs +++ b/unimarc/unimarc/마크/Mac_List.Designer.cs @@ -36,14 +36,12 @@ 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_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.KDC = 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.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.grade = 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(); @@ -51,10 +49,6 @@ this.label2 = new System.Windows.Forms.Label(); this.btn_Lookup = new System.Windows.Forms.Button(); this.btn_Excel = new System.Windows.Forms.Button(); - this.btn_Merge = new System.Windows.Forms.Button(); - this.btn_Progress = new System.Windows.Forms.Button(); - this.btn_Completion = new System.Windows.Forms.Button(); - this.btn_Delete = new System.Windows.Forms.Button(); this.btn_Close = new System.Windows.Forms.Button(); this.btn_Save = new System.Windows.Forms.Button(); this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); @@ -95,14 +89,12 @@ this.idx, this.start_date, this.end_date, - this.list_marc, this.list_name, - this.KDC, - this.total, - this.flatter, - this.unflatter, + this.work_name, + this.count, + this.stock, + this.unstock, this.state, - this.grade, this.etc, this.charge, this.check}); @@ -118,7 +110,7 @@ this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersWidth = 40; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1156, 598); + this.dataGridView1.Size = new System.Drawing.Size(1094, 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); @@ -131,49 +123,42 @@ // // start_date // - this.start_date.HeaderText = "등록일"; + this.start_date.HeaderText = "목록일자"; this.start_date.Name = "start_date"; // // end_date // - this.end_date.HeaderText = "마감일"; + this.end_date.HeaderText = "완료일자"; this.end_date.Name = "end_date"; // - // list_marc - // - this.list_marc.HeaderText = "작업목록명"; - this.list_marc.Name = "list_marc"; - this.list_marc.Width = 170; - // // list_name // - this.list_name.HeaderText = "연동목록명"; + this.list_name.HeaderText = "목록명"; this.list_name.Name = "list_name"; - this.list_name.Visible = false; + this.list_name.Width = 170; // - // KDC + // work_name // - this.KDC.HeaderText = "분류"; - this.KDC.Name = "KDC"; - this.KDC.Width = 80; + this.work_name.HeaderText = "작업명"; + this.work_name.Name = "work_name"; // - // total + // count // - this.total.HeaderText = "전체"; - this.total.Name = "total"; - this.total.Width = 70; + this.count.HeaderText = "수량"; + this.count.Name = "count"; + this.count.Width = 80; // - // flatter + // stock // - this.flatter.HeaderText = "편목"; - this.flatter.Name = "flatter"; - this.flatter.Width = 70; + this.stock.HeaderText = "입고"; + this.stock.Name = "stock"; + this.stock.Width = 70; // - // unflatter + // unstock // - this.unflatter.HeaderText = "미편목"; - this.unflatter.Name = "unflatter"; - this.unflatter.Width = 70; + this.unstock.HeaderText = "미입고"; + this.unstock.Name = "unstock"; + this.unstock.Width = 70; // // state // @@ -181,12 +166,6 @@ this.state.Name = "state"; this.state.Width = 70; // - // grade - // - this.grade.HeaderText = "등급"; - this.grade.Name = "grade"; - this.grade.Width = 60; - // // etc // this.etc.HeaderText = "비고"; @@ -197,6 +176,7 @@ // this.charge.HeaderText = "담당자"; this.charge.Name = "charge"; + this.charge.Width = 70; // // check // @@ -224,7 +204,7 @@ // // btn_Lookup // - this.btn_Lookup.Location = new System.Drawing.Point(489, 4); + this.btn_Lookup.Location = new System.Drawing.Point(452, 4); this.btn_Lookup.Name = "btn_Lookup"; this.btn_Lookup.Size = new System.Drawing.Size(75, 32); this.btn_Lookup.TabIndex = 50; @@ -234,7 +214,7 @@ // // btn_Excel // - this.btn_Excel.Location = new System.Drawing.Point(651, 4); + this.btn_Excel.Location = new System.Drawing.Point(950, 4); this.btn_Excel.Name = "btn_Excel"; this.btn_Excel.Size = new System.Drawing.Size(75, 32); this.btn_Excel.TabIndex = 50; @@ -242,49 +222,9 @@ this.btn_Excel.UseVisualStyleBackColor = true; this.btn_Excel.Click += new System.EventHandler(this.btn_Excel_Click); // - // btn_Merge - // - this.btn_Merge.Location = new System.Drawing.Point(732, 4); - this.btn_Merge.Name = "btn_Merge"; - this.btn_Merge.Size = new System.Drawing.Size(75, 32); - this.btn_Merge.TabIndex = 50; - this.btn_Merge.Text = "목록병합"; - this.btn_Merge.UseVisualStyleBackColor = true; - this.btn_Merge.Click += new System.EventHandler(this.btn_Merge_Click); - // - // btn_Progress - // - this.btn_Progress.Location = new System.Drawing.Point(813, 4); - this.btn_Progress.Name = "btn_Progress"; - this.btn_Progress.Size = new System.Drawing.Size(75, 32); - this.btn_Progress.TabIndex = 50; - this.btn_Progress.Text = "목록진행"; - this.btn_Progress.UseVisualStyleBackColor = true; - this.btn_Progress.Click += new System.EventHandler(this.btn_Progress_Click); - // - // btn_Completion - // - this.btn_Completion.Location = new System.Drawing.Point(894, 4); - this.btn_Completion.Name = "btn_Completion"; - this.btn_Completion.Size = new System.Drawing.Size(75, 32); - this.btn_Completion.TabIndex = 50; - this.btn_Completion.Text = "목록완료"; - this.btn_Completion.UseVisualStyleBackColor = true; - this.btn_Completion.Click += new System.EventHandler(this.btn_Completion_Click); - // - // btn_Delete - // - this.btn_Delete.Location = new System.Drawing.Point(975, 4); - this.btn_Delete.Name = "btn_Delete"; - this.btn_Delete.Size = new System.Drawing.Size(75, 32); - this.btn_Delete.TabIndex = 50; - this.btn_Delete.Text = "목록삭제"; - this.btn_Delete.UseVisualStyleBackColor = true; - this.btn_Delete.Click += new System.EventHandler(this.btn_Delete_Click); - // // btn_Close // - this.btn_Close.Location = new System.Drawing.Point(1056, 4); + this.btn_Close.Location = new System.Drawing.Point(1031, 4); this.btn_Close.Name = "btn_Close"; this.btn_Close.Size = new System.Drawing.Size(75, 32); this.btn_Close.TabIndex = 50; @@ -294,7 +234,7 @@ // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(570, 4); + this.btn_Save.Location = new System.Drawing.Point(869, 4); this.btn_Save.Name = "btn_Save"; this.btn_Save.Size = new System.Drawing.Size(75, 32); this.btn_Save.TabIndex = 50; @@ -306,13 +246,9 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1183, 651); + this.ClientSize = new System.Drawing.Size(1122, 661); this.Controls.Add(this.btn_Close); - this.Controls.Add(this.btn_Delete); - this.Controls.Add(this.btn_Progress); this.Controls.Add(this.btn_Excel); - this.Controls.Add(this.btn_Completion); - this.Controls.Add(this.btn_Merge); this.Controls.Add(this.btn_Save); this.Controls.Add(this.btn_Lookup); this.Controls.Add(this.cb_state); @@ -337,27 +273,21 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Button btn_Lookup; private System.Windows.Forms.Button btn_Excel; - 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_Close; private System.Windows.Forms.Button btn_Save; + public System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.SaveFileDialog saveFileDialog1; private System.Windows.Forms.DataGridViewTextBoxColumn idx; private System.Windows.Forms.DataGridViewTextBoxColumn start_date; private System.Windows.Forms.DataGridViewTextBoxColumn end_date; - private System.Windows.Forms.DataGridViewTextBoxColumn list_marc; private System.Windows.Forms.DataGridViewTextBoxColumn list_name; - private System.Windows.Forms.DataGridViewTextBoxColumn KDC; - private System.Windows.Forms.DataGridViewTextBoxColumn total; - private System.Windows.Forms.DataGridViewTextBoxColumn flatter; - private System.Windows.Forms.DataGridViewTextBoxColumn unflatter; + private System.Windows.Forms.DataGridViewTextBoxColumn work_name; + private System.Windows.Forms.DataGridViewTextBoxColumn count; + private System.Windows.Forms.DataGridViewTextBoxColumn stock; + private System.Windows.Forms.DataGridViewTextBoxColumn unstock; private System.Windows.Forms.DataGridViewTextBoxColumn state; - private System.Windows.Forms.DataGridViewTextBoxColumn grade; private System.Windows.Forms.DataGridViewTextBoxColumn etc; private System.Windows.Forms.DataGridViewTextBoxColumn charge; private System.Windows.Forms.DataGridViewTextBoxColumn check; - public System.Windows.Forms.DataGridView dataGridView1; - private System.Windows.Forms.SaveFileDialog saveFileDialog1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs index 2bc0d9d..d58cc98 100644 --- a/unimarc/unimarc/마크/Mac_List.cs +++ b/unimarc/unimarc/마크/Mac_List.cs @@ -33,12 +33,11 @@ namespace WindowsFormsApp1.Mac cb_state.SelectedIndex = 0; // 마감일 등급 비고 제외한 나머지 수정불가. - for(int a= 0; a < dataGridView1.Columns.Count; a++) + for (int a = 0; a < dataGridView1.Columns.Count; a++) { dataGridView1.Columns[a].ReadOnly = true; } dataGridView1.Columns["end_date"].ReadOnly = false; - dataGridView1.Columns["grade"].ReadOnly = false; dataGridView1.Columns["etc"].ReadOnly = false; dataGridView1.Columns["charge"].ReadOnly = false; } @@ -50,17 +49,24 @@ namespace WindowsFormsApp1.Mac } private void btn_Lookup_Click(object sender, EventArgs e) { - string table = "Obj_List_Marc"; - /* 목록일자 / 완료일자 / 마크목록명 / Obj_List목록명 / KDC분류 - * 전체 / 편목 / 미편목 / 상태 / 등급 - * 비고 / 마크담당자 */ - string Area = "`idx`, `date`, `date_res`, `list_name`, `connect_data`, " + - "`KDC`, `total`, `flatter`, `unflatter`, `state`, " + - "`grade`, `etc`, `m_charge`"; + string table = "Obj_List"; + /* idx / 목록일자 / 완료일자 / 목록명 / 작업명 + * 전체수량 / 입고 / 미입고 / 상태 / 비고 + * 마크담당자 */ + string Area = "`idx`, `date`, `date_res`, `list_name`, `work_name`, " + + "`vol`, `stock`, `unstock`, `state`, `m_etc`, " + + "`m_charge`"; string search = tb_Search.Text; string state = cb_state.Text; - string cmd = db.DB_Contains(table, compidx, "list_name", search, Area, "state", state); + string cmd = string.Format( + "SELECT {0} " + + "FROM `{1}` " + + "WHERE `comp_num` = {2} " + + "AND `list_name` LIKE \"%{3}%\" " + + "AND `state` = \"{4}\" " + + "AND `chk_marc` > 0;", + Area, table, compidx, search, state); string db_res = db.DB_Send_CMD_Search(cmd); string[] data = db_res.Split('|'); @@ -72,13 +78,14 @@ namespace WindowsFormsApp1.Mac /// private void input_Grid(string[] data) { - /* 등록일 / 마감일 / 작업목록명 / 연동목록명(H) / 분류 - * 전체 / 편목 / 미편목 / 상태 / 등급 - * 비고 / 담당자 / V */ + /* idx / 목록일자 / 완료일자 / 목록명 / 작업명 + * 전체수량 / 입고 / 미입고 / 상태 / 비고 + * 마크담당자 */ + string[] grid = { "", "", "", "", "", "", "", "", "", "", - "", "", "", "" }; - int area_count = 13; + "", "", "" }; + int area_count = 11; dataGridView1.Rows.Clear(); for (int a = 0; a < data.Length; a++) { @@ -92,8 +99,7 @@ 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 == 11) { grid[11] = data[a]; + if (a % area_count == 10) { grid[10] = data[a]; dataGridView1.Rows.Add(grid); } } @@ -107,22 +113,22 @@ namespace WindowsFormsApp1.Mac for (int a = 0; a < dataGridView1.Rows.Count - 1; a++) { if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { - string[] edit_col = { "date", "date_res", "list_name", "KDC", "total", - "flatter", "unflatter", "state", "grade", "etc", - "m_charge" }; - string[] edit_tbl = { dataGridView1.Rows[a].Cells["start_date"].Value.ToString(), - dataGridView1.Rows[a].Cells["end_date"].Value.ToString(), - dataGridView1.Rows[a].Cells["list_marc"].Value.ToString(), - dataGridView1.Rows[a].Cells["KDC"].Value.ToString(), - dataGridView1.Rows[a].Cells["total"].Value.ToString(), - - dataGridView1.Rows[a].Cells["flatter"].Value.ToString(), - dataGridView1.Rows[a].Cells["unflatter"].Value.ToString(), - dataGridView1.Rows[a].Cells["state"].Value.ToString(), - dataGridView1.Rows[a].Cells["grade"].Value.ToString(), - dataGridView1.Rows[a].Cells["etc"].Value.ToString(), - - dataGridView1.Rows[a].Cells["charge"].Value.ToString() }; + string[] edit_col = { + "date", "date_res", "list_name", "work_name", "vol", + "stock", "unstock", "state", "m_etc", "m_charge" + }; + string[] edit_tbl = { + dataGridView1.Rows[a].Cells["start_date"].Value.ToString(), + dataGridView1.Rows[a].Cells["end_date"].Value.ToString(), + dataGridView1.Rows[a].Cells["list_name"].Value.ToString(), + dataGridView1.Rows[a].Cells["work_name"].Value.ToString(), + dataGridView1.Rows[a].Cells["count"].Value.ToString(), + dataGridView1.Rows[a].Cells["stock"].Value.ToString(), + 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() + }; string[] sear_col = { "idx", "compidx" }; string[] sear_tbl = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(), compidx }; @@ -135,7 +141,9 @@ namespace WindowsFormsApp1.Mac private void btn_Excel_Click(object sender, EventArgs e) { Excel_text et = new Excel_text(); - string[] Excel_title = { "NO", "등록일", "마감일", "작업처", "분류", "전체", "편목", "미편목", "상태", "등급", "비고", "담당자" }; + string[] Excel_title = { + "NO", "목록일자", "완료일자", "목록명", "마크담당자", + "작업명", "수량", "입고", "미입고", "상태", "비고" }; int rowCount = dataGridView1.RowCount; string[,] inputExcel = new string[rowCount, 11]; for (int a = 0; a < rowCount; a++) @@ -144,14 +152,14 @@ namespace WindowsFormsApp1.Mac inputExcel[a, 0] = row_idx.ToString(); inputExcel[a, 1] = dataGridView1.Rows[a].Cells["start_date"].Value.ToString(); inputExcel[a, 2] = dataGridView1.Rows[a].Cells["end_date"].Value.ToString(); - inputExcel[a, 3] = dataGridView1.Rows[a].Cells["list_marc"].Value.ToString(); - inputExcel[a, 4] = dataGridView1.Rows[a].Cells["KDC"].Value.ToString(); - inputExcel[a, 5] = dataGridView1.Rows[a].Cells["total"].Value.ToString(); - inputExcel[a, 6] = dataGridView1.Rows[a].Cells["flatter"].Value.ToString(); - inputExcel[a, 7] = dataGridView1.Rows[a].Cells["unflatter"].Value.ToString(); - inputExcel[a, 8] = dataGridView1.Rows[a].Cells["state"].Value.ToString(); - inputExcel[a, 9] = dataGridView1.Rows[a].Cells["grade"].Value.ToString(); - inputExcel[a, 10] = dataGridView1.Rows[a].Cells["etc"].Value.ToString(); + inputExcel[a, 3] = dataGridView1.Rows[a].Cells["list_name"].Value.ToString(); + inputExcel[a, 4] = dataGridView1.Rows[a].Cells["charge"].Value.ToString(); + inputExcel[a, 5] = dataGridView1.Rows[a].Cells["work_name"].Value.ToString(); + inputExcel[a, 6] = dataGridView1.Rows[a].Cells["count"].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(); + inputExcel[a, 10] =dataGridView1.Rows[a].Cells["etc"].Value.ToString(); } et.Mk_Excel(Excel_title, inputExcel); } @@ -242,8 +250,8 @@ namespace WindowsFormsApp1.Mac marc.MdiParent = main; marc.WindowState = FormWindowState.Maximized; marc.Show(); - marc.input_list(dataGridView1.Rows[idx_row].Cells[1].Value.ToString(), - dataGridView1.Rows[idx_row].Cells[4].Value.ToString()); + marc.input_list(dataGridView1.Rows[idx_row].Cells["start_date"].Value.ToString(), + dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString()); } if (((DataGridView)sender).Columns[idx_col].Name == "check") { diff --git a/unimarc/unimarc/마크/Mac_List.resx b/unimarc/unimarc/마크/Mac_List.resx index 56402f0..1647749 100644 --- a/unimarc/unimarc/마크/Mac_List.resx +++ b/unimarc/unimarc/마크/Mac_List.resx @@ -126,30 +126,24 @@ True - - True - True - + True - + True - + True - + True True - - True - True diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 950a31d..7a6c553 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -183,9 +183,34 @@ namespace ExcelTest text008.Text = db_data[3]; List_Book.Rows[a].Cells["user"].Value = db_data[4]; List_Book.Rows[a].Cells["SaveDate"].Value = db_data[5]; + + SaveDateCheck(db_data[5], a); } } } + + /// + /// 마지막 저장시각 14일이전일 경우 배경 색 변경 + /// + /// 마지막 저장시각 + /// 해당 행 + private void SaveDateCheck(string Date, int row) + { + DateTime SaveDate = DateTime.ParseExact(Date, "yyyy-MM-dd HH:mm:ss", + System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); + DateTime TargetDate = DateTime.Today.AddDays(-14); + + int result = DateTime.Compare(SaveDate, TargetDate); + + + if (result >= 0) // SaveDate가 같거나 큼 + List_Book.Rows[row].DefaultCellStyle.BackColor = Color.Yellow; + + else // TargetDate가 큼 + List_Book.Rows[row].DefaultCellStyle.BackColor = Color.White; + + } + // TODO: Alt+x 입력 시 "▼78"이 출력됨. 아스키코드의 문제로 보여지나 정확한 원인은 확인불가. + 색상이 파란색으로 고정됨. private void richTextBox1_KeyDown(object sender, KeyEventArgs e) { @@ -417,7 +442,44 @@ namespace ExcelTest break; } } + + if (e.KeyCode == Keys.F9) + SaveGrade(Keys.F9); + else if (e.KeyCode == Keys.F10) + SaveGrade(Keys.F10); + else if (e.KeyCode == Keys.F11) + SaveGrade(Keys.F11); + else if (e.KeyCode == Keys.F12) + SaveGrade(Keys.F12); } + + /// + /// F9~F12로 등급별 세이브 저장 + /// + /// F9~F12 + private void SaveGrade(Keys key) + { + switch (key) + { + case Keys.F9: + cb_grade.SelectedItem = "A"; + Btn_Save_Click(null, null); + break; + case Keys.F10: + cb_grade.SelectedItem = "B"; + Btn_Save_Click(null, null); + break; + case Keys.F11: + cb_grade.SelectedItem = "C"; + Btn_Save_Click(null, null); + break; + case Keys.F12: + cb_grade.SelectedItem = "D"; + Btn_Save_Click(null, null); + break; + } + } + private void etc_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.F8) @@ -670,7 +732,6 @@ namespace ExcelTest } #endregion - private void List_Book_CellClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex == -1) { return; } @@ -711,8 +772,8 @@ namespace ExcelTest } void ReadRemark(int row) { - string[] sear_tbl = { "ISBN" }; - string[] sear_col = { List_Book.Rows[row].Cells["ISBN13"].Value.ToString() }; + string[] sear_tbl = { "idx" }; + string[] sear_col = { List_Book.Rows[row].Cells["marc_idx"].Value.ToString() }; string cmd = db.More_DB_Search("Marc", sear_tbl, sear_col, "`비고1`, `비고2`"); string res = db.DB_Send_CMD_Search(cmd); @@ -1180,7 +1241,6 @@ namespace ExcelTest private void btn_Search_Click(object sender, EventArgs e) { - if (List_Book.RowCount < 0) return; Search_ReSet(); @@ -1190,10 +1250,10 @@ namespace ExcelTest if (isSort) { if (combo == 0) { - List_Book.Sort(List_Book.Columns["grade"], System.ComponentModel.ListSortDirection.Ascending); + List_Book.Sort(grade, System.ComponentModel.ListSortDirection.Ascending); } else { - List_Book.Sort(List_Book.Columns["ISBN13"], System.ComponentModel.ListSortDirection.Ascending); + List_Book.Sort(ISBN13, System.ComponentModel.ListSortDirection.Ascending); } } else { @@ -1221,6 +1281,14 @@ namespace ExcelTest { int count = List_Book.Rows.Count; DataGridViewBand band; + if (text == "0") { + for (int a = 0; a < count; a++) + { + band = List_Book.Rows[a]; + band.Visible = true; + } + return; + } for (int a = 0; a < count; a++) { if (List_Book.Rows[a].Cells[target].Value.ToString() != text) { @@ -1238,7 +1306,7 @@ namespace ExcelTest ComboBox cb = sender as ComboBox; if (cb.SelectedIndex == 0) { comboBox9.Enabled = true; - string[] grade = { "A", "B", "C", "D" }; + string[] grade = { "전체", "A", "B", "C", "D" }; comboBox9.Items.AddRange(grade); comboBox9.SelectedIndex = 0; } @@ -1246,7 +1314,7 @@ namespace ExcelTest comboBox9.Enabled = false; } - private void rb_Sort_CheckedChanged(object sender, EventArgs e) + private void Radio_Sort_CheckedChanged(object sender, EventArgs e) { RadioButton rb = sender as RadioButton; string text = rb.Text; @@ -1257,6 +1325,7 @@ namespace ExcelTest comboBox9.Enabled = true; } + private void btn_mk_marcList_Click(object sender, EventArgs e) { // 회색배경과 V를 체크한 후 @@ -2028,31 +2097,30 @@ namespace ExcelTest string[] aryText = text.Split('\n'); - int count = 0; foreach (string Data in aryText) { - string[] grid = { "", "", "" }; + string[] grid = { count.ToString(), "", "", "" }; string[] dataAry = Data.Split('\t'); if (dataAry.Length < 2) continue; - int AryCount = 0; + int AryCount = 1; foreach (string tt in dataAry) { if (grid.Length <= AryCount) break; grid[AryCount] = tt; AryCount++; } - dataGridView1.Rows.Add(grid); count++; } richTextBox1.Text = ""; - dataGridView1.Sort(dataGridView1.Columns["tag"], System.ComponentModel.ListSortDirection.Ascending); + // dataGridView1.Sort(dataGridView1.Columns["tag"], System.ComponentModel.ListSortDirection.Ascending); + Sort_text(); for (int a = 0; a < dataGridView1.Rows.Count; a++) { @@ -2064,6 +2132,12 @@ namespace ExcelTest } } + private void Sort_text() + { + dataGridView1.Sort(new DGVComparer()); + dataGridView1.Columns[0].HeaderCell.SortGlyphDirection = SortOrder.Ascending; + dataGridView1.Columns[1].HeaderCell.SortGlyphDirection = SortOrder.Ascending; + } private List MakeMarcLine() { @@ -3062,7 +3136,7 @@ namespace ExcelTest } try { - if (invertCheck.Checked == true) + if (invertCheck.Checked) { for (int a = 0; a < invert.Length; a++) { @@ -3080,7 +3154,7 @@ namespace ExcelTest } } } - else if (invertCheck.Checked == false) + else if (!invertCheck.Checked) { for (int a = invert.Length - 1; a >= 0; a--) { @@ -3107,7 +3181,7 @@ namespace ExcelTest basicHeadBox.Text = basicHeadBox.Text.Substring(0, basicHeadBox.Text.Length - 1); } } - catch (Exception ex) + catch { MessageBox.Show("데이터가 올바르지않습니다.\n245d를 확인해주세요."); } @@ -3125,11 +3199,28 @@ namespace ExcelTest string result = strValue + ","; string[] Role = { "글", "그림", "지음", "글·그림", "편", "엮음", "저", "씀" }; string[] gl = { "글.그림", "글그림", "그림글", "그림.글" }; + for (int a = 0; a < gl.Length; a++) { result = result.Replace(gl[a], "글·그림"); } for (int a = 0; a < Role.Length; a++) { result = result.Replace(" " + Role[a] + ",", ""); } return result; } #endregion + + private void GridView_KeyDown(object sender, KeyEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Excel_to_DataGridView(sender, e); + } + + private void btn_FilterReturn_Click(object sender, EventArgs e) + { + rb_Filter.Checked = false; + rb_Sort.Checked = false; + comboBox8.SelectedIndex = 0; + comboBox9.SelectedIndex = 0; + + List_Book.Sort(list_idx, System.ComponentModel.ListSortDirection.Ascending); + } } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index 54121a8..30f8b2b 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -97,6 +97,7 @@ this.comboBox8 = new System.Windows.Forms.ComboBox(); this.comboBox9 = new System.Windows.Forms.ComboBox(); this.panel1 = new System.Windows.Forms.Panel(); + this.btn_FilterReturn = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); this.btn_mk_marcList = new System.Windows.Forms.Button(); this.btn_Search = new System.Windows.Forms.Button(); @@ -244,6 +245,7 @@ this.text507a = new System.Windows.Forms.TextBox(); this.text250a = new System.Windows.Forms.TextBox(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.turnNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tag = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.jisi = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.MarcValue = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -695,12 +697,14 @@ this.user.HeaderText = "작업자"; this.user.Name = "user"; this.user.ReadOnly = true; + this.user.Visible = false; // // SaveDate // this.SaveDate.HeaderText = "저장시각"; this.SaveDate.Name = "SaveDate"; this.SaveDate.ReadOnly = true; + this.SaveDate.Visible = false; // // btn_Save // @@ -829,32 +833,32 @@ // rb_Sort // this.rb_Sort.AutoSize = true; - this.rb_Sort.Location = new System.Drawing.Point(10, 8); + this.rb_Sort.Location = new System.Drawing.Point(76, 8); this.rb_Sort.Name = "rb_Sort"; this.rb_Sort.Size = new System.Drawing.Size(47, 16); this.rb_Sort.TabIndex = 224; this.rb_Sort.TabStop = true; this.rb_Sort.Text = "정렬"; this.rb_Sort.UseVisualStyleBackColor = true; - this.rb_Sort.CheckedChanged += new System.EventHandler(this.rb_Sort_CheckedChanged); + this.rb_Sort.CheckedChanged += new System.EventHandler(this.Radio_Sort_CheckedChanged); // // rb_Filter // this.rb_Filter.AutoSize = true; - this.rb_Filter.Location = new System.Drawing.Point(57, 8); + this.rb_Filter.Location = new System.Drawing.Point(123, 8); this.rb_Filter.Name = "rb_Filter"; this.rb_Filter.Size = new System.Drawing.Size(47, 16); this.rb_Filter.TabIndex = 224; this.rb_Filter.TabStop = true; this.rb_Filter.Text = "필터"; this.rb_Filter.UseVisualStyleBackColor = true; - this.rb_Filter.CheckedChanged += new System.EventHandler(this.rb_Sort_CheckedChanged); + this.rb_Filter.CheckedChanged += new System.EventHandler(this.Radio_Sort_CheckedChanged); // // comboBox8 // this.comboBox8.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox8.FormattingEnabled = true; - this.comboBox8.Location = new System.Drawing.Point(115, 6); + this.comboBox8.Location = new System.Drawing.Point(176, 6); this.comboBox8.Name = "comboBox8"; this.comboBox8.Size = new System.Drawing.Size(79, 20); this.comboBox8.TabIndex = 225; @@ -864,15 +868,16 @@ // this.comboBox9.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox9.FormattingEnabled = true; - this.comboBox9.Location = new System.Drawing.Point(200, 6); + this.comboBox9.Location = new System.Drawing.Point(257, 6); this.comboBox9.Name = "comboBox9"; - this.comboBox9.Size = new System.Drawing.Size(79, 20); + this.comboBox9.Size = new System.Drawing.Size(52, 20); this.comboBox9.TabIndex = 225; // // panel1 // this.panel1.BackColor = System.Drawing.Color.Silver; this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.btn_FilterReturn); this.panel1.Controls.Add(this.panel2); this.panel1.Controls.Add(this.btn_Search); this.panel1.Controls.Add(this.rb_Sort); @@ -881,14 +886,24 @@ this.panel1.Controls.Add(this.comboBox8); this.panel1.Location = new System.Drawing.Point(12, 37); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(476, 35); + this.panel1.Size = new System.Drawing.Size(502, 35); this.panel1.TabIndex = 226; // + // btn_FilterReturn + // + this.btn_FilterReturn.Location = new System.Drawing.Point(8, 5); + this.btn_FilterReturn.Name = "btn_FilterReturn"; + this.btn_FilterReturn.Size = new System.Drawing.Size(63, 23); + this.btn_FilterReturn.TabIndex = 229; + this.btn_FilterReturn.Text = "원래대로"; + this.btn_FilterReturn.UseVisualStyleBackColor = true; + this.btn_FilterReturn.Click += new System.EventHandler(this.btn_FilterReturn_Click); + // // panel2 // this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel2.Controls.Add(this.btn_mk_marcList); - this.panel2.Location = new System.Drawing.Point(377, -1); + this.panel2.Location = new System.Drawing.Point(404, -1); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(98, 35); this.panel2.TabIndex = 228; @@ -905,7 +920,7 @@ // // btn_Search // - this.btn_Search.Location = new System.Drawing.Point(293, 5); + this.btn_Search.Location = new System.Drawing.Point(319, 5); this.btn_Search.Name = "btn_Search"; this.btn_Search.Size = new System.Drawing.Size(79, 23); this.btn_Search.TabIndex = 227; @@ -919,7 +934,7 @@ this.checkBox3.BackColor = System.Drawing.Color.White; this.checkBox3.Checked = true; this.checkBox3.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox3.Location = new System.Drawing.Point(475, 83); + this.checkBox3.Location = new System.Drawing.Point(474, 83); this.checkBox3.Name = "checkBox3"; this.checkBox3.Size = new System.Drawing.Size(15, 14); this.checkBox3.TabIndex = 227; @@ -1065,6 +1080,7 @@ this.GridView020.RowTemplate.Height = 23; this.GridView020.Size = new System.Drawing.Size(408, 80); this.GridView020.TabIndex = 244; + this.GridView020.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GridView_KeyDown); // // CheckSet // @@ -1132,6 +1148,7 @@ this.GridView505.RowTemplate.Height = 23; this.GridView505.Size = new System.Drawing.Size(401, 71); this.GridView505.TabIndex = 246; + this.GridView505.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GridView_KeyDown); // // text505n // @@ -1283,6 +1300,7 @@ this.GridView246.RowTemplate.Height = 23; this.GridView246.Size = new System.Drawing.Size(493, 138); this.GridView246.TabIndex = 250; + this.GridView246.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GridView_KeyDown); // // Text246Jisi // @@ -1451,6 +1469,7 @@ this.GridView440.RowTemplate.Height = 23; this.GridView440.Size = new System.Drawing.Size(597, 71); this.GridView440.TabIndex = 245; + this.GridView440.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GridView_KeyDown); // // text440a // @@ -1564,6 +1583,7 @@ this.GridView490.RowTemplate.Height = 23; this.GridView490.Size = new System.Drawing.Size(321, 71); this.GridView490.TabIndex = 247; + this.GridView490.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GridView_KeyDown); // // text490a // @@ -2421,6 +2441,7 @@ this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.turnNum, this.tag, this.jisi, this.MarcValue}); @@ -2428,9 +2449,15 @@ this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(287, 79); + this.dataGridView1.Size = new System.Drawing.Size(287, 168); this.dataGridView1.TabIndex = 317; // + // turnNum + // + this.turnNum.HeaderText = "순서"; + this.turnNum.Name = "turnNum"; + this.turnNum.Width = 60; + // // tag // this.tag.HeaderText = "tag"; @@ -2485,7 +2512,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Gray; - this.ClientSize = new System.Drawing.Size(1759, 929); + this.ClientSize = new System.Drawing.Size(1759, 914); this.Controls.Add(this.lbl_BookList); this.Controls.Add(this.lbl_ISBN); this.Controls.Add(this.lbl_SaveData); @@ -2769,6 +2796,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Text020g; private System.Windows.Forms.DataGridViewTextBoxColumn Text020c; private System.Windows.Forms.Label lbl_SaveData; + private System.Windows.Forms.Button Btn_interlock; + private System.Windows.Forms.Label lbl_ISBN; + private System.Windows.Forms.Label lbl_BookList; private System.Windows.Forms.DataGridViewTextBoxColumn list_idx; private System.Windows.Forms.DataGridViewTextBoxColumn ISBN13; private System.Windows.Forms.DataGridViewTextBoxColumn num; @@ -2784,9 +2814,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn user; private System.Windows.Forms.DataGridViewTextBoxColumn SaveDate; - private System.Windows.Forms.Button Btn_interlock; - private System.Windows.Forms.Label lbl_ISBN; - private System.Windows.Forms.Label lbl_BookList; + private System.Windows.Forms.Button btn_FilterReturn; + private System.Windows.Forms.DataGridViewTextBoxColumn turnNum; private System.Windows.Forms.DataGridViewTextBoxColumn tag; private System.Windows.Forms.DataGridViewTextBoxColumn jisi; private System.Windows.Forms.DataGridViewTextBoxColumn MarcValue; diff --git a/unimarc/unimarc/마크/Marc.resx b/unimarc/unimarc/마크/Marc.resx index d8510f9..e44cd20 100644 --- a/unimarc/unimarc/마크/Marc.resx +++ b/unimarc/unimarc/마크/Marc.resx @@ -267,6 +267,9 @@ True + + True + True diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs index b268979..addb342 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs @@ -30,6 +30,7 @@ namespace UniMarc.마크 private void InitializeComponent() { this.panel1 = new System.Windows.Forms.Panel(); + this.lbl_SaveData = new System.Windows.Forms.Label(); this.lbl_ClassSymbol = new System.Windows.Forms.Label(); this.lbl_AuthorSymbol = new System.Windows.Forms.Label(); this.btn_Close = new System.Windows.Forms.Button(); @@ -85,7 +86,9 @@ namespace UniMarc.마크 this.label9 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.lbl_SaveData = new System.Windows.Forms.Label(); + this.etcBox1 = new System.Windows.Forms.RichTextBox(); + this.etcBox2 = new System.Windows.Forms.RichTextBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel1.SuspendLayout(); this.panel5.SuspendLayout(); this.panel6.SuspendLayout(); @@ -93,6 +96,7 @@ namespace UniMarc.마크 ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel2.SuspendLayout(); this.panel4.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panel1 @@ -111,9 +115,20 @@ namespace UniMarc.마크 this.panel1.Controls.Add(this.btn_Back); this.panel1.Location = new System.Drawing.Point(13, 12); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1040, 212); + this.panel1.Size = new System.Drawing.Size(1087, 212); this.panel1.TabIndex = 0; // + // lbl_SaveData + // + this.lbl_SaveData.AutoSize = true; + this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbl_SaveData.ForeColor = System.Drawing.SystemColors.ControlText; + this.lbl_SaveData.Location = new System.Drawing.Point(188, 156); + this.lbl_SaveData.Name = "lbl_SaveData"; + this.lbl_SaveData.Size = new System.Drawing.Size(64, 19); + this.lbl_SaveData.TabIndex = 319; + this.lbl_SaveData.Text = "[] []"; + // // lbl_ClassSymbol // this.lbl_ClassSymbol.AutoSize = true; @@ -141,7 +156,7 @@ namespace UniMarc.마크 // btn_Close // this.btn_Close.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btn_Close.Location = new System.Drawing.Point(920, 155); + this.btn_Close.Location = new System.Drawing.Point(966, 60); this.btn_Close.Name = "btn_Close"; this.btn_Close.Size = new System.Drawing.Size(115, 51); this.btn_Close.TabIndex = 4; @@ -405,7 +420,7 @@ namespace UniMarc.마크 // btn_Save // this.btn_Save.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btn_Save.Location = new System.Drawing.Point(799, 156); + this.btn_Save.Location = new System.Drawing.Point(845, 60); this.btn_Save.Name = "btn_Save"; this.btn_Save.Size = new System.Drawing.Size(115, 51); this.btn_Save.TabIndex = 4; @@ -562,7 +577,7 @@ namespace UniMarc.마크 // btn_Front // this.btn_Front.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btn_Front.Location = new System.Drawing.Point(920, 58); + this.btn_Front.Location = new System.Drawing.Point(966, 3); this.btn_Front.Name = "btn_Front"; this.btn_Front.Size = new System.Drawing.Size(115, 51); this.btn_Front.TabIndex = 4; @@ -573,7 +588,7 @@ namespace UniMarc.마크 // btn_Back // this.btn_Back.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btn_Back.Location = new System.Drawing.Point(920, 2); + this.btn_Back.Location = new System.Drawing.Point(845, 3); this.btn_Back.Name = "btn_Back"; this.btn_Back.Size = new System.Drawing.Size(115, 51); this.btn_Back.TabIndex = 4; @@ -589,7 +604,7 @@ namespace UniMarc.마크 this.richTextBox1.Font = new System.Drawing.Font("굴림체", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1038, 456); + this.richTextBox1.Size = new System.Drawing.Size(838, 456); this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); @@ -600,7 +615,7 @@ namespace UniMarc.마크 this.panel2.Controls.Add(this.richTextBox1); this.panel2.Location = new System.Drawing.Point(13, 266); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1040, 458); + this.panel2.Size = new System.Drawing.Size(840, 458); this.panel2.TabIndex = 2; // // panel4 @@ -616,7 +631,7 @@ namespace UniMarc.마크 this.panel4.Controls.Add(this.label4); this.panel4.Location = new System.Drawing.Point(13, 230); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(1040, 30); + this.panel4.Size = new System.Drawing.Size(1087, 30); this.panel4.TabIndex = 246; // // text008 @@ -684,22 +699,47 @@ namespace UniMarc.마크 this.label4.TabIndex = 206; this.label4.Text = "008"; // - // lbl_SaveData + // etcBox1 // - this.lbl_SaveData.AutoSize = true; - this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_SaveData.ForeColor = System.Drawing.SystemColors.ControlText; - this.lbl_SaveData.Location = new System.Drawing.Point(188, 156); - this.lbl_SaveData.Name = "lbl_SaveData"; - this.lbl_SaveData.Size = new System.Drawing.Size(64, 19); - this.lbl_SaveData.TabIndex = 319; - this.lbl_SaveData.Text = "[] []"; + this.etcBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.etcBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.etcBox1.Location = new System.Drawing.Point(4, 4); + this.etcBox1.Name = "etcBox1"; + this.etcBox1.Size = new System.Drawing.Size(228, 218); + this.etcBox1.TabIndex = 0; + this.etcBox1.Text = ""; + // + // etcBox2 + // + this.etcBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.etcBox2.Dock = System.Windows.Forms.DockStyle.Fill; + this.etcBox2.Location = new System.Drawing.Point(4, 229); + this.etcBox2.Name = "etcBox2"; + this.etcBox2.Size = new System.Drawing.Size(228, 223); + this.etcBox2.TabIndex = 0; + this.etcBox2.Text = ""; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.etcBox2, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.etcBox1, 0, 0); + this.tableLayoutPanel1.Location = new System.Drawing.Point(859, 267); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 229F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(236, 456); + this.tableLayoutPanel1.TabIndex = 0; // // Marc_Plan_Sub_MarcEdit // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1065, 736); + this.ClientSize = new System.Drawing.Size(1109, 736); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panel4); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -718,6 +758,7 @@ namespace UniMarc.마크 this.panel2.ResumeLayout(false); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -781,5 +822,8 @@ namespace UniMarc.마크 private System.Windows.Forms.Label lbl_AuthorSymbol; public System.Windows.Forms.Button btn_EditNum; private System.Windows.Forms.Label lbl_SaveData; + private System.Windows.Forms.RichTextBox etcBox2; + private System.Windows.Forms.RichTextBox etcBox1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs index eff6884..6147417 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs @@ -72,28 +72,38 @@ namespace UniMarc.마크 input_picture(Marc[4]); - SetEditData(); + SetHistory(); } - public void SetEditData() + /// + /// 작성자, 작성시각 표출해주는 함수. + /// (22.02.07 추가) 비고1, 비고2 추가로 표출 + /// + public void SetHistory() { if (mp != null) { - string cmd = string.Format("SELECT `user`, `editDate` FROM `Specs_Marc` WHERE `idx` = \"{0}\"", idx); + string cmd = string.Format("SELECT `user`, `editDate`, `etc1`, `etc2` FROM `Specs_Marc` WHERE `idx` = \"{0}\"", idx); string res = db.DB_Send_CMD_Search(cmd); string[] aryResultData = res.Split('|'); - if (aryResultData.Length > 1) + if (aryResultData.Length > 1) { lbl_SaveData.Text = string.Format("[{0}] [{1}]", aryResultData[0], aryResultData[1]); + etcBox1.Text = aryResultData[2]; + etcBox2.Text = aryResultData[3]; + } } else if (si != null) { - string cmd = string.Format("SELECT `user`, `date` FROM `Marc` WHERE `idx` = \"{0}\"", tb_Mcode.Text); + string cmd = string.Format("SELECT `user`, `date`, `비고1`, `비고2` FROM `Marc` WHERE `idx` = \"{0}\"", tb_Mcode.Text); string res = db.DB_Send_CMD_Search(cmd); string[] aryResultData = res.Split('|'); - if (aryResultData.Length > 1) + if (aryResultData.Length > 1) { lbl_SaveData.Text = string.Format("[{0}] [{1}]", aryResultData[0], aryResultData[1]); + etcBox1.Text = aryResultData[2]; + etcBox2.Text = aryResultData[3]; + } } } diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs index c22c28e..f563cd1 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs @@ -42,12 +42,18 @@ namespace UniMarc.마크 this.btn_Delete = new System.Windows.Forms.Button(); this.btn_Close = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.btn_Morge = new System.Windows.Forms.Button(); this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.user = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.panel2.SuspendLayout(); + this.panel3.SuspendLayout(); this.SuspendLayout(); // // panel1 @@ -58,7 +64,7 @@ namespace UniMarc.마크 this.panel1.Controls.Add(this.cb_gu); this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.label1); - this.panel1.Location = new System.Drawing.Point(3, 2); + this.panel1.Location = new System.Drawing.Point(2, 2); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(353, 27); this.panel1.TabIndex = 0; @@ -102,7 +108,7 @@ namespace UniMarc.마크 // // btn_Search // - this.btn_Search.Location = new System.Drawing.Point(359, 2); + this.btn_Search.Location = new System.Drawing.Point(358, 2); this.btn_Search.Name = "btn_Search"; this.btn_Search.Size = new System.Drawing.Size(61, 27); this.btn_Search.TabIndex = 1; @@ -112,7 +118,7 @@ namespace UniMarc.마크 // // btn_Complite // - this.btn_Complite.Location = new System.Drawing.Point(422, 2); + this.btn_Complite.Location = new System.Drawing.Point(421, 2); this.btn_Complite.Name = "btn_Complite"; this.btn_Complite.Size = new System.Drawing.Size(61, 27); this.btn_Complite.TabIndex = 1; @@ -122,7 +128,7 @@ namespace UniMarc.마크 // // btn_Progress // - this.btn_Progress.Location = new System.Drawing.Point(483, 2); + this.btn_Progress.Location = new System.Drawing.Point(482, 2); this.btn_Progress.Name = "btn_Progress"; this.btn_Progress.Size = new System.Drawing.Size(61, 27); this.btn_Progress.TabIndex = 1; @@ -132,7 +138,7 @@ namespace UniMarc.마크 // // btn_Edit // - this.btn_Edit.Location = new System.Drawing.Point(546, 2); + this.btn_Edit.Location = new System.Drawing.Point(543, 2); this.btn_Edit.Name = "btn_Edit"; this.btn_Edit.Size = new System.Drawing.Size(61, 27); this.btn_Edit.TabIndex = 1; @@ -142,7 +148,7 @@ namespace UniMarc.마크 // // btn_Delete // - this.btn_Delete.Location = new System.Drawing.Point(607, 2); + this.btn_Delete.Location = new System.Drawing.Point(665, 2); this.btn_Delete.Name = "btn_Delete"; this.btn_Delete.Size = new System.Drawing.Size(61, 27); this.btn_Delete.TabIndex = 1; @@ -152,7 +158,7 @@ namespace UniMarc.마크 // // btn_Close // - this.btn_Close.Location = new System.Drawing.Point(670, 2); + this.btn_Close.Location = new System.Drawing.Point(726, 2); this.btn_Close.Name = "btn_Close"; this.btn_Close.Size = new System.Drawing.Size(61, 27); this.btn_Close.TabIndex = 1; @@ -178,16 +184,55 @@ namespace UniMarc.마크 this.idx, this.list_name, this.date, + this.user, this.colCheck}); - this.dataGridView1.Location = new System.Drawing.Point(3, 34); + this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView1.Location = new System.Drawing.Point(0, 0); + this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView1.Size = new System.Drawing.Size(728, 305); + this.dataGridView1.Size = new System.Drawing.Size(806, 324); this.dataGridView1.TabIndex = 2; this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.panel1); + this.panel2.Controls.Add(this.btn_Search); + this.panel2.Controls.Add(this.btn_Morge); + this.panel2.Controls.Add(this.btn_Close); + this.panel2.Controls.Add(this.btn_Complite); + this.panel2.Controls.Add(this.btn_Delete); + this.panel2.Controls.Add(this.btn_Progress); + this.panel2.Controls.Add(this.btn_Edit); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(806, 33); + this.panel2.TabIndex = 3; + // + // panel3 + // + this.panel3.Controls.Add(this.dataGridView1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 33); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(806, 324); + this.panel3.TabIndex = 4; + // + // btn_Morge + // + this.btn_Morge.Location = new System.Drawing.Point(604, 2); + this.btn_Morge.Name = "btn_Morge"; + this.btn_Morge.Size = new System.Drawing.Size(61, 27); + this.btn_Morge.TabIndex = 1; + this.btn_Morge.Text = "병 합"; + this.btn_Morge.UseVisualStyleBackColor = true; + this.btn_Morge.Click += new System.EventHandler(this.btn_Morge_Click); + // // idx // this.idx.HeaderText = "idx"; @@ -206,6 +251,12 @@ namespace UniMarc.마크 this.date.Name = "date"; this.date.Width = 130; // + // user + // + this.user.HeaderText = "등록자"; + this.user.Name = "user"; + this.user.Width = 80; + // // colCheck // this.colCheck.FalseValue = "F"; @@ -221,21 +272,17 @@ namespace UniMarc.마크 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 341); - this.Controls.Add(this.dataGridView1); - this.Controls.Add(this.btn_Close); - this.Controls.Add(this.btn_Delete); - this.Controls.Add(this.btn_Edit); - this.Controls.Add(this.btn_Progress); - this.Controls.Add(this.btn_Complite); - this.Controls.Add(this.btn_Search); - this.Controls.Add(this.panel1); + this.ClientSize = new System.Drawing.Size(806, 357); + this.Controls.Add(this.panel3); + this.Controls.Add(this.panel2); this.Name = "Marc_Plan_Sub_SelectList"; this.Text = "마크정리_목록선택"; this.Load += new System.EventHandler(this.Marc_Plan_Sub_SelectList_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.panel2.ResumeLayout(false); + this.panel3.ResumeLayout(false); this.ResumeLayout(false); } @@ -253,10 +300,14 @@ namespace UniMarc.마크 private System.Windows.Forms.Button btn_Delete; private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.DataGridView dataGridView1; + public System.Windows.Forms.Button btn_Search; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Button btn_Morge; private System.Windows.Forms.DataGridViewTextBoxColumn idx; private System.Windows.Forms.DataGridViewTextBoxColumn list_name; private System.Windows.Forms.DataGridViewTextBoxColumn date; + private System.Windows.Forms.DataGridViewTextBoxColumn user; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; - public System.Windows.Forms.Button btn_Search; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs index 8559ee7..63e5658 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs @@ -34,6 +34,7 @@ namespace UniMarc.마크 dataGridView1.Columns["list_name"].ReadOnly = true; dataGridView1.Columns["date"].ReadOnly = true; + dataGridView1.Columns["user"].ReadOnly = true; // btn_Search_Click(null, e); } @@ -60,7 +61,7 @@ namespace UniMarc.마크 string gu = cb_gu.Text; // 검색 필터 string text = tb_Search.Text; // 검색어 DB LIKE 검색 - string Area = "`idx`, `work_list`, `date`"; + string Area = "`idx`, `work_list`, `date`, `user`"; string cmd = string.Format("SELECT {0} FROM `Specs_List` WHERE `compidx` = {1} AND `state` = \"{2}\" AND `work_list` LIKE \"%{3}%\"", Area, compidx, gu, text); @@ -72,13 +73,14 @@ namespace UniMarc.마크 #region Search_Sub private void Input_Grid(string[] ary) { - string[] grid = { "", "", "", "F" }; + string[] grid = { "", "", "", "", "F" }; for(int a = 0; a < ary.Length; a++) { - if (a % 3 == 0) grid[0] = ary[a]; - if (a % 3 == 1) grid[1] = ary[a]; - if (a % 3 == 2) { - grid[2] = ary[a]; + if (a % 4 == 0) grid[0] = ary[a]; + if (a % 4 == 1) grid[1] = ary[a]; + if (a % 4 == 2) grid[2] = ary[a]; + if (a % 4 == 3) { + grid[3] = ary[a]; dataGridView1.Rows.Add(grid); } } @@ -88,10 +90,17 @@ namespace UniMarc.마크 private void Change_State(object sender, EventArgs e) // 완료, 진행처리 { string name = ((Button)sender).Text; - int row = dataGridView1.CurrentRow.Index; + int[] CheckRow = CheckIndex(); - string msg = string.Format("【{0}】을(를) 완료처리 하시겠습니까?", dataGridView1.Rows[row].Cells["list_name"].Value.ToString()); - if (MessageBox.Show(msg, "완료처리", MessageBoxButtons.OKCancel) == DialogResult.Cancel) + if (CheckRow.Length != 1) { + MessageBox.Show("처리할 목록 [1]개 선택하여 주세요."); + return; + } + + int row = CheckRow[0]; + + string msg = string.Format("【{0}】을(를) {1} 하시겠습니까?", dataGridView1.Rows[row].Cells["list_name"].Value.ToString(), name); + if (MessageBox.Show(msg, name, MessageBoxButtons.OKCancel) == DialogResult.Cancel) return; string[] search_col = { "idx", "work_list", "date" }; @@ -115,7 +124,14 @@ namespace UniMarc.마크 private void btn_Edit_Click(object sender, EventArgs e) // 편집 (V 확인필요) { - int row = dataGridView1.CurrentRow.Index; + int[] CheckRow = CheckIndex(); + + if (CheckRow.Length != 1) { + MessageBox.Show("수정할 목록 [1]개 선택하여 주세요."); + return; + } + + int row = CheckRow[0]; Marc_Plan_Sub_SelectList_Edit edit = new Marc_Plan_Sub_SelectList_Edit(this); edit.TopMost = true; @@ -124,10 +140,44 @@ namespace UniMarc.마크 edit.TextBoxSetting(dataGridView1.Rows[row].Cells["list_name"].Value.ToString()); } + private void btn_Morge_Click(object sender, EventArgs e) // 병합 (V 확인필요) + { + int[] CheckRow = CheckIndex(); + + if (CheckRow.Length < 2) { + MessageBox.Show("병합할 목록 [2]개이상 선택하여 주세요."); + return; + } + + List ListIndex = new List(); + List ListName = new List(); + List ListDate = new List(); + List ListUser = new List(); + + foreach (int row in CheckRow) + { + ListIndex.Add(dataGridView1.Rows[row].Cells["idx"].Value.ToString()); + ListName.Add(dataGridView1.Rows[row].Cells["list_name"].Value.ToString()); + ListDate.Add(dataGridView1.Rows[row].Cells["date"].Value.ToString()); + ListUser.Add(dataGridView1.Rows[row].Cells["user"].Value.ToString()); + } + + Marc_Plan_Sub_SelectList_Morge morge = new Marc_Plan_Sub_SelectList_Morge(); + morge.Init(ListIndex, ListName, ListDate, ListUser); + morge.TopMost = true; + morge.Show(); + } + private void btn_Delete_Click(object sender, EventArgs e) // 삭제 (V 확인필요) { - int row = dataGridView1.CurrentRow.Index; + int[] CheckRow = CheckIndex(); + if (CheckRow.Length != 1) { + MessageBox.Show("삭제할 목록 [1]개 선택하여 주세요."); + return; + } + + int row = CheckRow[0]; string msg = string.Format("【{0}】을(를) 삭제하시겠습니까?", dataGridView1.Rows[row].Cells["list_name"].Value.ToString()); if (MessageBox.Show(msg, "삭제하시겠습니까?", MessageBoxButtons.YesNo) == DialogResult.No) @@ -147,6 +197,27 @@ namespace UniMarc.마크 db.DB_Send_CMD_reVoid(cmd); } + #region ButtonSub + /// + /// colCheck에 체크가 된 RowIndex값을 가져옴 + /// + /// + private int[] CheckIndex() + { + List CheckRow = new List(); + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["colCheck"].Value == null) + continue; + + if (dataGridView1.Rows[a].Cells["colCheck"].Value.ToString().IndexOf("T") > -1) + CheckRow.Add(a); + } + + return CheckRow.ToArray(); + } + #endregion + private void btn_Close_Click(object sender, EventArgs e) { this.Close(); @@ -168,12 +239,19 @@ namespace UniMarc.마크 private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - int row = dataGridView1.CurrentRow.Index; + int col = e.ColumnIndex; + int row = e.RowIndex; + + if (dataGridView1.Columns[col].Name == "colCheck") + return; + string idx = dataGridView1.Rows[row].Cells["idx"].Value.ToString(); string list_name = dataGridView1.Rows[row].Cells["list_name"].Value.ToString(); string date = dataGridView1.Rows[row].Cells["date"].Value.ToString(); + mp.mk_Grid(list_name, date); mp.mk_Panel(idx, list_name, date); + this.Close(); } } diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx index ec64978..6233b75 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx @@ -126,6 +126,9 @@ True + + True + True diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.Designer.cs new file mode 100644 index 0000000..0b26848 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.Designer.cs @@ -0,0 +1,156 @@ + +namespace UniMarc.마크 +{ + partial class Marc_Plan_Sub_SelectList_Morge + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.tb_ListName = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.btn_Morge = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ListName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ListDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ListUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView1 + // + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AllowUserToDeleteRows = false; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.idx, + this.ListName, + this.ListDate, + this.ListUser}); + this.dataGridView1.Location = new System.Drawing.Point(12, 12); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.ReadOnly = true; + this.dataGridView1.RowHeadersWidth = 31; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(550, 150); + this.dataGridView1.TabIndex = 0; + this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); + // + // tb_ListName + // + this.tb_ListName.Location = new System.Drawing.Point(95, 165); + this.tb_ListName.Name = "tb_ListName"; + this.tb_ListName.Size = new System.Drawing.Size(294, 21); + this.tb_ListName.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 169); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(81, 12); + this.label1.TabIndex = 2; + this.label1.Text = "변경할 목록명"; + // + // btn_Morge + // + this.btn_Morge.Location = new System.Drawing.Point(406, 164); + this.btn_Morge.Name = "btn_Morge"; + this.btn_Morge.Size = new System.Drawing.Size(75, 23); + this.btn_Morge.TabIndex = 3; + this.btn_Morge.Text = "병 합"; + this.btn_Morge.UseVisualStyleBackColor = true; + this.btn_Morge.Click += new System.EventHandler(this.btn_Morge_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(487, 164); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(75, 23); + this.btn_Close.TabIndex = 3; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.ReadOnly = true; + this.idx.Visible = false; + // + // ListName + // + this.ListName.HeaderText = "목록명"; + this.ListName.Name = "ListName"; + this.ListName.ReadOnly = true; + this.ListName.Width = 250; + // + // ListDate + // + this.ListDate.HeaderText = "목록일자"; + this.ListDate.Name = "ListDate"; + this.ListDate.ReadOnly = true; + this.ListDate.Width = 150; + // + // ListUser + // + this.ListUser.HeaderText = "등록자"; + this.ListUser.Name = "ListUser"; + this.ListUser.ReadOnly = true; + // + // Marc_Plan_Sub_SelectList_Morge + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(576, 194); + this.Controls.Add(this.btn_Close); + this.Controls.Add(this.btn_Morge); + this.Controls.Add(this.label1); + this.Controls.Add(this.tb_ListName); + this.Controls.Add(this.dataGridView1); + this.Name = "Marc_Plan_Sub_SelectList_Morge"; + this.Text = "마크 목록 병합"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.TextBox tb_ListName; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btn_Morge; + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.DataGridViewTextBoxColumn idx; + private System.Windows.Forms.DataGridViewTextBoxColumn ListName; + private System.Windows.Forms.DataGridViewTextBoxColumn ListDate; + private System.Windows.Forms.DataGridViewTextBoxColumn ListUser; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs new file mode 100644 index 0000000..b97b6bf --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using WindowsFormsApp1; + +namespace UniMarc.마크 +{ + public partial class Marc_Plan_Sub_SelectList_Morge : Form + { + Helper_DB db = new Helper_DB(); + public Marc_Plan_Sub_SelectList_Morge() + { + InitializeComponent(); + } + + public void Init(List ListIdx, List ListName, ListListDate, List ListUser) + { + string[] idx = ListIdx.ToArray(); + string[] Name = ListName.ToArray(); + string[] Date = ListDate.ToArray(); + string[] User = ListUser.ToArray(); + + Init(idx, Name, Date, User); + } + + private void Init(string[] Aryidx, string[] AryName, string[] AryDate, string[] AryUser) + { + db.DBcon(); + + int idxLength = Aryidx.Length; + int NameLength = AryName.Length; + int DateLength = AryDate.Length; + int UserLength = AryUser.Length; + + // 받은 배열의 길이가 맞지않을경우 리턴 + if (NameLength != DateLength || NameLength != UserLength || DateLength != UserLength) + return; + + for (int a = 0; a < NameLength; a++) + { + string[] Grid = { Aryidx[a], AryName[a], AryDate[a], AryUser[a] }; + dataGridView1.Rows.Add(Grid); + } + } + + private void btn_Morge_Click(object sender, EventArgs e) + { + if (tb_ListName.Text == "") { + MessageBox.Show("저장될 목록명이 비어있습니다.", "Error"); + return; + } + string MorgeUser = Properties.Settings.Default.User; + string Compidx = Properties.Settings.Default.compidx; + string NowDate = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss"); + + string[] Search_Col = { "idx" }; + string[] Search_Data = { dataGridView1.Rows[0].Cells["idx"].Value.ToString() }; + string[] Update_Col = { "work_list", "date", "user" }; + string[] Update_Data = { tb_ListName.Text, NowDate, MorgeUser }; + + string U_cmd = db.More_Update("Specs_List", Update_Col, Update_Data, Search_Col, Search_Data); + db.DB_Send_CMD_reVoid(U_cmd); + + // 마크 수정 + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + string[] Col = { + "work_list", "date" + }; + string[] Data = { + dataGridView1.Rows[a].Cells["ListName"].Value.ToString(), + dataGridView1.Rows[a].Cells["ListDate"].Value.ToString() + }; + + string cmd = db.More_Update("Specs_Marc", Update_Col, Update_Data, Col, Data); + db.DB_Send_CMD_reVoid(cmd); + + if (a != 0) { + string listIdx = dataGridView1.Rows[a].Cells["idx"].Value.ToString(); + string listDate = dataGridView1.Rows[a].Cells["ListDate"].Value.ToString(); + string D_cmd = db.DB_Delete("Specs_List", "idx", listIdx, "date", listDate); + db.DB_Send_CMD_reVoid(D_cmd); + } + } + } + + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } + + } +} diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.resx b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.resx new file mode 100644 index 0000000..446f55e --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/unimarc/unimarc/홈/Transaction_manage.Designer.cs b/unimarc/unimarc/홈/Transaction_manage.Designer.cs index 74e3fd0..cb9f14c 100644 --- a/unimarc/unimarc/홈/Transaction_manage.Designer.cs +++ b/unimarc/unimarc/홈/Transaction_manage.Designer.cs @@ -28,14 +28,14 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = 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(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.NameLabel = new System.Windows.Forms.Label(); this.tb_sangho = new System.Windows.Forms.TextBox(); this.tb_addr = new System.Windows.Forms.TextBox(); @@ -55,6 +55,28 @@ this.cb_gubun2 = new System.Windows.Forms.ComboBox(); this.rtb_etc = new System.Windows.Forms.RichTextBox(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sangho = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.gubun = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.boss = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bubin = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.uptae = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.jongmok = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tel = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.fax = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.mail = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.man = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.mantel = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.assumer = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.post_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.addr = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dlsArea = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DLSid = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DLSpw = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.division = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.label = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.program = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bigo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tb_man1 = new System.Windows.Forms.TextBox(); this.btn_search = new System.Windows.Forms.Button(); this.tb_id = new System.Windows.Forms.TextBox(); @@ -84,6 +106,8 @@ this.cb_gubun1 = new System.Windows.Forms.ComboBox(); this.btn_marc_expand = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); + this.cb_dlsArea = new System.Windows.Forms.ComboBox(); + this.label18 = new System.Windows.Forms.Label(); this.marcGrid = new System.Windows.Forms.DataGridView(); this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -97,41 +121,23 @@ this.tb_marcEmpty = new System.Windows.Forms.Button(); this.tb_gearEmpty = new System.Windows.Forms.Button(); this.tb_marcSave = new System.Windows.Forms.Button(); - this.cb_dlsArea = new System.Windows.Forms.ComboBox(); - this.label18 = new System.Windows.Forms.Label(); - this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.sangho = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.gubun = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.boss = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bubin = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.uptae = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.jongmok = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.tel = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.fax = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.mail = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.man = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.mantel = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.assumer = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.post_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.addr = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dlsArea = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.DLSid = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.DLSpw = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.division = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.label = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.program = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bigo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.panel4 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gearGrid)).BeginInit(); + this.panel2.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); this.SuspendLayout(); // // NameLabel // this.NameLabel.AutoSize = true; this.NameLabel.ForeColor = System.Drawing.SystemColors.ControlText; - this.NameLabel.Location = new System.Drawing.Point(28, 16); + this.NameLabel.Location = new System.Drawing.Point(31, 10); this.NameLabel.Name = "NameLabel"; this.NameLabel.Size = new System.Drawing.Size(41, 12); this.NameLabel.TabIndex = 0; @@ -139,7 +145,7 @@ // // tb_sangho // - this.tb_sangho.Location = new System.Drawing.Point(71, 12); + this.tb_sangho.Location = new System.Drawing.Point(74, 6); this.tb_sangho.Name = "tb_sangho"; this.tb_sangho.Size = new System.Drawing.Size(138, 21); this.tb_sangho.TabIndex = 1; @@ -147,7 +153,7 @@ // // tb_addr // - this.tb_addr.Location = new System.Drawing.Point(161, 108); + this.tb_addr.Location = new System.Drawing.Point(164, 102); this.tb_addr.Name = "tb_addr"; this.tb_addr.Size = new System.Drawing.Size(388, 21); this.tb_addr.TabIndex = 26; @@ -156,7 +162,7 @@ // this.label3.AutoSize = true; this.label3.ForeColor = System.Drawing.SystemColors.ControlText; - this.label3.Location = new System.Drawing.Point(20, 112); + this.label3.Location = new System.Drawing.Point(23, 106); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(49, 12); this.label3.TabIndex = 24; @@ -164,7 +170,7 @@ // // tb_man // - this.tb_man.Location = new System.Drawing.Point(71, 84); + this.tb_man.Location = new System.Drawing.Point(74, 78); this.tb_man.Name = "tb_man"; this.tb_man.Size = new System.Drawing.Size(194, 21); this.tb_man.TabIndex = 20; @@ -173,7 +179,7 @@ // this.label4.AutoSize = true; this.label4.ForeColor = System.Drawing.SystemColors.ControlText; - this.label4.Location = new System.Drawing.Point(0, 88); + this.label4.Location = new System.Drawing.Point(3, 82); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(69, 12); this.label4.TabIndex = 19; @@ -181,7 +187,7 @@ // // tb_fax // - this.tb_fax.Location = new System.Drawing.Point(355, 60); + this.tb_fax.Location = new System.Drawing.Point(358, 54); this.tb_fax.Name = "tb_fax"; this.tb_fax.Size = new System.Drawing.Size(194, 21); this.tb_fax.TabIndex = 16; @@ -190,7 +196,7 @@ // this.label6.AutoSize = true; this.label6.ForeColor = System.Drawing.SystemColors.ControlText; - this.label6.Location = new System.Drawing.Point(304, 64); + this.label6.Location = new System.Drawing.Point(307, 58); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(49, 12); this.label6.TabIndex = 15; @@ -200,7 +206,7 @@ // this.label7.AutoSize = true; this.label7.ForeColor = System.Drawing.SystemColors.ControlText; - this.label7.Location = new System.Drawing.Point(20, 136); + this.label7.Location = new System.Drawing.Point(23, 130); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(49, 12); this.label7.TabIndex = 27; @@ -210,7 +216,7 @@ // this.btn_delete.DialogResult = System.Windows.Forms.DialogResult.Abort; this.btn_delete.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btn_delete.Location = new System.Drawing.Point(849, 161); + this.btn_delete.Location = new System.Drawing.Point(852, 155); this.btn_delete.Name = "btn_delete"; this.btn_delete.Size = new System.Drawing.Size(75, 23); this.btn_delete.TabIndex = 42; @@ -222,7 +228,7 @@ // this.btn_edit.DialogResult = System.Windows.Forms.DialogResult.Abort; this.btn_edit.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btn_edit.Location = new System.Drawing.Point(849, 111); + this.btn_edit.Location = new System.Drawing.Point(852, 105); this.btn_edit.Name = "btn_edit"; this.btn_edit.Size = new System.Drawing.Size(75, 23); this.btn_edit.TabIndex = 41; @@ -234,7 +240,7 @@ // this.btn_save.DialogResult = System.Windows.Forms.DialogResult.Abort; this.btn_save.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btn_save.Location = new System.Drawing.Point(849, 61); + this.btn_save.Location = new System.Drawing.Point(852, 55); this.btn_save.Name = "btn_save"; this.btn_save.Size = new System.Drawing.Size(75, 23); this.btn_save.TabIndex = 40; @@ -246,7 +252,7 @@ // this.btn_add.DialogResult = System.Windows.Forms.DialogResult.Abort; this.btn_add.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btn_add.Location = new System.Drawing.Point(849, 11); + this.btn_add.Location = new System.Drawing.Point(852, 5); this.btn_add.Name = "btn_add"; this.btn_add.Size = new System.Drawing.Size(75, 23); this.btn_add.TabIndex = 39; @@ -258,7 +264,7 @@ // this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.SystemColors.ControlText; - this.label1.Location = new System.Drawing.Point(304, 16); + this.label1.Location = new System.Drawing.Point(307, 10); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(49, 12); this.label1.TabIndex = 3; @@ -268,7 +274,7 @@ // this.label2.AutoSize = true; this.label2.ForeColor = System.Drawing.SystemColors.ControlText; - this.label2.Location = new System.Drawing.Point(16, 64); + this.label2.Location = new System.Drawing.Point(19, 58); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(53, 12); this.label2.TabIndex = 13; @@ -276,7 +282,7 @@ // // tb_tel // - this.tb_tel.Location = new System.Drawing.Point(71, 60); + this.tb_tel.Location = new System.Drawing.Point(74, 54); this.tb_tel.Name = "tb_tel"; this.tb_tel.Size = new System.Drawing.Size(194, 21); this.tb_tel.TabIndex = 14; @@ -285,7 +291,7 @@ // this.cb_gubun2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_gubun2.FormattingEnabled = true; - this.cb_gubun2.Location = new System.Drawing.Point(454, 12); + this.cb_gubun2.Location = new System.Drawing.Point(457, 6); this.cb_gubun2.Name = "cb_gubun2"; this.cb_gubun2.Size = new System.Drawing.Size(95, 20); this.cb_gubun2.TabIndex = 4; @@ -293,7 +299,7 @@ // rtb_etc // this.rtb_etc.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.rtb_etc.Location = new System.Drawing.Point(71, 180); + this.rtb_etc.Location = new System.Drawing.Point(74, 174); this.rtb_etc.Name = "rtb_etc"; this.rtb_etc.Size = new System.Drawing.Size(762, 186); this.rtb_etc.TabIndex = 38; @@ -303,14 +309,14 @@ // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, @@ -335,481 +341,28 @@ this.label, this.program, this.bigo}); + this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; - this.dataGridView1.Location = new System.Drawing.Point(12, 392); + this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.ControlDark; - dataGridViewCellStyle10.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.ControlDark; + 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; this.dataGridView1.RowHeadersWidth = 21; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView1.Size = new System.Drawing.Size(969, 271); + this.dataGridView1.Size = new System.Drawing.Size(967, 306); this.dataGridView1.TabIndex = 44; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // - // tb_man1 - // - this.tb_man1.Location = new System.Drawing.Point(271, 84); - this.tb_man1.Name = "tb_man1"; - this.tb_man1.Size = new System.Drawing.Size(278, 21); - this.tb_man1.TabIndex = 21; - // - // btn_search - // - this.btn_search.Location = new System.Drawing.Point(211, 11); - this.btn_search.Name = "btn_search"; - this.btn_search.Size = new System.Drawing.Size(75, 23); - this.btn_search.TabIndex = 2; - this.btn_search.Text = "검 색"; - this.btn_search.UseVisualStyleBackColor = true; - this.btn_search.Click += new System.EventHandler(this.btn_search_Click); - // - // tb_id - // - this.tb_id.Location = new System.Drawing.Point(71, 132); - this.tb_id.Name = "tb_id"; - this.tb_id.Size = new System.Drawing.Size(194, 21); - this.tb_id.TabIndex = 28; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.ForeColor = System.Drawing.SystemColors.ControlText; - this.label5.Location = new System.Drawing.Point(20, 183); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(49, 12); - this.label5.TabIndex = 37; - this.label5.Text = "비 고"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(300, 136); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(53, 12); - this.label8.TabIndex = 29; - this.label8.Text = "비밀번호"; - // - // tb_pw - // - this.tb_pw.Location = new System.Drawing.Point(355, 132); - this.tb_pw.Name = "tb_pw"; - this.tb_pw.Size = new System.Drawing.Size(194, 21); - this.tb_pw.TabIndex = 30; - // - // tb_zip - // - this.tb_zip.Location = new System.Drawing.Point(71, 108); - this.tb_zip.Name = "tb_zip"; - this.tb_zip.Size = new System.Drawing.Size(86, 21); - this.tb_zip.TabIndex = 25; - // - // tb_boss - // - this.tb_boss.Location = new System.Drawing.Point(639, 12); - this.tb_boss.Name = "tb_boss"; - this.tb_boss.Size = new System.Drawing.Size(194, 21); - this.tb_boss.TabIndex = 6; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(584, 16); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(53, 12); - this.label9.TabIndex = 5; - this.label9.Text = "대표자명"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.ForeColor = System.Drawing.SystemColors.ControlText; - this.label10.Location = new System.Drawing.Point(16, 40); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(53, 12); - this.label10.TabIndex = 7; - this.label10.Text = "등록번호"; - // - // tb_bubin - // - this.tb_bubin.Location = new System.Drawing.Point(71, 36); - this.tb_bubin.Name = "tb_bubin"; - this.tb_bubin.Size = new System.Drawing.Size(138, 21); - this.tb_bubin.TabIndex = 8; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(304, 40); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(49, 12); - this.label11.TabIndex = 9; - this.label11.Text = "업 태"; - // - // tb_uptae - // - this.tb_uptae.Location = new System.Drawing.Point(355, 36); - this.tb_uptae.Name = "tb_uptae"; - this.tb_uptae.Size = new System.Drawing.Size(194, 21); - this.tb_uptae.TabIndex = 10; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(588, 40); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(49, 12); - this.label12.TabIndex = 11; - this.label12.Text = "종 목"; - // - // tb_jongmok - // - this.tb_jongmok.Location = new System.Drawing.Point(639, 36); - this.tb_jongmok.Name = "tb_jongmok"; - this.tb_jongmok.Size = new System.Drawing.Size(194, 21); - this.tb_jongmok.TabIndex = 12; - // - // tb_mail - // - this.tb_mail.Location = new System.Drawing.Point(639, 60); - this.tb_mail.Name = "tb_mail"; - this.tb_mail.Size = new System.Drawing.Size(194, 21); - this.tb_mail.TabIndex = 18; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(588, 64); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(49, 12); - this.label13.TabIndex = 17; - this.label13.Text = "메 일"; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(584, 88); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(53, 12); - this.label14.TabIndex = 22; - this.label14.Text = "담당직원"; - // - // tb_user - // - this.tb_user.Location = new System.Drawing.Point(639, 84); - this.tb_user.Name = "tb_user"; - this.tb_user.Size = new System.Drawing.Size(194, 21); - this.tb_user.TabIndex = 23; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.ForeColor = System.Drawing.SystemColors.ControlText; - this.label15.Location = new System.Drawing.Point(16, 160); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(53, 12); - this.label15.TabIndex = 31; - this.label15.Text = "용지칸수"; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(312, 160); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(41, 12); - this.label16.TabIndex = 33; - this.label16.Text = "띠라벨"; - // - // tb_division - // - this.tb_division.Location = new System.Drawing.Point(71, 156); - this.tb_division.Name = "tb_division"; - this.tb_division.Size = new System.Drawing.Size(194, 21); - this.tb_division.TabIndex = 32; - // - // tb_label - // - this.tb_label.Location = new System.Drawing.Point(355, 156); - this.tb_label.Name = "tb_label"; - this.tb_label.Size = new System.Drawing.Size(194, 21); - this.tb_label.TabIndex = 34; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(560, 160); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(77, 12); - this.label17.TabIndex = 35; - this.label17.Text = "사용프로그램"; - // - // tb_program - // - this.tb_program.Location = new System.Drawing.Point(639, 156); - this.tb_program.Name = "tb_program"; - this.tb_program.Size = new System.Drawing.Size(194, 21); - this.tb_program.TabIndex = 36; - // - // btn_close - // - this.btn_close.Location = new System.Drawing.Point(849, 211); - this.btn_close.Name = "btn_close"; - this.btn_close.Size = new System.Drawing.Size(75, 23); - this.btn_close.TabIndex = 43; - this.btn_close.Text = "닫 기"; - this.btn_close.UseVisualStyleBackColor = true; - this.btn_close.Click += new System.EventHandler(this.btn_close_Click); - // - // cb_gubun1 - // - this.cb_gubun1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_gubun1.FormattingEnabled = true; - this.cb_gubun1.Location = new System.Drawing.Point(355, 12); - this.cb_gubun1.Name = "cb_gubun1"; - this.cb_gubun1.Size = new System.Drawing.Size(95, 20); - this.cb_gubun1.TabIndex = 45; - this.cb_gubun1.SelectedIndexChanged += new System.EventHandler(this.cb_gubun1_SelectedIndexChanged); - // - // btn_marc_expand - // - this.btn_marc_expand.Location = new System.Drawing.Point(849, 259); - this.btn_marc_expand.Name = "btn_marc_expand"; - this.btn_marc_expand.Size = new System.Drawing.Size(75, 74); - this.btn_marc_expand.TabIndex = 46; - this.btn_marc_expand.Text = "마크 확장 >>"; - this.btn_marc_expand.UseVisualStyleBackColor = true; - this.btn_marc_expand.Click += new System.EventHandler(this.btn_marc_expand_Click); - // - // panel1 - // - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.cb_dlsArea); - this.panel1.Controls.Add(this.NameLabel); - this.panel1.Controls.Add(this.tb_sangho); - this.panel1.Controls.Add(this.btn_marc_expand); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.cb_gubun1); - this.panel1.Controls.Add(this.label2); - this.panel1.Controls.Add(this.btn_close); - this.panel1.Controls.Add(this.tb_tel); - this.panel1.Controls.Add(this.tb_bubin); - this.panel1.Controls.Add(this.label18); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.tb_jongmok); - this.panel1.Controls.Add(this.tb_addr); - this.panel1.Controls.Add(this.tb_uptae); - this.panel1.Controls.Add(this.label4); - this.panel1.Controls.Add(this.tb_user); - this.panel1.Controls.Add(this.tb_man); - this.panel1.Controls.Add(this.tb_mail); - this.panel1.Controls.Add(this.tb_man1); - this.panel1.Controls.Add(this.tb_boss); - this.panel1.Controls.Add(this.label6); - this.panel1.Controls.Add(this.tb_zip); - this.panel1.Controls.Add(this.tb_fax); - this.panel1.Controls.Add(this.tb_program); - this.panel1.Controls.Add(this.label7); - this.panel1.Controls.Add(this.tb_label); - this.panel1.Controls.Add(this.label9); - this.panel1.Controls.Add(this.tb_pw); - this.panel1.Controls.Add(this.label15); - this.panel1.Controls.Add(this.tb_division); - this.panel1.Controls.Add(this.label8); - this.panel1.Controls.Add(this.tb_id); - this.panel1.Controls.Add(this.label11); - this.panel1.Controls.Add(this.btn_search); - this.panel1.Controls.Add(this.label16); - this.panel1.Controls.Add(this.label10); - this.panel1.Controls.Add(this.rtb_etc); - this.panel1.Controls.Add(this.label17); - this.panel1.Controls.Add(this.cb_gubun2); - this.panel1.Controls.Add(this.label12); - this.panel1.Controls.Add(this.btn_delete); - this.panel1.Controls.Add(this.label13); - this.panel1.Controls.Add(this.btn_edit); - this.panel1.Controls.Add(this.label5); - this.panel1.Controls.Add(this.btn_save); - this.panel1.Controls.Add(this.label14); - this.panel1.Controls.Add(this.btn_add); - this.panel1.Location = new System.Drawing.Point(12, 12); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(969, 374); - this.panel1.TabIndex = 47; - // - // marcGrid - // - this.marcGrid.AllowUserToAddRows = false; - this.marcGrid.AllowUserToDeleteRows = false; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.marcGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; - this.marcGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.marcGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column1, - this.Column2, - this.Column3}); - this.marcGrid.Location = new System.Drawing.Point(987, 36); - this.marcGrid.Name = "marcGrid"; - this.marcGrid.RowHeadersWidth = 31; - this.marcGrid.RowTemplate.Height = 23; - this.marcGrid.Size = new System.Drawing.Size(601, 350); - this.marcGrid.TabIndex = 48; - this.marcGrid.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Grid_ValueChanged); - this.marcGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); - this.marcGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); - // - // Column1 - // - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.Column1.DefaultCellStyle = dataGridViewCellStyle12; - this.Column1.HeaderText = "날짜"; - this.Column1.Name = "Column1"; - // - // Column2 - // - this.Column2.HeaderText = "내용"; - this.Column2.Name = "Column2"; - this.Column2.Width = 350; - // - // Column3 - // - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.Column3.DefaultCellStyle = dataGridViewCellStyle13; - this.Column3.HeaderText = "작성자"; - this.Column3.Name = "Column3"; - // - // marcLabel - // - this.marcLabel.AutoSize = true; - this.marcLabel.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.marcLabel.ForeColor = System.Drawing.Color.Red; - this.marcLabel.Location = new System.Drawing.Point(985, 12); - this.marcLabel.Name = "marcLabel"; - this.marcLabel.Size = new System.Drawing.Size(98, 21); - this.marcLabel.TabIndex = 49; - this.marcLabel.Text = "마크부분"; - // - // gearLabel - // - this.gearLabel.AutoSize = true; - this.gearLabel.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.gearLabel.ForeColor = System.Drawing.Color.Red; - this.gearLabel.Location = new System.Drawing.Point(987, 392); - this.gearLabel.Name = "gearLabel"; - this.gearLabel.Size = new System.Drawing.Size(98, 21); - this.gearLabel.TabIndex = 49; - this.gearLabel.Text = "장비부분"; - // - // gearGrid - // - this.gearGrid.AllowUserToAddRows = false; - this.gearGrid.AllowUserToDeleteRows = false; - 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.gearGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14; - this.gearGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.gearGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn1, - this.dataGridViewTextBoxColumn2, - this.dataGridViewTextBoxColumn3}); - this.gearGrid.Location = new System.Drawing.Point(987, 416); - this.gearGrid.Name = "gearGrid"; - this.gearGrid.RowHeadersWidth = 31; - this.gearGrid.RowTemplate.Height = 23; - this.gearGrid.Size = new System.Drawing.Size(601, 247); - this.gearGrid.TabIndex = 48; - this.gearGrid.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Grid_ValueChanged); - this.gearGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); - this.gearGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); - // - // dataGridViewTextBoxColumn1 - // - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle15; - this.dataGridViewTextBoxColumn1.HeaderText = "날짜"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.HeaderText = "내용"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.Width = 350; - // - // dataGridViewTextBoxColumn3 - // - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle16; - this.dataGridViewTextBoxColumn3.HeaderText = "작성자"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - // - // tb_marcEmpty - // - this.tb_marcEmpty.Location = new System.Drawing.Point(1487, 11); - this.tb_marcEmpty.Name = "tb_marcEmpty"; - this.tb_marcEmpty.Size = new System.Drawing.Size(101, 23); - this.tb_marcEmpty.TabIndex = 50; - this.tb_marcEmpty.Text = "마크 내용지우기"; - this.tb_marcEmpty.UseVisualStyleBackColor = true; - this.tb_marcEmpty.Click += new System.EventHandler(this.tb_Empty_Click); - // - // tb_gearEmpty - // - this.tb_gearEmpty.Location = new System.Drawing.Point(1487, 391); - this.tb_gearEmpty.Name = "tb_gearEmpty"; - this.tb_gearEmpty.Size = new System.Drawing.Size(101, 23); - this.tb_gearEmpty.TabIndex = 50; - this.tb_gearEmpty.Text = "장비 내용지우기"; - this.tb_gearEmpty.UseVisualStyleBackColor = true; - this.tb_gearEmpty.Click += new System.EventHandler(this.tb_Empty_Click); - // - // tb_marcSave - // - this.tb_marcSave.Location = new System.Drawing.Point(1112, 12); - this.tb_marcSave.Name = "tb_marcSave"; - this.tb_marcSave.Size = new System.Drawing.Size(56, 23); - this.tb_marcSave.TabIndex = 50; - this.tb_marcSave.Text = "저 장"; - this.tb_marcSave.UseVisualStyleBackColor = true; - this.tb_marcSave.Click += new System.EventHandler(this.tb_marcSave_Click); - // - // cb_dlsArea - // - this.cb_dlsArea.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_dlsArea.FormattingEnabled = true; - this.cb_dlsArea.Location = new System.Drawing.Point(639, 132); - this.cb_dlsArea.Name = "cb_dlsArea"; - this.cb_dlsArea.Size = new System.Drawing.Size(194, 20); - this.cb_dlsArea.TabIndex = 47; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.ForeColor = System.Drawing.SystemColors.ControlText; - this.label18.Location = new System.Drawing.Point(584, 136); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(52, 12); - this.label18.TabIndex = 24; - this.label18.Text = "DLS지역"; - // // idx // this.idx.HeaderText = "idx"; @@ -949,30 +502,515 @@ this.bigo.ReadOnly = true; this.bigo.Visible = false; // + // tb_man1 + // + this.tb_man1.Location = new System.Drawing.Point(274, 78); + this.tb_man1.Name = "tb_man1"; + this.tb_man1.Size = new System.Drawing.Size(278, 21); + this.tb_man1.TabIndex = 21; + // + // btn_search + // + this.btn_search.Location = new System.Drawing.Point(214, 5); + this.btn_search.Name = "btn_search"; + this.btn_search.Size = new System.Drawing.Size(75, 23); + this.btn_search.TabIndex = 2; + this.btn_search.Text = "검 색"; + this.btn_search.UseVisualStyleBackColor = true; + this.btn_search.Click += new System.EventHandler(this.btn_search_Click); + // + // tb_id + // + this.tb_id.Location = new System.Drawing.Point(74, 126); + this.tb_id.Name = "tb_id"; + this.tb_id.Size = new System.Drawing.Size(194, 21); + this.tb_id.TabIndex = 28; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.ForeColor = System.Drawing.SystemColors.ControlText; + this.label5.Location = new System.Drawing.Point(23, 177); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(49, 12); + this.label5.TabIndex = 37; + this.label5.Text = "비 고"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(303, 130); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(53, 12); + this.label8.TabIndex = 29; + this.label8.Text = "비밀번호"; + // + // tb_pw + // + this.tb_pw.Location = new System.Drawing.Point(358, 126); + this.tb_pw.Name = "tb_pw"; + this.tb_pw.Size = new System.Drawing.Size(194, 21); + this.tb_pw.TabIndex = 30; + // + // tb_zip + // + this.tb_zip.Location = new System.Drawing.Point(74, 102); + this.tb_zip.Name = "tb_zip"; + this.tb_zip.Size = new System.Drawing.Size(86, 21); + this.tb_zip.TabIndex = 25; + // + // tb_boss + // + this.tb_boss.Location = new System.Drawing.Point(642, 6); + this.tb_boss.Name = "tb_boss"; + this.tb_boss.Size = new System.Drawing.Size(194, 21); + this.tb_boss.TabIndex = 6; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(587, 10); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(53, 12); + this.label9.TabIndex = 5; + this.label9.Text = "대표자명"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.ForeColor = System.Drawing.SystemColors.ControlText; + this.label10.Location = new System.Drawing.Point(19, 34); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(53, 12); + this.label10.TabIndex = 7; + this.label10.Text = "등록번호"; + // + // tb_bubin + // + this.tb_bubin.Location = new System.Drawing.Point(74, 30); + this.tb_bubin.Name = "tb_bubin"; + this.tb_bubin.Size = new System.Drawing.Size(138, 21); + this.tb_bubin.TabIndex = 8; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(307, 34); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(49, 12); + this.label11.TabIndex = 9; + this.label11.Text = "업 태"; + // + // tb_uptae + // + this.tb_uptae.Location = new System.Drawing.Point(358, 30); + this.tb_uptae.Name = "tb_uptae"; + this.tb_uptae.Size = new System.Drawing.Size(194, 21); + this.tb_uptae.TabIndex = 10; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(591, 34); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(49, 12); + this.label12.TabIndex = 11; + this.label12.Text = "종 목"; + // + // tb_jongmok + // + this.tb_jongmok.Location = new System.Drawing.Point(642, 30); + this.tb_jongmok.Name = "tb_jongmok"; + this.tb_jongmok.Size = new System.Drawing.Size(194, 21); + this.tb_jongmok.TabIndex = 12; + // + // tb_mail + // + this.tb_mail.Location = new System.Drawing.Point(642, 54); + this.tb_mail.Name = "tb_mail"; + this.tb_mail.Size = new System.Drawing.Size(194, 21); + this.tb_mail.TabIndex = 18; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(591, 58); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(49, 12); + this.label13.TabIndex = 17; + this.label13.Text = "메 일"; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(587, 82); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(53, 12); + this.label14.TabIndex = 22; + this.label14.Text = "담당직원"; + // + // tb_user + // + this.tb_user.Location = new System.Drawing.Point(642, 78); + this.tb_user.Name = "tb_user"; + this.tb_user.Size = new System.Drawing.Size(194, 21); + this.tb_user.TabIndex = 23; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.ForeColor = System.Drawing.SystemColors.ControlText; + this.label15.Location = new System.Drawing.Point(19, 154); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(53, 12); + this.label15.TabIndex = 31; + this.label15.Text = "용지칸수"; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(315, 154); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(41, 12); + this.label16.TabIndex = 33; + this.label16.Text = "띠라벨"; + // + // tb_division + // + this.tb_division.Location = new System.Drawing.Point(74, 150); + this.tb_division.Name = "tb_division"; + this.tb_division.Size = new System.Drawing.Size(194, 21); + this.tb_division.TabIndex = 32; + // + // tb_label + // + this.tb_label.Location = new System.Drawing.Point(358, 150); + this.tb_label.Name = "tb_label"; + this.tb_label.Size = new System.Drawing.Size(194, 21); + this.tb_label.TabIndex = 34; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(563, 154); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(77, 12); + this.label17.TabIndex = 35; + this.label17.Text = "사용프로그램"; + // + // tb_program + // + this.tb_program.Location = new System.Drawing.Point(642, 150); + this.tb_program.Name = "tb_program"; + this.tb_program.Size = new System.Drawing.Size(194, 21); + this.tb_program.TabIndex = 36; + // + // btn_close + // + this.btn_close.Location = new System.Drawing.Point(852, 205); + this.btn_close.Name = "btn_close"; + this.btn_close.Size = new System.Drawing.Size(75, 23); + this.btn_close.TabIndex = 43; + this.btn_close.Text = "닫 기"; + this.btn_close.UseVisualStyleBackColor = true; + this.btn_close.Click += new System.EventHandler(this.btn_close_Click); + // + // cb_gubun1 + // + this.cb_gubun1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_gubun1.FormattingEnabled = true; + this.cb_gubun1.Location = new System.Drawing.Point(358, 6); + this.cb_gubun1.Name = "cb_gubun1"; + this.cb_gubun1.Size = new System.Drawing.Size(95, 20); + this.cb_gubun1.TabIndex = 45; + this.cb_gubun1.SelectedIndexChanged += new System.EventHandler(this.cb_gubun1_SelectedIndexChanged); + // + // btn_marc_expand + // + this.btn_marc_expand.Location = new System.Drawing.Point(852, 253); + this.btn_marc_expand.Name = "btn_marc_expand"; + this.btn_marc_expand.Size = new System.Drawing.Size(75, 74); + this.btn_marc_expand.TabIndex = 46; + this.btn_marc_expand.Text = "마크 확장 >>"; + this.btn_marc_expand.UseVisualStyleBackColor = true; + this.btn_marc_expand.Click += new System.EventHandler(this.btn_marc_expand_Click); + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.panel3); + this.panel1.Controls.Add(this.panel2); + this.panel1.Dock = System.Windows.Forms.DockStyle.Left; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(969, 675); + this.panel1.TabIndex = 47; + // + // cb_dlsArea + // + this.cb_dlsArea.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_dlsArea.FormattingEnabled = true; + this.cb_dlsArea.Location = new System.Drawing.Point(642, 126); + this.cb_dlsArea.Name = "cb_dlsArea"; + this.cb_dlsArea.Size = new System.Drawing.Size(194, 20); + this.cb_dlsArea.TabIndex = 47; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.ForeColor = System.Drawing.SystemColors.ControlText; + this.label18.Location = new System.Drawing.Point(587, 130); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(52, 12); + this.label18.TabIndex = 24; + this.label18.Text = "DLS지역"; + // + // marcGrid + // + this.marcGrid.AllowUserToAddRows = false; + this.marcGrid.AllowUserToDeleteRows = false; + 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.marcGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + this.marcGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.marcGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3}); + this.marcGrid.Location = new System.Drawing.Point(13, 34); + this.marcGrid.Name = "marcGrid"; + this.marcGrid.RowHeadersWidth = 31; + this.marcGrid.RowTemplate.Height = 23; + this.marcGrid.Size = new System.Drawing.Size(601, 350); + this.marcGrid.TabIndex = 48; + this.marcGrid.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Grid_ValueChanged); + this.marcGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); + this.marcGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); + // + // Column1 + // + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Column1.DefaultCellStyle = dataGridViewCellStyle4; + this.Column1.HeaderText = "날짜"; + this.Column1.Name = "Column1"; + // + // Column2 + // + this.Column2.HeaderText = "내용"; + this.Column2.Name = "Column2"; + this.Column2.Width = 350; + // + // Column3 + // + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Column3.DefaultCellStyle = dataGridViewCellStyle5; + this.Column3.HeaderText = "작성자"; + this.Column3.Name = "Column3"; + // + // marcLabel + // + this.marcLabel.AutoSize = true; + this.marcLabel.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.marcLabel.ForeColor = System.Drawing.Color.Red; + this.marcLabel.Location = new System.Drawing.Point(11, 10); + this.marcLabel.Name = "marcLabel"; + this.marcLabel.Size = new System.Drawing.Size(98, 21); + this.marcLabel.TabIndex = 49; + this.marcLabel.Text = "마크부분"; + // + // gearLabel + // + this.gearLabel.AutoSize = true; + this.gearLabel.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.gearLabel.ForeColor = System.Drawing.Color.Red; + this.gearLabel.Location = new System.Drawing.Point(13, 390); + this.gearLabel.Name = "gearLabel"; + this.gearLabel.Size = new System.Drawing.Size(98, 21); + this.gearLabel.TabIndex = 49; + this.gearLabel.Text = "장비부분"; + // + // gearGrid + // + this.gearGrid.AllowUserToAddRows = false; + this.gearGrid.AllowUserToDeleteRows = false; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gearGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; + this.gearGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.gearGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn1, + this.dataGridViewTextBoxColumn2, + this.dataGridViewTextBoxColumn3}); + this.gearGrid.Location = new System.Drawing.Point(13, 414); + this.gearGrid.Name = "gearGrid"; + this.gearGrid.RowHeadersWidth = 31; + this.gearGrid.RowTemplate.Height = 23; + this.gearGrid.Size = new System.Drawing.Size(601, 247); + this.gearGrid.TabIndex = 48; + this.gearGrid.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Grid_ValueChanged); + this.gearGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); + this.gearGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); + // + // dataGridViewTextBoxColumn1 + // + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle7; + this.dataGridViewTextBoxColumn1.HeaderText = "날짜"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.HeaderText = "내용"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.Width = 350; + // + // dataGridViewTextBoxColumn3 + // + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle8; + this.dataGridViewTextBoxColumn3.HeaderText = "작성자"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + // + // tb_marcEmpty + // + this.tb_marcEmpty.Location = new System.Drawing.Point(513, 9); + this.tb_marcEmpty.Name = "tb_marcEmpty"; + this.tb_marcEmpty.Size = new System.Drawing.Size(101, 23); + this.tb_marcEmpty.TabIndex = 50; + this.tb_marcEmpty.Text = "마크 내용지우기"; + this.tb_marcEmpty.UseVisualStyleBackColor = true; + this.tb_marcEmpty.Click += new System.EventHandler(this.tb_Empty_Click); + // + // tb_gearEmpty + // + this.tb_gearEmpty.Location = new System.Drawing.Point(513, 389); + this.tb_gearEmpty.Name = "tb_gearEmpty"; + this.tb_gearEmpty.Size = new System.Drawing.Size(101, 23); + this.tb_gearEmpty.TabIndex = 50; + this.tb_gearEmpty.Text = "장비 내용지우기"; + this.tb_gearEmpty.UseVisualStyleBackColor = true; + this.tb_gearEmpty.Click += new System.EventHandler(this.tb_Empty_Click); + // + // tb_marcSave + // + this.tb_marcSave.Location = new System.Drawing.Point(138, 10); + this.tb_marcSave.Name = "tb_marcSave"; + this.tb_marcSave.Size = new System.Drawing.Size(56, 23); + this.tb_marcSave.TabIndex = 50; + this.tb_marcSave.Text = "저 장"; + this.tb_marcSave.UseVisualStyleBackColor = true; + this.tb_marcSave.Click += new System.EventHandler(this.tb_marcSave_Click); + // + // panel2 + // + this.panel2.Controls.Add(this.NameLabel); + this.panel2.Controls.Add(this.cb_dlsArea); + this.panel2.Controls.Add(this.btn_add); + this.panel2.Controls.Add(this.label14); + this.panel2.Controls.Add(this.tb_sangho); + this.panel2.Controls.Add(this.btn_save); + this.panel2.Controls.Add(this.btn_marc_expand); + this.panel2.Controls.Add(this.label5); + this.panel2.Controls.Add(this.label1); + this.panel2.Controls.Add(this.btn_edit); + this.panel2.Controls.Add(this.cb_gubun1); + this.panel2.Controls.Add(this.label13); + this.panel2.Controls.Add(this.label2); + this.panel2.Controls.Add(this.btn_delete); + this.panel2.Controls.Add(this.btn_close); + this.panel2.Controls.Add(this.label12); + this.panel2.Controls.Add(this.cb_gubun2); + this.panel2.Controls.Add(this.tb_tel); + this.panel2.Controls.Add(this.label17); + this.panel2.Controls.Add(this.tb_bubin); + this.panel2.Controls.Add(this.rtb_etc); + this.panel2.Controls.Add(this.label18); + this.panel2.Controls.Add(this.label10); + this.panel2.Controls.Add(this.label3); + this.panel2.Controls.Add(this.label16); + this.panel2.Controls.Add(this.tb_jongmok); + this.panel2.Controls.Add(this.btn_search); + this.panel2.Controls.Add(this.tb_addr); + this.panel2.Controls.Add(this.label11); + this.panel2.Controls.Add(this.tb_uptae); + this.panel2.Controls.Add(this.tb_id); + this.panel2.Controls.Add(this.label4); + this.panel2.Controls.Add(this.label8); + this.panel2.Controls.Add(this.tb_user); + this.panel2.Controls.Add(this.tb_division); + this.panel2.Controls.Add(this.tb_man); + this.panel2.Controls.Add(this.label15); + this.panel2.Controls.Add(this.tb_mail); + this.panel2.Controls.Add(this.tb_pw); + this.panel2.Controls.Add(this.tb_man1); + this.panel2.Controls.Add(this.label9); + this.panel2.Controls.Add(this.tb_boss); + this.panel2.Controls.Add(this.tb_label); + this.panel2.Controls.Add(this.label6); + this.panel2.Controls.Add(this.label7); + this.panel2.Controls.Add(this.tb_zip); + this.panel2.Controls.Add(this.tb_program); + this.panel2.Controls.Add(this.tb_fax); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(967, 367); + this.panel2.TabIndex = 48; + // + // panel3 + // + this.panel3.Controls.Add(this.dataGridView1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 367); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(967, 306); + this.panel3.TabIndex = 49; + // + // panel4 + // + this.panel4.Controls.Add(this.marcLabel); + this.panel4.Controls.Add(this.tb_gearEmpty); + this.panel4.Controls.Add(this.marcGrid); + this.panel4.Controls.Add(this.tb_marcSave); + this.panel4.Controls.Add(this.gearGrid); + this.panel4.Controls.Add(this.tb_marcEmpty); + this.panel4.Controls.Add(this.gearLabel); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(969, 0); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(631, 675); + this.panel4.TabIndex = 51; + // // Transaction_manage // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1600, 675); - this.Controls.Add(this.tb_gearEmpty); - this.Controls.Add(this.tb_marcSave); - this.Controls.Add(this.tb_marcEmpty); - this.Controls.Add(this.gearLabel); - this.Controls.Add(this.marcLabel); - this.Controls.Add(this.gearGrid); - this.Controls.Add(this.marcGrid); + this.Controls.Add(this.panel4); this.Controls.Add(this.panel1); - this.Controls.Add(this.dataGridView1); this.Name = "Transaction_manage"; this.Text = "납품 / 거래처 관리"; this.Load += new System.EventHandler(this.Transaction_manage_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gearGrid)).EndInit(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + this.panel3.ResumeLayout(false); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -1063,5 +1101,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn label; private System.Windows.Forms.DataGridViewTextBoxColumn program; private System.Windows.Forms.DataGridViewTextBoxColumn bigo; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Panel panel4; } } \ No newline at end of file diff --git a/unimarc/unimarc/홈/Transaction_manage.cs b/unimarc/unimarc/홈/Transaction_manage.cs index c066ff1..a853ee0 100644 --- a/unimarc/unimarc/홈/Transaction_manage.cs +++ b/unimarc/unimarc/홈/Transaction_manage.cs @@ -270,7 +270,7 @@ namespace WindowsFormsApp1.Home cb_gubun2.Items.AddRange(gubun2); cb_gubun2.SelectedIndex = 2; } - lookup(marc_lookup); + lookup(panel4.Visible); } private void tb_sangho_KeyDown(object sender, KeyEventArgs e) { @@ -395,25 +395,18 @@ namespace WindowsFormsApp1.Home if (grididx < 0) return; - if(marc_lookup == false) + if (!panel4.Visible) { btn_marc_expand.Text = "마크 확장 >>"; - marc_lookup = true; + panel4.Visible = true; } else { btn_marc_expand.Text = "마크 확장 <<"; - marc_lookup = false; + panel4.Visible = false; } - marcLabel.Visible = marc_lookup; - gearLabel.Visible = marc_lookup; - marcGrid.Visible = marc_lookup; - gearGrid.Visible = marc_lookup; - tb_marcEmpty.Visible = marc_lookup; - tb_marcSave.Visible = marc_lookup; - tb_gearEmpty.Visible = marc_lookup; - lookup(marc_lookup); + lookup(panel4.Visible); } private void lookup(bool chk)