diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index eea00bb..d052eab 100644 Binary files a/unimarc/.vs/WindowsFormsApp1/v16/.suo and b/unimarc/.vs/WindowsFormsApp1/v16/.suo differ diff --git a/unimarc/WindowsFormsApp1/Login.Designer.cs b/unimarc/WindowsFormsApp1/Login.Designer.cs index 47ee9b9..4a52b47 100644 --- a/unimarc/WindowsFormsApp1/Login.Designer.cs +++ b/unimarc/WindowsFormsApp1/Login.Designer.cs @@ -43,6 +43,7 @@ this.ID_text.Name = "ID_text"; this.ID_text.Size = new System.Drawing.Size(100, 21); this.ID_text.TabIndex = 1; + this.ID_text.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ID_text_KeyDown); // // PW_text // diff --git a/unimarc/WindowsFormsApp1/Login.cs b/unimarc/WindowsFormsApp1/Login.cs index 245fd52..6d8bd34 100644 --- a/unimarc/WindowsFormsApp1/Login.cs +++ b/unimarc/WindowsFormsApp1/Login.cs @@ -66,5 +66,12 @@ namespace WindowsFormsApp1 PW_text.Text = "admin"; button1_Click(null, null); } + private void ID_text_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + PW_text.Focus(); + } + } } } diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index c35246f..066eacf 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe and b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb index 72c8efb..e2d204c 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb and b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll index 86b9a9a..21b7707 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache index a49cb3d..ad8ba04 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache index e5a9a1e..081cb15 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe index c35246f..066eacf 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb index 72c8efb..e2d204c 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll index 86b9a9a..21b7707 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.Designer.cs index 20ee290..877bcf8 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.Designer.cs @@ -46,11 +46,6 @@ this.tb_count = new System.Windows.Forms.TextBox(); this.btn_Lookup = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.btn_Save = new System.Windows.Forms.Button(); - this.btn_Close = new System.Windows.Forms.Button(); - this.btn_Add = new System.Windows.Forms.Button(); - this.btn_Edit = new System.Windows.Forms.Button(); - this.btn_list_in_stock = new System.Windows.Forms.Button(); this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -59,6 +54,11 @@ this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.order = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Order_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_Save = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.btn_Add = new System.Windows.Forms.Button(); + this.btn_Edit = new System.Windows.Forms.Button(); + this.btn_list_in_stock = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // @@ -159,6 +159,8 @@ this.tb_pay.Name = "tb_pay"; this.tb_pay.Size = new System.Drawing.Size(201, 21); this.tb_pay.TabIndex = 4; + this.tb_pay.TextChanged += new System.EventHandler(this.tb_pay_TextChanged); + this.tb_pay.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_pay_KeyPress); // // tb_order // @@ -221,6 +223,56 @@ this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // + // ISBN + // + this.ISBN.HeaderText = "ISBN"; + this.ISBN.Name = "ISBN"; + this.ISBN.ReadOnly = true; + // + // book_name + // + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + this.book_name.ReadOnly = true; + this.book_name.Width = 250; + // + // author + // + this.author.HeaderText = "저자"; + this.author.Name = "author"; + this.author.ReadOnly = true; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.ReadOnly = true; + // + // pay + // + this.pay.HeaderText = "정가"; + this.pay.Name = "pay"; + this.pay.ReadOnly = true; + // + // count + // + this.count.HeaderText = "수량"; + this.count.Name = "count"; + this.count.ReadOnly = true; + this.count.Width = 60; + // + // order + // + this.order.HeaderText = "매입처명"; + this.order.Name = "order"; + this.order.ReadOnly = true; + // + // Order_date + // + this.Order_date.HeaderText = "주문일자"; + this.Order_date.Name = "Order_date"; + this.Order_date.ReadOnly = true; + // // btn_Save // this.btn_Save.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -276,61 +328,11 @@ this.btn_list_in_stock.UseVisualStyleBackColor = true; this.btn_list_in_stock.Click += new System.EventHandler(this.btn_list_in_stock_Click); // - // ISBN - // - this.ISBN.HeaderText = "ISBN"; - this.ISBN.Name = "ISBN"; - this.ISBN.ReadOnly = true; - // - // book_name - // - this.book_name.HeaderText = "도서명"; - this.book_name.Name = "book_name"; - this.book_name.ReadOnly = true; - this.book_name.Width = 250; - // - // author - // - this.author.HeaderText = "저자"; - this.author.Name = "author"; - this.author.ReadOnly = true; - // - // book_comp - // - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - this.book_comp.ReadOnly = true; - // - // pay - // - this.pay.HeaderText = "정가"; - this.pay.Name = "pay"; - this.pay.ReadOnly = true; - // - // count - // - this.count.HeaderText = "수량"; - this.count.Name = "count"; - this.count.ReadOnly = true; - this.count.Width = 60; - // - // order - // - this.order.HeaderText = "매입처명"; - this.order.Name = "order"; - this.order.ReadOnly = true; - // - // Order_date - // - this.Order_date.HeaderText = "주문일자"; - this.Order_date.Name = "Order_date"; - this.Order_date.ReadOnly = true; - // // Input_Lookup_Stock // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1040, 433); + this.ClientSize = new System.Drawing.Size(979, 433); this.Controls.Add(this.btn_list_in_stock); this.Controls.Add(this.btn_Edit); this.Controls.Add(this.dataGridView1); diff --git a/unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.cs b/unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.cs index 5d85d8d..71cf081 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.cs @@ -216,7 +216,16 @@ namespace WindowsFormsApp1.Delivery { if (e.KeyCode == Keys.Up) { rowidx--; } if (e.KeyCode == Keys.Down) { rowidx++; } - + } + private void tb_pay_TextChanged(object sender, EventArgs e) + { + String_Text st = new String_Text(); + st.Int_Comma(sender, e); + } + private void tb_pay_KeyPress(object sender, KeyPressEventArgs e) + { + String_Text st = new String_Text(); + st.Only_Int(sender, e); } } } diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs index c93e9a8..6245331 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs @@ -28,9 +28,9 @@ /// private void InitializeComponent() { - 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 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(); this.label1 = new System.Windows.Forms.Label(); this.tb_search_order = new System.Windows.Forms.TextBox(); this.cb_user = new System.Windows.Forms.ComboBox(); @@ -417,14 +417,14 @@ // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; - 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.False; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + 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.False; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.chk, this.order, @@ -442,24 +442,24 @@ this.order_date, this.send_date, this.num}); - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.Location = new System.Drawing.Point(9, 142); this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; + 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; + this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.RowHeadersWidth = 10; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; @@ -597,7 +597,7 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(184, 9); + this.label13.Location = new System.Drawing.Point(185, 9); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(41, 12); this.label13.TabIndex = 0; diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs index 86b27cd..508e94e 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs @@ -64,7 +64,7 @@ namespace WindowsFormsApp1.Delivery // 보기 구분 string[] order = { "주문중", "미주문", "전체" }; cb_order.Items.AddRange(order); - cb_order.SelectedIndex = 0; + cb_order.SelectedIndex = 1; // 주문서 구분 string[] order_send = { "팩스", "메일" }; @@ -149,6 +149,8 @@ namespace WindowsFormsApp1.Delivery } } } + // 색입히는 함수 기입 + PrintColor_Grid(); } /// /// 작업명단 검색중 상위 텍스트박스 및 콤보박스의 값에 따라 출력할지 안할지 분류. @@ -175,13 +177,27 @@ namespace WindowsFormsApp1.Delivery if (cb_state.SelectedIndex == 0) { // TODO: 입고 상태 체크해야함. (방법 찾아볼것) } - if (cb_order.SelectedIndex == 2) { - if(strValues[12] == "") { + if (cb_order.SelectedIndex == 0) { + if(strValues[13] == "") { + return false; + } + } + else if(cb_order.SelectedIndex == 1) { + if (strValues[13] != "") { return false; } } return true; } + private void PrintColor_Grid() + { + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["order_date"].Value.ToString() != "") { + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.FromArgb(223, 223, 240); + } + } + } private void tb_search_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) { diff --git a/unimarc/WindowsFormsApp1/회계/Purchase_Book.cs b/unimarc/WindowsFormsApp1/회계/Purchase_Book.cs index 7ed7857..4ce202f 100644 --- a/unimarc/WindowsFormsApp1/회계/Purchase_Book.cs +++ b/unimarc/WindowsFormsApp1/회계/Purchase_Book.cs @@ -83,9 +83,9 @@ namespace WindowsFormsApp1.Account if (DateTime.Parse(str_start) <= DateTime.Parse(grid[0]) && DateTime.Parse(str_end) >= DateTime.Parse(grid[0])) { - string[] account = {"이월미수금", "", "", "", "", - "", grid[6], ""}; - if (dataGridView1.Rows.Count==0) { + string[] account = { "이월미수금", "", "", "", "", + "", grid[6], "" }; + if (dataGridView1.Rows.Count == 0) { account[6] = String.Format("{0:#,###}", Convert.ToInt32(account[6])); dataGridView1.Rows.Add(account); chk_ac = true;