diff --git a/unimarc/unimarc/Helper_DB2.cs b/unimarc/unimarc/Helper_DB2.cs index 2f9be1c..29580f8 100644 --- a/unimarc/unimarc/Helper_DB2.cs +++ b/unimarc/unimarc/Helper_DB2.cs @@ -1,16 +1,18 @@ -using System; +using AR; +using Microsoft.Vbe.Interop; +using MySql.Data.MySqlClient; +using OpenQA.Selenium.BiDi.Input; +using Renci.SshNet; +using System; using System.Collections.Generic; +using System.Data; using System.IO.Ports; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using MySql.Data.MySqlClient; -using Renci.SshNet; -using UniMarc.Properties; -using System.Data; -using AR; using UniMarc; +using UniMarc.Properties; namespace WindowsFormsApp1 { @@ -29,5 +31,18 @@ namespace WindowsFormsApp1 dt.AcceptChanges(); return dt; } + + public static int ExcuteNonQuery(string query) + { + Helper_DB db = new Helper_DB(); + var cn = db.CreateConnection(); + var cmd = new MySqlCommand(query, cn); + cn.Open(); + var cnt = cmd.ExecuteNonQuery(); + cmd.Dispose(); + cn.Dispose(); + return cnt; + + } } } diff --git a/unimarc/unimarc/ListOfValue/fSelectDT.Designer.cs b/unimarc/unimarc/ListOfValue/fSelectDT.Designer.cs index 4ab6fbb..11be231 100644 --- a/unimarc/unimarc/ListOfValue/fSelectDT.Designer.cs +++ b/unimarc/unimarc/ListOfValue/fSelectDT.Designer.cs @@ -33,10 +33,8 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSelectDT)); this.dv1 = new System.Windows.Forms.DataGridView(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); @@ -45,13 +43,17 @@ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.tbFind = new System.Windows.Forms.ToolStripTextBox(); + this.btfind = new System.Windows.Forms.ToolStripButton(); + this.btSelect = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.SuspendLayout(); // - // dataGridView1 + // dv1 // this.dv1.AllowUserToAddRows = false; this.dv1.AllowUserToDeleteRows = false; @@ -69,7 +71,7 @@ this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.Location = new System.Drawing.Point(0, 0); this.dv1.MultiSelect = false; - this.dv1.Name = "dataGridView1"; + this.dv1.Name = "dv1"; this.dv1.ReadOnly = true; this.dv1.RowTemplate.Height = 23; this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -78,10 +80,10 @@ // // bn // - this.bn.AddNewItem = this.bindingNavigatorAddNewItem; + this.bn.AddNewItem = null; this.bn.BindingSource = this.bs; this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn.DeleteItem = null; this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, @@ -93,8 +95,10 @@ this.bindingNavigatorMoveNextItem, this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, - this.bindingNavigatorAddNewItem, - this.bindingNavigatorDeleteItem}); + this.toolStripLabel1, + this.tbFind, + this.btfind, + this.btSelect}); this.bn.Location = new System.Drawing.Point(0, 423); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -106,15 +110,6 @@ this.bn.TabIndex = 1; this.bn.Text = "bindingNavigator1"; // - // bindingNavigatorAddNewItem - // - this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); - this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; - this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorAddNewItem.Text = "새로 추가"; - // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; @@ -122,15 +117,6 @@ this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // - // bindingNavigatorDeleteItem - // - this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); - this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; - this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorDeleteItem.Text = "삭제"; - // // bindingNavigatorMoveFirstItem // this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -158,6 +144,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -191,6 +178,42 @@ this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel1.Text = "검색"; + // + // tbFind + // + this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbFind.Name = "tbFind"; + this.tbFind.Size = new System.Drawing.Size(200, 25); + this.tbFind.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); + // + // btfind + // + this.btfind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btfind.Image = ((System.Drawing.Image)(resources.GetObject("btfind.Image"))); + this.btfind.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btfind.Name = "btfind"; + this.btfind.Size = new System.Drawing.Size(23, 22); + this.btfind.Text = "toolStripButton1"; + this.btfind.Click += new System.EventHandler(this.btfind_Click); + // + // btSelect + // + this.btSelect.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btSelect.Image = ((System.Drawing.Image)(resources.GetObject("btSelect.Image"))); + this.btSelect.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSelect.Name = "btSelect"; + this.btSelect.Size = new System.Drawing.Size(51, 22); + this.btSelect.Text = "선택"; + this.btSelect.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.btSelect.Click += new System.EventHandler(this.btSelect_Click); + // // fSelectDT // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -217,9 +240,7 @@ private System.Windows.Forms.DataGridView dv1; private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; @@ -229,5 +250,9 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.BindingSource bs; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripTextBox tbFind; + private System.Windows.Forms.ToolStripButton btfind; + private System.Windows.Forms.ToolStripButton btSelect; } } \ No newline at end of file diff --git a/unimarc/unimarc/ListOfValue/fSelectDT.cs b/unimarc/unimarc/ListOfValue/fSelectDT.cs index 3423916..9ff55a6 100644 --- a/unimarc/unimarc/ListOfValue/fSelectDT.cs +++ b/unimarc/unimarc/ListOfValue/fSelectDT.cs @@ -1,4 +1,5 @@ -using System; +using AR; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,6 +13,7 @@ namespace UniMarc.ListOfValue { public partial class fSelectDT : Form { + public DataRow SelectedRow = null; public fSelectDT(DataTable dt) { InitializeComponent(); @@ -22,9 +24,35 @@ namespace UniMarc.ListOfValue this.bs.DataSource = dt; this.bn.BindingSource = this.bs; this.dv1.DataSource = this.bs; - this.dv1.MultiSelect=false; + this.dv1.MultiSelect = false; this.dv1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; this.dv1.EditMode = DataGridViewEditMode.EditProgrammatically; + this.dv1.CellDoubleClick += Dv1_CellDoubleClick; + this.dv1.KeyDown += Dv1_KeyDown; + } + + private void Dv1_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + e.Handled = true; + e.SuppressKeyPress = true; + btSelect_Click(sender, e); + } + } + + private void Dv1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex >= 0) + { + var row = this.dv1.Rows[e.RowIndex]; + if (row.DataBoundItem is DataRowView drv) + { + SelectedRow = drv.Row; + this.DialogResult = DialogResult.OK; + this.Close(); + } + } } private void fSelectDT_Load(object sender, EventArgs e) @@ -32,7 +60,84 @@ namespace UniMarc.ListOfValue this.Show(); Application.DoEvents(); this.dv1.AutoResizeColumns(); - + this.dv1.Focus(); + + } + + private void btfind_Click(object sender, EventArgs e) + { + find(); + } + void find() + { + var search = tbFind.Text.Trim(); + var filter = ""; + try + { + if (!search.isEmpty()) + { + // 검색어에서 작은따옴표 이스케이프 처리 + var escapedSearch = search.Replace("'", "''"); + + // DataTable의 모든 컬럼에 대해 검색 필터 생성 + var dt = this.bs.DataSource as DataTable; + if (dt != null && dt.Columns.Count > 0) + { + var filters = new List(); + foreach (DataColumn column in dt.Columns) + { + // 문자열 컬럼만 검색 (숫자나 날짜 컬럼은 Convert 사용) + if (column.DataType == typeof(string)) + { + filters.Add($"ISNULL(CONVERT([{column.ColumnName}], 'System.String'), '') LIKE '%{escapedSearch}%'"); + } + else + { + filters.Add($"CONVERT([{column.ColumnName}], 'System.String') LIKE '%{escapedSearch}%'"); + } + } + + // OR 조건으로 연결 + filter = string.Join(" OR ", filters); + } + } + + this.bs.Filter = filter; + if (search.isEmpty()) tbFind.BackColor = Color.White; + else tbFind.BackColor = Color.Lime; + + } + catch (Exception ex) + { + this.bs.Filter = ""; + tbFind.BackColor = Color.HotPink; + } + finally + { + tbFind.SelectAll(); + tbFind.Focus(); + } + } + + private void btSelect_Click(object sender, EventArgs e) + { + if (this.bs.Current == null) + { + MessageBox.Show("선택된 데이터가 없습니다.", "알림", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + if (this.bs.Current is DataRowView drv) + { + SelectedRow = drv.Row; + this.DialogResult = DialogResult.OK; + this.Close(); + } + } + + private void tbFind_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) find(); } } } diff --git a/unimarc/unimarc/ListOfValue/fSelectDT.resx b/unimarc/unimarc/ListOfValue/fSelectDT.resx index 9a56285..27a5a60 100644 --- a/unimarc/unimarc/ListOfValue/fSelectDT.resx +++ b/unimarc/unimarc/ListOfValue/fSelectDT.resx @@ -120,38 +120,14 @@ 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAVdJREFUOE/Nz0tLAmEUBmB3kWRoCUVEISFUJGb1OywiKrDsIpZdkJAkDUvDQkij - UKSbVIvatKhNi9oERRAGEQXhjJdp7Hd83/eGs2jhLGQ20QtndTgP71Gp/m0KZ1XInlTjM6XG+4EG5fuK - yaTUIN8bIMUQ0gmtcuBtX/MLPMT0yoHnuA6kuA4iruI20lAZ+DiswWuyFum4Dk+7dbiP6kHEFVDBg+tQ - My4DLbjwG3DqbcORxygHXxJakGIQRFwDEf0gwjKI4AYtzIHmHaA5Oxg/CsYPIb7YIQced+qluvTLCyIs - gRYWQPNO0NwkWNYGxg+DcYNgGSu2Z0xy4C7SiJtwE66kuq049xlAs2Ng/AiS7nbszXci6jIh4jQjPGWR - A+U59hiluowbQMzVVfmgPKU/GdcPxlmx5TArB6KzJunf0gTtPcqBzeluhCYsCIz3wm/rUw78WX4AJCPY - nlwVm9EAAAAASUVORK5CYII= - - 171, 17 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAWtJREFUOE+1kE0ow2Ecx/9X5a2UiwtKOSCTmJBMhuQlMo3IvCUHDouEXHZwIOVC - DrhIDiQl5USy07zNa2tKf2laaRf84/J8xBCetab4XL/f76fn+SnKX4DrGLqrwbHDzywkWJlHdJYjLEbY - Wg8q4eYKlma+d1hbgF4TotWIaC+FuYmAktcXCksx2HrknBOHX1KbiTDngrXhW0kMdSBM2TA5Io+/wuI0 - oiz5TcRwB7hPYazfLx3rDz7+gCsXNBb4v1SdgajTQ19TaOMP2NtFmPSIilSo0v1y7FHBnAdZMWi6aO51 - kVCTGZoEzzWYciA/Dl9bBZwfvh3XmxIJy7PBJdx5odnAQ2E87qJUfPbtzwGjVpxJEWjH+4ElPD/BYBsY - EjhKicW3sSoVb0vSUFsq0W6upUxhdxMtOxZnYhhqVz1oj3JJUZSdpCg0p0POmLKhJofjNqaDeikX3tFG - uuHsQM65cML4ABzY5fA/eQGKIwMcVjm2bAAAAABJRU5ErkJggg== - - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+ + wAAADsABataJCQAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+ +8H/4IZrWOXAIGPK0/8L933Aqii+5+H/pfv///evvoAhBwcJPU/+T9vyHkNRRPt9sObMWf//e5WewG1A ZNej/72rP6AoCm29B9bcuu7/f//Ov/9d8g/gNiCw+eH/uvnv4IqCW+7+X7T3//+Odf//Z8z5+d+u7ud/ +4ztuA3wqLr/P3/aGxRFdsW3/6fP+f3fv+vbf53Cd/8tEtbjNsC+9O7/7MmvMRTpp5z/b1L04r9K1qf/ @@ -162,7 +138,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33 + wAAADsABataJCQAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33 wZozZ/3/71V6gjQDQlvvgTW3rvv/37/z73+X/APEGxDccvf/or3//3es+/8/Y87P/3Z1P//bZ2wn3gAQ sCu+/T99zu///l3f/usUvvtvkbCeNANAQD/l/H+Tohf/VbI+/TeOXEa6ASBgkHTiv2za1/+6wfPIMwAE 9FMv/9fwnUa+ASCg4jGBMgMGLwAA0BRgmCws/7cAAAAASUVORK5CYII= @@ -171,7 +147,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5 + wAAADsABataJCQAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5 8n/2vl//O7f+/e9Wepl0QyK7Hv2fsu3X/5Klf/8nTP/73yb3LGmGBDY//N+69j1Ys3HJl//S0df+G0cu I94Qj6r7/0vmvoNrVnTpIV4zCNiX3v0f2PKMPM0gYJF3579NwRXyNIOAYdZt8jWDgE7aDfI1D00AAKB+ X6Bjq5qXAAAAAElFTkSuQmCC @@ -180,12 +156,41 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe + wAAADsABataJCQAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe /w9vf4BVHgwypjz9P2//7/8JXXcwFIHkFu778D+44RqGHBwk9Dz5P3vfr/+dW//+dyu9jKIQJDdty/v/ /tUXcBsQ2fXo/5Rtv/6XLP37P2H63/82uWfhikFyvas//PcqPYHbgMDmh/9b174HazYu+fJfOvraf+PI ZWANILm6+e/+u+QfwG2AR9X9/yVz38E1K7r0wBWD5PKnvflvn7EdtwH2pXf/B7Y8w9AMk8ue/Pq/RcJ6 3AZY5N35b1NwBUMzTC61/zXcS1iBYdZtrJpBACQX1vLyv27wPKzyYKCTdgOnJEjOr/rhfw3faTjV4AVO uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVDhPY2AYdKCxf9ajJRv2/G+dOPc/iD95wTowOzQ2 + +Ra6WqygrLHv0bodh/+HxqaCDcgoqvnfN3vF/8b+2U/Q1aKApOyS/13Tl/yv7Zz6v23S/P8mlnZgAxzc + fP5nldT9L6hqBYtZ2bks19LS4mFgYGACa5w/fz9HYXWbR1PfbLBTC6vb/nv4h/138Qr4n1PW8D82Le9/ + RE7T/9qJy/6XtEwBy3Fx8VQxMDAwgg2or9/PMmX+uoeL1u36n1veBMbVE1f9n7J81/+eJVt/NU7f8L+2 + d/7/6Nzm/+HJhWAXMrOwPGBgYGAGGzBz5kxWkM3TFm/8n11a/x/k55Tc8v/RyTn/1bT0wDaCXAITj0sv + AHntHwMDAyvYgLS0NFaf4JifFrZO/70CI/4bW9j+19Y3/i+toPRUVFTUQFJGdquYhNR/BSXV/6Likv95 + +fj/MzIyvoOHAQh4BUUdBgXcrsNn/q/acuB/94xl/40t7VaA5FTUdVZUtkz4v3bHIbAcKEb4+PgPwzWD + gItX4J/8imawAWkFlf/jMwr/6xqbXwXJKSiqXgXFAMiA1PyK/+mF1f85OLn+oBjg6O77H2YATJGatv5P + UEiLSUq/AwUczABQWLCysoGjGA6sHd3A8QxKQCAFoMDUNTL7L6ikxK+gqnYFZAAolmByjIyMqAaAEoiB + iSU48FQ1df4rqqj/l5ZV+C8sLCzFwy94m5OL+z8bOzso+kAaYXiQAABSzSGsYv7dkQAAAABJRU5ErkJg + gg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGTSURBVDhP1c/bL4JxHMfx5w79E27c2zwZ5RCzsZRDeYaS + iiLimdksPTr8OqiGOTyXrCXn2XJYdIHZXMoh428w/wT6WLbaCi3uvC5/v+/7d6Cof6d7o41XBltJ7npB + UjF7YsDokQ5SvpHL3c+LCcv48egglh898F3PQL/bg/rZKlvu3LeYkIw3H+ux+ODGwgPBwF4vGnwiSIik + ODNkPtc1mWLqoaySoihlSMannjyfIJhLOD9vrnFVvmXHF/21xlPNC3fFQhthJjJxUMqPHGoxd+9A4N4O + 3U43xESYHY+eaZuNMdWzP85hMeGCervjjQm3T3SuSRdMBxr47+zw3XLo32YgInR2nDK5z5QYjlWwXI5h + 5WkWvvgMzFE92FMDvHErPLdWaLa6IHYI37/EacNRuUC9qwAbM3z+M3Bng/vGAnfcAvWmEmKnMPljnCZf + lQsUa1IYI33w3EzDeT0FVVgBkYNOSkhp/jgtdUjLUgM0Wwx61jtQba8oPE6TE1pQ561CJVf+WsaWFeXu + F4QmtODP8W99AIUYxS+0cG7HAAAAAElFTkSuQmCC \ No newline at end of file diff --git a/unimarc/unimarc/Properties/AssemblyInfo.cs b/unimarc/unimarc/Properties/AssemblyInfo.cs index 3aebae2..402b699 100644 --- a/unimarc/unimarc/Properties/AssemblyInfo.cs +++ b/unimarc/unimarc/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2025.10.11.1430")] -[assembly: AssemblyFileVersion("2025.10.11.1430")] +[assembly: AssemblyVersion("2025.11.07.0000")] +[assembly: AssemblyFileVersion("2025.11.07.0000")] diff --git a/unimarc/unimarc/마크/Mac_List.Designer.cs b/unimarc/unimarc/마크/Mac_List.Designer.cs index c76e4ef..8eff0a4 100644 --- a/unimarc/unimarc/마크/Mac_List.Designer.cs +++ b/unimarc/unimarc/마크/Mac_List.Designer.cs @@ -51,6 +51,7 @@ this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.start_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.end_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_custname = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.work_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -59,8 +60,8 @@ this.state = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_cust = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.check = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_custom = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -103,6 +104,7 @@ this.idx, this.start_date, this.end_date, + this.dvc_custname, this.list_name, this.work_name, this.count, @@ -111,8 +113,8 @@ this.state, this.etc, this.charge, - this.check, - this.dvc_custom}); + this.dvc_cust, + this.check}); dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -309,6 +311,11 @@ this.end_date.HeaderText = "완료일자"; this.end_date.Name = "end_date"; // + // dvc_custname + // + this.dvc_custname.HeaderText = "납품처"; + this.dvc_custname.Name = "dvc_custname"; + // // list_name // this.list_name.HeaderText = "목록명"; @@ -358,17 +365,18 @@ this.charge.Name = "charge"; this.charge.Width = 70; // + // dvc_cust + // + this.dvc_cust.HeaderText = "CustomerIDX"; + this.dvc_cust.Name = "dvc_cust"; + this.dvc_cust.Visible = false; + // // check // this.check.HeaderText = "V"; this.check.Name = "check"; this.check.Width = 35; // - // dvc_custom - // - this.dvc_custom.HeaderText = "납품처"; - this.dvc_custom.Name = "dvc_custom"; - // // Mac_List // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -411,6 +419,7 @@ 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 dvc_custname; private System.Windows.Forms.DataGridViewTextBoxColumn list_name; private System.Windows.Forms.DataGridViewTextBoxColumn work_name; private System.Windows.Forms.DataGridViewTextBoxColumn count; @@ -419,7 +428,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn state; private System.Windows.Forms.DataGridViewTextBoxColumn etc; private System.Windows.Forms.DataGridViewTextBoxColumn charge; + private System.Windows.Forms.DataGridViewTextBoxColumn dvc_cust; private System.Windows.Forms.DataGridViewTextBoxColumn check; - private System.Windows.Forms.DataGridViewTextBoxColumn dvc_custom; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs index 1ab735f..c9b9bb9 100644 --- a/unimarc/unimarc/마크/Mac_List.cs +++ b/unimarc/unimarc/마크/Mac_List.cs @@ -44,7 +44,8 @@ namespace WindowsFormsApp1.Mac } private void tb_Search_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) { + if (e.KeyCode == Keys.Enter) + { btn_Lookup_Click(null, null); } } @@ -55,9 +56,8 @@ namespace WindowsFormsApp1.Mac /* idx / 목록일자 / 완료일자 / 목록명 / 작업명 * 전체수량 / 입고 / 미입고 / 상태 / 비고 * 마크담당자 */ - string Area = "`idx`, `date`, `date_res`, `list_name`, `work_name`, " + - "`vol`, `stock`, `unstock`, `state`, `m_etc`, " + - "`m_charge`,`customer`"; + string Area = $"`idx`, `date`, `date_res`,GetClientName({compidx},customer) as custname, `list_name`, `work_name`, " + + "`vol`, `stock`, `unstock`, `state`, `m_etc`,`m_charge`,`customer` "; string search = tb_Search.Text; string state = cb_state.Text; @@ -83,14 +83,14 @@ namespace WindowsFormsApp1.Mac /// private void input_Grid(string[] data) { - /* idx / 목록일자 / 완료일자 / 목록명 / 작업명 + /* idx / 목록일자 / 완료일자 / 납품처 / 목록명 / 작업명 * 전체수량 / 입고 / 미입고 / 상태 / 비고 * 마크담당자 */ string[] grid = { "", "", "", "", "", "", "", "", "", "", - "", "" ,"",""}; - int area_count = 12; + "", "" ,"","","","","",""}; + int area_count = 13; dataGridView1.Rows.Clear(); for (int a = 0; a < data.Length; a++) { @@ -105,9 +105,12 @@ namespace WindowsFormsApp1.Mac 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]; - dataGridView1.Rows.Add(grid); + if (a % area_count == 11) { grid[11] = data[a]; } + //if (a % area_count == 12) { grid[12] = data[a]; } + if (a % area_count == 12) + { //cutomeridx + grid[12] = data[a]; + dataGridView1.Rows.Add(grid); } } } @@ -124,18 +127,20 @@ namespace WindowsFormsApp1.Mac { if (MessageBox.Show("선택사항을 저장하시겠습니까?", "저장", MessageBoxButtons.YesNo) == DialogResult.No) return; - + string table = "Obj_List"; for (int a = 0; a < dataGridView1.Rows.Count; a++) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") + { string[] edit_col = { - "date", "date_res", "list_name", "work_name", "vol", + "date", "date_res","custname", "list_name", "work_name", "vol", "stock", "unstock", "state", "m_etc", "m_charge","customer" }; string[] edit_tbl = { dataGridView1.Rows[a].Cells["start_date"].Value.ToString(), dataGridView1.Rows[a].Cells["end_date"].Value.ToString(), + dataGridView1.Rows[a].Cells["custname"].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(), @@ -144,7 +149,8 @@ namespace WindowsFormsApp1.Mac dataGridView1.Rows[a].Cells["state"].Value.ToString(), dataGridView1.Rows[a].Cells["etc"].Value.ToString(), dataGridView1.Rows[a].Cells["charge"].Value.ToString(), - dataGridView1.Rows[a].Cells["customer"].Value.ToString() + dataGridView1.Rows[a].Cells["customer"].Value.ToString(), + }; string[] sear_col = { "idx", "comp_num" }; string[] sear_tbl = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(), compidx }; @@ -162,9 +168,9 @@ namespace WindowsFormsApp1.Mac { Excel_text et = new Excel_text(); string[] Excel_title = { - "NO", "목록일자", "완료일자", "목록명", "마크담당자", + "NO", "목록일자", "완료일자", "납품처","목록명", "마크담당자", //"작업명", "수량", "입고", "미입고", "상태", "비고" }; - "작업명", "수량", "상태", "비고","납품처코드" }; + "작업명", "수량", "상태", "비고" }; int rowCount = dataGridView1.RowCount; // string[,] inputExcel = new string[rowCount, 11]; string[,] inputExcel = new string[rowCount, 9]; @@ -172,23 +178,19 @@ namespace WindowsFormsApp1.Mac for (int a = 0; a < rowCount; a++) { int row_idx = dataGridView1.Rows[a].HeaderCell.RowIndex + 1; - 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_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["state"].Value.ToString(); - inputExcel[a, 8] = dataGridView1.Rows[a].Cells["etc"].Value.ToString(); - - inputExcel[a, 9] = dataGridView1.Rows[a].Cells["customer"]?.Value.ToString() ?? ""; - - // inputExcel[a, 7] = dataGridView1.Rows[a].Cells["stock"].Value.ToString(); - // inputExcel[a, 8] = dataGridView1.Rows[a].Cells["unstock"].Value.ToString(); - // inputExcel[a, 9] = dataGridView1.Rows[a].Cells["state"].Value.ToString(); - // inputExcel[a, 10] =dataGridView1.Rows[a].Cells["etc"].Value.ToString(); + var seq = 0; + inputExcel[a, seq++] = row_idx.ToString(); + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["start_date"].Value.ToString(); + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["end_date"].Value.ToString(); + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["custname"]?.Value.ToString() ?? ""; + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["list_name"].Value.ToString(); + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["charge"].Value.ToString(); + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["work_name"].Value.ToString(); + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["count"].Value.ToString(); + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["state"].Value.ToString(); + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["etc"].Value.ToString(); + inputExcel[a, seq++] = dataGridView1.Rows[a].Cells["customer"]?.Value.ToString() ?? ""; } et.Mk_Excel(Excel_title, inputExcel); } @@ -203,19 +205,23 @@ namespace WindowsFormsApp1.Mac private void btn_Progress_Click(object sender, EventArgs e) { - for(int a = 0; a < dataGridView1.Rows.Count; a++) + for (int a = 0; a < dataGridView1.Rows.Count; a++) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { - if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") + { + if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") + { MessageBox.Show("체크된 목록이 현재 진행중입니다."); return; } } } - for(int a= 0; a < dataGridView1.Rows.Count; a++) + for (int a = 0; a < dataGridView1.Rows.Count; a++) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { - if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") + { + if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") + { dataGridView1.Rows[a].Cells["state"].Value = "진행"; state_Save(a); } @@ -230,8 +236,10 @@ namespace WindowsFormsApp1.Mac { for (int a = 0; a < dataGridView1.Rows.Count; a++) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { - if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") + { + if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "완료") + { MessageBox.Show("체크된 목록은 현재 완료되어있습니다."); return; } @@ -239,8 +247,10 @@ namespace WindowsFormsApp1.Mac } for (int a = 0; a < dataGridView1.Rows.Count; a++) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { - if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") + { + if (dataGridView1.Rows[a].Cells["state"].Value.ToString() == "진행") + { dataGridView1.Rows[a].Cells["state"].Value = "완료"; state_Save(a); } @@ -273,9 +283,10 @@ namespace WindowsFormsApp1.Mac { for (int a = 0; a < dataGridView1.Rows.Count; a++) { - if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") { + if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") + { string l_idx = dataGridView1.Rows[a].Cells["idx"].Value.ToString(); - string D_cmd = db.DB_Delete("Obj_List", "comp_num", compidx, + string D_cmd = db.DB_Delete("Obj_List", "comp_num", compidx, "idx", l_idx); db.DB_Send_CMD_reVoid(D_cmd); @@ -299,14 +310,18 @@ namespace WindowsFormsApp1.Mac { int idx_row = e.RowIndex; int idx_col = e.ColumnIndex; - if (3 <= idx_col && idx_col <= 8) { + if (3 <= idx_col && idx_col <= 8) + { ExcelTest.Marc marc = new ExcelTest.Marc(this); marc.MdiParent = main; marc.WindowState = FormWindowState.Maximized; marc.Show(); marc.input_list( dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(), - dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx); + dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx, + (dataGridView1.Rows[idx_row].Cells["dvc_cust"]?.Value.ToString() ?? string.Empty), + (dataGridView1.Rows[idx_row].Cells["dvc_custname"]?.Value.ToString() ?? string.Empty) + ); /// marc.input_list( /// dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(), /// dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString()); diff --git a/unimarc/unimarc/마크/Mac_List.resx b/unimarc/unimarc/마크/Mac_List.resx index 8b35e24..377e694 100644 --- a/unimarc/unimarc/마크/Mac_List.resx +++ b/unimarc/unimarc/마크/Mac_List.resx @@ -126,6 +126,9 @@ True + + True + True @@ -150,10 +153,10 @@ True - + True - + True diff --git a/unimarc/unimarc/마크/Mac_List_Add.Designer.cs b/unimarc/unimarc/마크/Mac_List_Add.Designer.cs index 61aa486..4db3047 100644 --- a/unimarc/unimarc/마크/Mac_List_Add.Designer.cs +++ b/unimarc/unimarc/마크/Mac_List_Add.Designer.cs @@ -29,14 +29,15 @@ namespace UniMarc.마크 /// 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(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + 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(); this.panel1 = new System.Windows.Forms.Panel(); + this.tbCustomIDX = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); this.cb_Gubun = new System.Windows.Forms.ComboBox(); this.btn_DelRow = new System.Windows.Forms.Button(); @@ -48,7 +49,7 @@ namespace UniMarc.마크 this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); + this.btCustom = new System.Windows.Forms.Button(); this.tb_ExpectList = new System.Windows.Forms.TextBox(); this.tb_divName = new System.Windows.Forms.TextBox(); this.tb_divComp = new System.Windows.Forms.TextBox(); @@ -72,6 +73,7 @@ namespace UniMarc.마크 // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.tbCustomIDX); this.panel1.Controls.Add(this.label5); this.panel1.Controls.Add(this.cb_Gubun); this.panel1.Controls.Add(this.btn_DelRow); @@ -83,7 +85,7 @@ namespace UniMarc.마크 this.panel1.Controls.Add(this.label3); this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.label4); - this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.btCustom); this.panel1.Controls.Add(this.tb_ExpectList); this.panel1.Controls.Add(this.tb_divName); this.panel1.Controls.Add(this.tb_divComp); @@ -93,6 +95,16 @@ namespace UniMarc.마크 this.panel1.Size = new System.Drawing.Size(897, 59); this.panel1.TabIndex = 0; // + // tbCustomIDX + // + this.tbCustomIDX.Location = new System.Drawing.Point(175, 5); + this.tbCustomIDX.Name = "tbCustomIDX"; + this.tbCustomIDX.ReadOnly = true; + this.tbCustomIDX.Size = new System.Drawing.Size(66, 21); + this.tbCustomIDX.TabIndex = 15; + this.tbCustomIDX.TabStop = false; + this.tbCustomIDX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // label5 // this.label5.AutoSize = true; @@ -135,7 +147,7 @@ namespace UniMarc.마크 // this.cb_User.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_User.FormattingEnabled = true; - this.cb_User.Location = new System.Drawing.Point(373, 5); + this.cb_User.Location = new System.Drawing.Point(452, 5); this.cb_User.Name = "cb_User"; this.cb_User.Size = new System.Drawing.Size(82, 20); this.cb_User.TabIndex = 2; @@ -173,7 +185,7 @@ namespace UniMarc.마크 // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(330, 9); + this.label3.Location = new System.Drawing.Point(409, 9); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(41, 12); this.label3.TabIndex = 13; @@ -182,7 +194,7 @@ namespace UniMarc.마크 // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(178, 9); + this.label2.Location = new System.Drawing.Point(257, 9); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 11; @@ -197,15 +209,15 @@ namespace UniMarc.마크 this.label4.TabIndex = 10; this.label4.Text = "생성될 목록명"; // - // label1 + // btCustom // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(26, 9); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 12); - this.label1.TabIndex = 9; - this.label1.Text = "납품처"; - this.label1.Click += new System.EventHandler(this.label1_Click); + this.btCustom.AutoSize = true; + this.btCustom.Location = new System.Drawing.Point(5, 4); + this.btCustom.Name = "btCustom"; + this.btCustom.Size = new System.Drawing.Size(61, 22); + this.btCustom.TabIndex = 9; + this.btCustom.Text = "납품처"; + this.btCustom.Click += new System.EventHandler(this.label1_Click); // // tb_ExpectList // @@ -217,7 +229,7 @@ namespace UniMarc.마크 // // tb_divName // - this.tb_divName.Location = new System.Drawing.Point(221, 5); + this.tb_divName.Location = new System.Drawing.Point(300, 5); this.tb_divName.Name = "tb_divName"; this.tb_divName.Size = new System.Drawing.Size(100, 21); this.tb_divName.TabIndex = 1; @@ -230,6 +242,7 @@ namespace UniMarc.마크 this.tb_divComp.Size = new System.Drawing.Size(100, 21); this.tb_divComp.TabIndex = 0; this.tb_divComp.TextChanged += new System.EventHandler(this.Delivery_TextChanged); + this.tb_divComp.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_divComp_KeyDown); // // panel2 // @@ -245,14 +258,14 @@ namespace UniMarc.마크 this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control; this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - 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; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.header, this.num, @@ -286,53 +299,53 @@ namespace UniMarc.마크 // // BookName // - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.BookName.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.BookName.DefaultCellStyle = dataGridViewCellStyle9; this.BookName.HeaderText = "도서명"; this.BookName.Name = "BookName"; this.BookName.Width = 200; // // Author // - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.Author.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.Author.DefaultCellStyle = dataGridViewCellStyle10; this.Author.HeaderText = "저자"; this.Author.Name = "Author"; // // BookComp // - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.BookComp.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.BookComp.DefaultCellStyle = dataGridViewCellStyle11; this.BookComp.HeaderText = "출판사"; this.BookComp.Name = "BookComp"; this.BookComp.Width = 120; // // Price // - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - dataGridViewCellStyle5.Format = "N0"; - dataGridViewCellStyle5.NullValue = "0"; - this.Price.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + dataGridViewCellStyle12.Format = "N0"; + dataGridViewCellStyle12.NullValue = "0"; + this.Price.DefaultCellStyle = dataGridViewCellStyle12; this.Price.HeaderText = "가격"; this.Price.Name = "Price"; this.Price.Width = 80; // // Count // - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - dataGridViewCellStyle6.Format = "N0"; - dataGridViewCellStyle6.NullValue = "1"; - this.Count.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + dataGridViewCellStyle13.Format = "N0"; + dataGridViewCellStyle13.NullValue = "1"; + this.Count.DefaultCellStyle = dataGridViewCellStyle13; this.Count.HeaderText = "수량"; this.Count.Name = "Count"; this.Count.Width = 45; // // Total // - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - dataGridViewCellStyle7.Format = "N0"; - dataGridViewCellStyle7.NullValue = "0"; - this.Total.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + dataGridViewCellStyle14.Format = "N0"; + dataGridViewCellStyle14.NullValue = "0"; + this.Total.DefaultCellStyle = dataGridViewCellStyle14; this.Total.HeaderText = "합계"; this.Total.Name = "Total"; this.Total.Width = 80; @@ -371,7 +384,7 @@ namespace UniMarc.마크 private System.Windows.Forms.DataGridView dataGridView1; private System.Windows.Forms.Button btn_AddList; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btCustom; private System.Windows.Forms.TextBox tb_divName; private System.Windows.Forms.TextBox tb_divComp; private System.Windows.Forms.Label label3; @@ -394,5 +407,6 @@ namespace UniMarc.마크 private System.Windows.Forms.Label label5; private System.Windows.Forms.OpenFileDialog openFileDialog1; private System.Windows.Forms.Button btn_DelRow; + private System.Windows.Forms.TextBox tbCustomIDX; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_List_Add.cs b/unimarc/unimarc/마크/Mac_List_Add.cs index aa64497..df13948 100644 --- a/unimarc/unimarc/마크/Mac_List_Add.cs +++ b/unimarc/unimarc/마크/Mac_List_Add.cs @@ -13,6 +13,7 @@ using WindowsFormsApp1.Mac; using System.IO; using Microsoft.Office.Interop.Excel; using UniMarc.ListOfValue; +using AR; namespace UniMarc.마크 { @@ -80,11 +81,22 @@ namespace UniMarc.마크 string listName = tb_ExpectList.Text; string charge = cb_User.Text; - if (!CopyCheck(compidx, listName, Today)) { + int custidx = -1; + if (int.TryParse(tbCustomIDX.Text, out custidx) == false) + { + UTIL.MsgE("납품처를 올바르게 선택하세요"); + tb_divComp.Focus(); + tb_divComp.SelectAll(); + return; + } + + if (!CopyCheck(compidx, listName, Today)) + { MessageBox.Show("목록이 중복되었습니다! 다시 확인해주세요.", "Error"); return; } - if (tb_ExpectList.Text == "") { + if (tb_ExpectList.Text == "") + { MessageBox.Show("목록명이 비어있습니다! 다시 확인해주세요.", "Error"); return; } @@ -107,15 +119,15 @@ namespace UniMarc.마크 if (dataGridView1.Rows[a].Cells["BookName"].Value.ToString() == "") break; - string header = dataGridView1.Rows[a].Cells["header"].Value.ToString(); - string num = dataGridView1.Rows[a].Cells["num"].Value.ToString(); + string header = dataGridView1.Rows[a].Cells["header"].Value.ToString(); + string num = dataGridView1.Rows[a].Cells["num"].Value.ToString(); string bookname = dataGridView1.Rows[a].Cells["BookName"].Value.ToString(); - string author = dataGridView1.Rows[a].Cells["Author"].Value.ToString(); + string author = dataGridView1.Rows[a].Cells["Author"].Value.ToString(); string bookcomp = dataGridView1.Rows[a].Cells["BookComp"].Value.ToString(); - string price = dataGridView1.Rows[a].Cells["Price"].Value.ToString().Replace(",", ""); - string count = dataGridView1.Rows[a].Cells["Count"].Value.ToString().Replace(",", ""); - string total = dataGridView1.Rows[a].Cells["Total"].Value.ToString().Replace(",", ""); - string isbn = dataGridView1.Rows[a].Cells["ISBN"].Value.ToString(); + string price = dataGridView1.Rows[a].Cells["Price"].Value.ToString().Replace(",", ""); + string count = dataGridView1.Rows[a].Cells["Count"].Value.ToString().Replace(",", ""); + string total = dataGridView1.Rows[a].Cells["Total"].Value.ToString().Replace(",", ""); + string isbn = dataGridView1.Rows[a].Cells["ISBN"].Value.ToString(); string tmp = string.Format( "(\"{0}\", \"{1}\", \"{2}\", \"{3}\", \"{4}\", " + @@ -178,12 +190,14 @@ namespace UniMarc.마크 { for (int a = 0; a < dataGridView1.Columns.Count; a++) { - if (a == 5 || a == 7) { + if (a == 5 || a == 7) + { if (dataGridView1.Rows[row].Cells[a].Value == null) dataGridView1.Rows[row].Cells[a].Value = "0"; } - else if (a == 6) { + else if (a == 6) + { if (dataGridView1.Rows[row].Cells[a].Value == null) dataGridView1.Rows[row].Cells[a].Value = "1"; } @@ -210,7 +224,7 @@ namespace UniMarc.마크 { Gubun = '\t'; } - + if (textValue.Length < 0) return; try @@ -257,9 +271,32 @@ namespace UniMarc.마크 private void label1_Click(object sender, EventArgs e) { - var dt = DB2.GetDT("Client", columns: "idx,c_sangho", orders: "c_sangho"); - using(var f = new fSelectDT(dt)) - f.ShowDialog(); + LovCustom(); + } + void LovCustom() + { + string compidx = Properties.Settings.Default.compidx; + var inputsearch = tb_divComp.Text.Trim(); + var where = $"campanyidx={compidx}"; + if (inputsearch.isEmpty() == false) + { + where = $" and c_sangho like '%{inputsearch.Replace("'", "''")}%'"; + } + var dt = DB2.GetDT("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); + using (var f = new fSelectDT(dt)) + if (f.ShowDialog() == DialogResult.OK) + { + var dr = f.SelectedRow; + if (dr == null) return; + tbCustomIDX.Text = dr["idx"]?.ToString() ?? string.Empty; + tb_divComp.Text = dr["c_sangho"]?.ToString() ?? string.Empty; + tb_divName.Focus(); //납품명으로 커서 이동 + } + } + + private void tb_divComp_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) LovCustom(); } } } diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 676fc79..0902a97 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -1,4 +1,6 @@ //using Microsoft.Office.Interop.Excel; +using AR; +using OpenQA.Selenium.DevTools.V136.Animation; using System; using System.Collections.Generic; using System.Drawing; @@ -11,6 +13,7 @@ using System.Text.RegularExpressions; using System.Web.UI; using System.Windows.Forms; using UniMarc; +using UniMarc.ListOfValue; using UniMarc.마크; using WindowsFormsApp1; using WindowsFormsApp1.Mac; @@ -27,6 +30,7 @@ namespace ExcelTest int SaveRowIdx = -1; public string mUserName; string mCompidx = UniMarc.Properties.Settings.Default.compidx; + string mListIdx = ""; public string find; public string change; public string call = ""; @@ -52,6 +56,8 @@ namespace ExcelTest mUserName = ml.user_name; } + string l_idx = string.Empty; + string c_idx = string.Empty; private void Marc_Load(object sender, EventArgs e) { #region ComboBox Item Setting @@ -198,14 +204,18 @@ namespace ExcelTest /// /// 목록일자 /// 목록명 - public void input_list(string l_idx, string value, string C_idx) + public void input_list(string l_idx, string value, string C_idx,string custidx,string custname) { db.DBcon(); + this.l_idx = l_idx; + this.c_idx = C_idx; string Area = "`idx`, `isbn_marc`, `header`, `num`, `book_name`, `author`, `book_comp`, `count`, `pay`, `image_url`, `m_idx`"; string[] sear_tbl = { "l_idx", "compidx" }; string[] sear_col = { l_idx, C_idx }; lbl_BookList.Text = value; + tbCustName.Text = custname; + lbCustIDX.Text = custidx; string cmd = string.Format("SELECT {0} " + @@ -3651,6 +3661,39 @@ namespace ExcelTest sg.Print_Grid_Num(sender, e); } - + private void lbl_BookList_Click(object sender, EventArgs e) + { + LovCustom(); + + } + + void LovCustom() + { + var inputsearch = "";// tbCustName.Text.Trim(); + var where = ""; + if (inputsearch.isEmpty() == false) + { + where = $"c_sangho like '%{inputsearch.Replace("'", "''")}%'"; + } + var dt = DB2.GetDT("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); + using (var f = new fSelectDT(dt)) + if (f.ShowDialog() == DialogResult.OK) + { + var dr = f.SelectedRow; + if (dr == null) return; + lbCustIDX.Text = dr["idx"]?.ToString() ?? string.Empty; + tbCustName.Text = dr["c_sangho"]?.ToString() ?? string.Empty; + + if(int.TryParse(lbCustIDX.Text,out int custidx) && custidx >= 0) + { + var sql = $"update Obj_List set customer={custidx} where idx = {l_idx} and comp_num={c_idx}"; + var cnt = DB2.ExcuteNonQuery(sql); + if (cnt != 1) + UTIL.MsgE($"데이터 저장시 오류가 발생했습니다. 영향을 받은 행 수 = {cnt}"); + } + + } + } + } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index 6bc6f1f..8aefda1 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -28,19 +28,19 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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 dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc)); - 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(); - 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 dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.etc1 = new System.Windows.Forms.RichTextBox(); this.etc2 = new System.Windows.Forms.RichTextBox(); @@ -248,8 +248,10 @@ this.text250a = new System.Windows.Forms.TextBox(); this.lbl_SaveData = new System.Windows.Forms.Label(); this.lbl_ISBN = new System.Windows.Forms.Label(); - this.lbl_BookList = new System.Windows.Forms.Label(); + this.tbCustName = new System.Windows.Forms.Button(); this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.lbCustIDX = new System.Windows.Forms.Label(); + this.lbl_BookList = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.List_Book)).BeginInit(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -551,14 +553,14 @@ this.List_Book.AllowUserToResizeColumns = false; this.List_Book.BackgroundColor = System.Drawing.Color.Gray; this.List_Book.BorderStyle = System.Windows.Forms.BorderStyle.None; - 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.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle13.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, this.ISBN13, @@ -580,14 +582,14 @@ this.List_Book.MultiSelect = false; this.List_Book.Name = "List_Book"; this.List_Book.ReadOnly = true; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.ControlDark; - 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; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.ControlDark; + dataGridViewCellStyle16.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle16; this.List_Book.RowTemplate.Height = 23; this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.List_Book.Size = new System.Drawing.Size(543, 822); @@ -686,9 +688,9 @@ // // grade // - dataGridViewCellStyle2.Format = "N0"; - dataGridViewCellStyle2.NullValue = null; - this.grade.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle14.Format = "N0"; + dataGridViewCellStyle14.NullValue = null; + this.grade.DefaultCellStyle = dataGridViewCellStyle14; this.grade.HeaderText = "등급"; this.grade.Name = "grade"; this.grade.ReadOnly = true; @@ -697,8 +699,8 @@ // // colCheck // - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.colCheck.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colCheck.DefaultCellStyle = dataGridViewCellStyle15; this.colCheck.HeaderText = "V"; this.colCheck.Name = "colCheck"; this.colCheck.ReadOnly = true; @@ -1092,8 +1094,8 @@ this.GridView020.Name = "GridView020"; this.GridView020.RowHeadersVisible = false; this.GridView020.RowHeadersWidth = 30; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle17; this.GridView020.RowTemplate.Height = 23; this.GridView020.Size = new System.Drawing.Size(408, 80); this.GridView020.TabIndex = 244; @@ -1161,8 +1163,8 @@ this.GridView505.Name = "GridView505"; this.GridView505.RowHeadersVisible = false; this.GridView505.RowHeadersWidth = 30; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle18; this.GridView505.RowTemplate.Height = 23; this.GridView505.Size = new System.Drawing.Size(401, 71); this.GridView505.TabIndex = 246; @@ -1295,14 +1297,14 @@ this.GridView246.AllowDrop = true; this.GridView246.AllowUserToAddRows = false; this.GridView246.AllowUserToResizeRows = false; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle19.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19; this.GridView246.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Text246Jisi, this.Text246i, @@ -1314,8 +1316,8 @@ this.GridView246.Name = "GridView246"; this.GridView246.RowHeadersVisible = false; this.GridView246.RowHeadersWidth = 30; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle20; this.GridView246.RowTemplate.Height = 23; this.GridView246.Size = new System.Drawing.Size(493, 138); this.GridView246.TabIndex = 250; @@ -1465,14 +1467,14 @@ this.GridView440.AllowDrop = true; this.GridView440.AllowUserToAddRows = false; this.GridView440.AllowUserToResizeRows = false; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, 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.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle21.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle21; this.GridView440.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView440.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text440a, @@ -1485,8 +1487,8 @@ this.GridView440.Name = "GridView440"; this.GridView440.RowHeadersVisible = false; this.GridView440.RowHeadersWidth = 30; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle22; this.GridView440.RowTemplate.Height = 23; this.GridView440.Size = new System.Drawing.Size(597, 71); this.GridView440.TabIndex = 245; @@ -1585,14 +1587,14 @@ this.GridView490.AllowDrop = true; this.GridView490.AllowUserToAddRows = false; this.GridView490.AllowUserToResizeRows = false; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, 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.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle23.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle23; this.GridView490.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView490.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text490a, @@ -1601,8 +1603,8 @@ this.GridView490.Name = "GridView490"; this.GridView490.RowHeadersVisible = false; this.GridView490.RowHeadersWidth = 30; - dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle24; this.GridView490.RowTemplate.Height = 23; this.GridView490.Size = new System.Drawing.Size(321, 71); this.GridView490.TabIndex = 247; @@ -2517,17 +2519,17 @@ this.lbl_ISBN.TabIndex = 33; this.lbl_ISBN.Text = "[]"; // - // lbl_BookList + // tbCustName // - this.lbl_BookList.AutoSize = true; - this.lbl_BookList.BackColor = System.Drawing.Color.LightGray; - this.lbl_BookList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lbl_BookList.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); - this.lbl_BookList.Location = new System.Drawing.Point(12, 12); - this.lbl_BookList.Name = "lbl_BookList"; - this.lbl_BookList.Size = new System.Drawing.Size(66, 21); - this.lbl_BookList.TabIndex = 33; - this.lbl_BookList.Text = " "; + this.tbCustName.BackColor = System.Drawing.Color.LightGray; + this.tbCustName.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); + this.tbCustName.Location = new System.Drawing.Point(309, 7); + this.tbCustName.Name = "tbCustName"; + this.tbCustName.Size = new System.Drawing.Size(161, 26); + this.tbCustName.TabIndex = 33; + this.tbCustName.Text = " "; + this.tbCustName.UseVisualStyleBackColor = false; + this.tbCustName.Click += new System.EventHandler(this.lbl_BookList_Click); // // checkBox4 // @@ -2540,15 +2542,41 @@ this.checkBox4.UseVisualStyleBackColor = true; this.checkBox4.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); // + // lbCustIDX + // + this.lbCustIDX.BackColor = System.Drawing.Color.LightGray; + this.lbCustIDX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbCustIDX.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); + this.lbCustIDX.Location = new System.Drawing.Point(476, 7); + this.lbCustIDX.Name = "lbCustIDX"; + this.lbCustIDX.Size = new System.Drawing.Size(60, 26); + this.lbCustIDX.TabIndex = 319; + this.lbCustIDX.Text = " "; + this.lbCustIDX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lbl_BookList + // + this.lbl_BookList.BackColor = System.Drawing.Color.LightGray; + this.lbl_BookList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lbl_BookList.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); + this.lbl_BookList.Location = new System.Drawing.Point(12, 7); + this.lbl_BookList.Name = "lbl_BookList"; + this.lbl_BookList.Size = new System.Drawing.Size(293, 26); + this.lbl_BookList.TabIndex = 320; + this.lbl_BookList.Text = " "; + this.lbl_BookList.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // Marc // 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(1808, 908); + this.Controls.Add(this.lbl_BookList); + this.Controls.Add(this.lbCustIDX); this.Controls.Add(this.checkBox3); this.Controls.Add(this.List_Book); - this.Controls.Add(this.lbl_BookList); + this.Controls.Add(this.tbCustName); this.Controls.Add(this.lbl_ISBN); this.Controls.Add(this.lbl_SaveData); this.Controls.Add(this.checkBox1); @@ -2840,11 +2868,13 @@ private System.Windows.Forms.DataGridViewTextBoxColumn user; private System.Windows.Forms.DataGridViewTextBoxColumn SaveDate; private System.Windows.Forms.Button btn_CopySelect; - public System.Windows.Forms.Label lbl_BookList; + public System.Windows.Forms.Button tbCustName; private System.Windows.Forms.DataGridViewTextBoxColumn text505n; private System.Windows.Forms.DataGridViewTextBoxColumn text505t; private System.Windows.Forms.DataGridViewTextBoxColumn text505d; private System.Windows.Forms.DataGridViewTextBoxColumn text505e; private System.Windows.Forms.CheckBox checkBox4; + public System.Windows.Forms.Label lbCustIDX; + public System.Windows.Forms.Label lbl_BookList; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.resx b/unimarc/unimarc/마크/Marc.resx index 890eca5..2e1874b 100644 --- a/unimarc/unimarc/마크/Marc.resx +++ b/unimarc/unimarc/마크/Marc.resx @@ -168,37 +168,38 @@ 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 + P87mU+ZvyRQDAAAAAElFTkSuQmCC