diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index ce414e3..1bddccb 100644 Binary files a/unimarc/.vs/WindowsFormsApp1/v16/.suo and b/unimarc/.vs/WindowsFormsApp1/v16/.suo differ diff --git a/unimarc/WindowsFormsApp1/Main.Designer.cs b/unimarc/WindowsFormsApp1/Main.Designer.cs index 6850036..47d4d7b 100644 --- a/unimarc/WindowsFormsApp1/Main.Designer.cs +++ b/unimarc/WindowsFormsApp1/Main.Designer.cs @@ -59,7 +59,7 @@ this.매출입금toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.매출조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.매출집계ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.매출미수금ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.매출장부ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.매출입금ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.마크ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -308,14 +308,14 @@ // 송금내역조회ToolStripMenuItem // this.송금내역조회ToolStripMenuItem.Name = "송금내역조회ToolStripMenuItem"; - this.송금내역조회ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.송금내역조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.송금내역조회ToolStripMenuItem.Text = "송금 내역 조회"; this.송금내역조회ToolStripMenuItem.Click += new System.EventHandler(this.송금내역조회ToolStripMenuItem_Click); // // 송금등록ToolStripMenuItem // this.송금등록ToolStripMenuItem.Name = "송금등록ToolStripMenuItem"; - this.송금등록ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.송금등록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.송금등록ToolStripMenuItem.Text = "송금 등록"; this.송금등록ToolStripMenuItem.Click += new System.EventHandler(this.송금등록ToolStripMenuItem_Click); // @@ -326,20 +326,20 @@ this.매입장부ToolStripMenuItem1, this.매입미결제ToolStripMenuItem}); this.매입장부ToolStripMenuItem.Name = "매입장부ToolStripMenuItem"; - this.매입장부ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.매입장부ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.매입장부ToolStripMenuItem.Text = "매입"; // // 매입집계ToolStripMenuItem // this.매입집계ToolStripMenuItem.Name = "매입집계ToolStripMenuItem"; - this.매입집계ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.매입집계ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.매입집계ToolStripMenuItem.Text = "매입 집계"; this.매입집계ToolStripMenuItem.Click += new System.EventHandler(this.매입집계ToolStripMenuItem_Click); // // 매입장부ToolStripMenuItem1 // this.매입장부ToolStripMenuItem1.Name = "매입장부ToolStripMenuItem1"; - this.매입장부ToolStripMenuItem1.Size = new System.Drawing.Size(138, 22); + this.매입장부ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.매입장부ToolStripMenuItem1.Text = "매입 장부"; this.매입장부ToolStripMenuItem1.Click += new System.EventHandler(this.매입장부ToolStripMenuItem1_Click); // @@ -347,7 +347,7 @@ // this.매입미결제ToolStripMenuItem.Enabled = false; this.매입미결제ToolStripMenuItem.Name = "매입미결제ToolStripMenuItem"; - this.매입미결제ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.매입미결제ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.매입미결제ToolStripMenuItem.Text = "매입 미결제"; this.매입미결제ToolStripMenuItem.Click += new System.EventHandler(this.매입미결제ToolStripMenuItem_Click); // @@ -358,51 +358,51 @@ this.매출입금toolStripMenuItem1, this.매출조회ToolStripMenuItem, this.매출집계ToolStripMenuItem1, - this.매출미수금ToolStripMenuItem}); + this.매출장부ToolStripMenuItem}); this.매출입력ToolStripMenuItem.Name = "매출입력ToolStripMenuItem"; - this.매출입력ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.매출입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.매출입력ToolStripMenuItem.Text = "매출"; // // 매출입력ToolStripMenuItem1 // this.매출입력ToolStripMenuItem1.Name = "매출입력ToolStripMenuItem1"; - this.매출입력ToolStripMenuItem1.Size = new System.Drawing.Size(138, 22); + this.매출입력ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.매출입력ToolStripMenuItem1.Text = "매출 입력"; this.매출입력ToolStripMenuItem1.Click += new System.EventHandler(this.매출입력ToolStripMenuItem1_Click); // // 매출입금toolStripMenuItem1 // this.매출입금toolStripMenuItem1.Name = "매출입금toolStripMenuItem1"; - this.매출입금toolStripMenuItem1.Size = new System.Drawing.Size(138, 22); + this.매출입금toolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.매출입금toolStripMenuItem1.Text = "매출 입금"; this.매출입금toolStripMenuItem1.Click += new System.EventHandler(this.매출입금toolStripMenuItem1_Click_1); // // 매출조회ToolStripMenuItem // this.매출조회ToolStripMenuItem.Name = "매출조회ToolStripMenuItem"; - this.매출조회ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.매출조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.매출조회ToolStripMenuItem.Text = "매출 조회"; this.매출조회ToolStripMenuItem.Click += new System.EventHandler(this.매출장부ToolStripMenuItem_Click); // // 매출집계ToolStripMenuItem1 // this.매출집계ToolStripMenuItem1.Name = "매출집계ToolStripMenuItem1"; - this.매출집계ToolStripMenuItem1.Size = new System.Drawing.Size(138, 22); + this.매출집계ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.매출집계ToolStripMenuItem1.Text = "매출 집계"; this.매출집계ToolStripMenuItem1.Click += new System.EventHandler(this.매출입금ToolStripMenuItem1_Click); // - // 매출미수금ToolStripMenuItem + // 매출장부ToolStripMenuItem // - this.매출미수금ToolStripMenuItem.Enabled = false; - this.매출미수금ToolStripMenuItem.Name = "매출미수금ToolStripMenuItem"; - this.매출미수금ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); - this.매출미수금ToolStripMenuItem.Text = "매출 미수금"; - this.매출미수금ToolStripMenuItem.Click += new System.EventHandler(this.매출미수금ToolStripMenuItem_Click); + this.매출장부ToolStripMenuItem.Enabled = false; + this.매출장부ToolStripMenuItem.Name = "매출장부ToolStripMenuItem"; + this.매출장부ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.매출장부ToolStripMenuItem.Text = "매출 장부"; + this.매출장부ToolStripMenuItem.Click += new System.EventHandler(this.매출미수금ToolStripMenuItem_Click); // // 매출입금ToolStripMenuItem // this.매출입금ToolStripMenuItem.Name = "매출입금ToolStripMenuItem"; - this.매출입금ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.매출입금ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.매출입금ToolStripMenuItem.Text = "계산서 관리"; this.매출입금ToolStripMenuItem.Click += new System.EventHandler(this.매출입금ToolStripMenuItem_Click); // @@ -992,7 +992,7 @@ private System.Windows.Forms.ToolStripMenuItem 매출입력ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 매출집계ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 매출조회ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 매출미수금ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 매출장부ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 마크ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 설정ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 단축키설정ToolStripMenuItem; diff --git a/unimarc/WindowsFormsApp1/Main.cs b/unimarc/WindowsFormsApp1/Main.cs index 709dbca..fcca880 100644 --- a/unimarc/WindowsFormsApp1/Main.cs +++ b/unimarc/WindowsFormsApp1/Main.cs @@ -356,6 +356,7 @@ namespace WindowsFormsApp1 Sales_Deposit Acc_sales_Deposit; Sales_Lookup Acc_sales_Book; Sales_Not_Pay Acc_sales_Not_Pay; + Sales_Book Acc_sales_book; Bill_manage Acc_bill_Manage; @@ -499,17 +500,17 @@ namespace WindowsFormsApp1 private void 매출미수금ToolStripMenuItem_Click(object sender, EventArgs e) { - if (Acc_sales_Not_Pay != null) + if (Acc_sales_book != null) { - Acc_sales_Not_Pay.Focus(); + Acc_sales_book.Focus(); } else { - Acc_sales_Not_Pay = new Sales_Not_Pay(this); - Acc_sales_Not_Pay.MdiParent = this; - Acc_sales_Not_Pay.WindowState = FormWindowState.Maximized; - Acc_sales_Not_Pay.FormClosed += (o, ea) => Acc_sales_Not_Pay = null; - Acc_sales_Not_Pay.Show(); + Acc_sales_book = new Sales_Book(this); + Acc_sales_book.MdiParent = this; + Acc_sales_book.WindowState = FormWindowState.Maximized; + Acc_sales_book.FormClosed += (o, ea) => Acc_sales_book = null; + Acc_sales_book.Show(); } } diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index 9d068ef..f7899f1 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 0849e15..4890980 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 90d05fa..d95ff7c 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/DesignTimeResolveAssemblyReferences.cache b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferences.cache index e7dc2d3..8360f99 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache index fcd75e6..f15d81d 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 66573a0..6568287 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 9d068ef..f7899f1 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 0849e15..4890980 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 90d05fa..d95ff7c 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/납품관리/Book_Lookup.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Book_Lookup.Designer.cs index 51ca326..aa3e3a6 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Book_Lookup.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Book_Lookup.Designer.cs @@ -28,9 +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(); this.panel1 = new System.Windows.Forms.Panel(); + this.lbl_idx = new System.Windows.Forms.Label(); this.tb_isbn = new System.Windows.Forms.TextBox(); this.tb_order_idx = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); @@ -78,7 +79,6 @@ this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.lbl_idx = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); @@ -120,6 +120,16 @@ this.panel1.Size = new System.Drawing.Size(648, 199); this.panel1.TabIndex = 0; // + // lbl_idx + // + this.lbl_idx.AutoSize = true; + this.lbl_idx.Location = new System.Drawing.Point(212, 10); + this.lbl_idx.Name = "lbl_idx"; + this.lbl_idx.Size = new System.Drawing.Size(62, 12); + this.lbl_idx.TabIndex = 2; + this.lbl_idx.Text = "idx 들어감"; + this.lbl_idx.Visible = false; + // // tb_isbn // this.tb_isbn.Location = new System.Drawing.Point(414, 7); @@ -509,14 +519,14 @@ this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.AllowUserToResizeColumns = false; this.dataGridView1.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column1, this.Column2, @@ -524,14 +534,14 @@ this.Column4, this.Column5, this.Column6}); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle4; this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridView1.Location = new System.Drawing.Point(9, 311); this.dataGridView1.Name = "dataGridView1"; @@ -574,16 +584,6 @@ this.Column6.Name = "Column6"; this.Column6.Width = 40; // - // lbl_idx - // - this.lbl_idx.AutoSize = true; - this.lbl_idx.Location = new System.Drawing.Point(212, 10); - this.lbl_idx.Name = "lbl_idx"; - this.lbl_idx.Size = new System.Drawing.Size(62, 12); - this.lbl_idx.TabIndex = 2; - this.lbl_idx.Text = "idx 들어감"; - this.lbl_idx.Visible = false; - // // Book_Lookup // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs index fa9275c..b1877a3 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Order_input.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Order_input.cs @@ -349,25 +349,6 @@ namespace WindowsFormsApp1.Delivery } private void btn_order_send_Click(object sender, EventArgs e) { - /* - List chkIdx = new List(); - for (int a = 0; a < dataGridView1.Rows.Count; a++) - { - if (dataGridView1.Rows[a].Cells["chk"].Value.ToString() == "O") { - chkIdx.Add(a); - } - } - - string pur = dataGridView1.Rows[chkIdx[0]].Cells["order"].Value.ToString(); - - for (int a = 0; a < chkIdx.Count; a++) - { - if (dataGridView1.Rows[chkIdx[a]].Cells["order"].Value.ToString() != pur) { - MessageBox.Show("주문처가 동일하지 않습니다!", "Error"); - return; - } - } - */ string Date = DateTime.Now.ToString("yyyy-MM-dd"); string Time = DateTime.Now.ToString("HH-mm-ss"); String_Text st = new String_Text(); diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Book.Designer.cs b/unimarc/WindowsFormsApp1/회계/Sales_Book.Designer.cs index be81b69..8966aac 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Book.Designer.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Book.Designer.cs @@ -29,12 +29,12 @@ namespace WindowsFormsApp1.회계 /// 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(); this.panel1 = new System.Windows.Forms.Panel(); this.tb_clt = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); @@ -157,14 +157,14 @@ namespace WindowsFormsApp1.회계 // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, 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.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.out_date, this.content, @@ -197,40 +197,40 @@ namespace WindowsFormsApp1.회계 // // count // - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.count.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.count.DefaultCellStyle = dataGridViewCellStyle8; this.count.HeaderText = "수량"; this.count.Name = "count"; this.count.Width = 40; // // out_per // - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.out_per.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.out_per.DefaultCellStyle = dataGridViewCellStyle9; this.out_per.HeaderText = "출고율"; this.out_per.Name = "out_per"; this.out_per.Width = 60; // // out_price // - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.out_price.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.out_price.DefaultCellStyle = dataGridViewCellStyle10; this.out_price.HeaderText = "매출금액"; this.out_price.Name = "out_price"; this.out_price.Width = 80; // // in_price // - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.in_price.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.in_price.DefaultCellStyle = dataGridViewCellStyle11; this.in_price.HeaderText = "입금액"; this.in_price.Name = "in_price"; this.in_price.Width = 80; // // now_money // - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.now_money.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.now_money.DefaultCellStyle = dataGridViewCellStyle12; this.now_money.HeaderText = "현잔액"; this.now_money.Name = "now_money"; this.now_money.Width = 80; diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Book.cs b/unimarc/WindowsFormsApp1/회계/Sales_Book.cs index 56ac766..30c42a0 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Book.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Book.cs @@ -13,6 +13,7 @@ namespace WindowsFormsApp1.회계 { public partial class Sales_Book : Form { + Main main; Sales_Deposit sd; Helper_DB db = new Helper_DB(); public string compidx; @@ -23,6 +24,12 @@ namespace WindowsFormsApp1.회계 sd = _sd; compidx = sd.compidx; } + public Sales_Book(Main _main) + { + InitializeComponent(); + main = _main; + compidx = main.com_idx; + } private void Sales_Book_Load(object sender, EventArgs e) { db.DBcon(); @@ -32,7 +39,7 @@ namespace WindowsFormsApp1.회계 dataGridView1.Rows.Clear(); // grid // [0]매출일자 / [1]내용 / [2]수량 / [3]출고율 / [4]매출금액 / [5]입금액 / [6]현잔액 / [7]비고 - string[] grid = { "", "", "", "", "", "", "", "" }; + string[] grid = { "", "", "", "", "", "", "0", "" }; // db // [0]매출일자 / [1]책이름 / [2]수량 / [3]출고율 / [4]매출금액 / [5]입금액 / [6]비고 / [7]입금구분 string Area = "`date`, `book_name`, `count`, `out_per`, `out_price`, `deposit`, `etc`, `gu`"; @@ -96,10 +103,10 @@ namespace WindowsFormsApp1.회계 } else if (!date_chk) { - set_remain(grid); + set_remain(grid, row); } } - private void set_remain(string[] grid) + private void set_remain(string[] grid, int row) { if (dataGridView1.Rows.Count <= 0) { string[] grid_base = { "이월미수금", "", "", "", "", "", "0", "" }; @@ -115,11 +122,20 @@ namespace WindowsFormsApp1.회계 { for(int a = 0; a < count; a++) { - if(a <= 0) { continue; } + if (dataGridView1.Rows[0].Cells["out_date"].Value.ToString() != "이월미수금") { + string[] grid_base = { "이월미수금", "", "", "", "", "", "0", "" }; + dataGridView1.Rows.Insert(0, grid_base); + count++; + } + + int money_idx = a - 1; + if (a - 1 < 1) { money_idx = 0; } + if (a < 1) { continue; } + int cout = Convert.ToInt32(dataGridView1.Rows[a].Cells["count"].Value.ToString()); int out_price = Convert.ToInt32(dataGridView1.Rows[a].Cells["out_price"].Value.ToString()); int in_price = Convert.ToInt32(dataGridView1.Rows[a].Cells["in_price"].Value.ToString()); - int money = Convert.ToInt32(dataGridView1.Rows[a - 1].Cells["now_money"].Value.ToString()); + int money = Convert.ToInt32(dataGridView1.Rows[money_idx].Cells["now_money"].Value.ToString()); set_total(cout, out_price, in_price); @@ -183,14 +199,13 @@ namespace WindowsFormsApp1.회계 dataGridView1.Rows[row].Cells["content"].Value.ToString() == "입금 카드" || dataGridView1.Rows[row].Cells["content"].Value.ToString() == "입금 현금" || dataGridView1.Rows[row].Cells["content"].Value.ToString() == "입금 어음") { return; } - Sales_Detail sde = new Sales_Detail(this); string out_date = dataGridView1.Rows[e.RowIndex].Cells["out_date"].Value.ToString().Substring(0, 10).Replace("-", ""); int yesr = Convert.ToInt32(out_date.Substring(0, 4)); int month = Convert.ToInt32(out_date.Substring(4, 2)); int day = Convert.ToInt32(out_date.Substring(6, 2)); - // sde.MdiParent = main; - sde.WindowState = FormWindowState.Maximized; + sde.MdiParent = main; + // sde.WindowState = FormWindowState.Maximized; sde.Out_Date.Value = new DateTime(yesr, month, day); sde.tb_clt.Text = tb_clt.Text; sde.Show(); diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Deposit.cs b/unimarc/WindowsFormsApp1/회계/Sales_Deposit.cs index 41da354..7ee0948 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Deposit.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Deposit.cs @@ -270,7 +270,7 @@ namespace WindowsFormsApp1.Account dataGridView1.Columns[6].HeaderText = "기간잔고"; dataGridView1.Columns[7].HeaderText = "최종잔고"; } - // btn_Lookup_Click(null, null); + btn_Lookup_Click(null, null); } private void btn_Close_Click(object sender, EventArgs e) { @@ -284,6 +284,7 @@ namespace WindowsFormsApp1.Account } private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { + if (rb_Date.Checked) return; if (e.RowIndex < 0) { return; } Sales_Book sb = new Sales_Book(this); sb.row = e.RowIndex; diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Detail.Designer.cs b/unimarc/WindowsFormsApp1/회계/Sales_Detail.Designer.cs index 13b2d8d..d82eba6 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Detail.Designer.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Detail.Designer.cs @@ -29,13 +29,26 @@ namespace WindowsFormsApp1.회계 /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.tb_clt = new System.Windows.Forms.TextBox(); this.Out_Date = new System.Windows.Forms.DateTimePicker(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.idx = 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(); + this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.out_per = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.in_per = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.out_price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.in_price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox(); @@ -55,19 +68,7 @@ namespace WindowsFormsApp1.회계 this.btn_save = new System.Windows.Forms.Button(); this.tb_out_per = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); - this.idx = 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(); - this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.out_per = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.in_per = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.out_price = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.in_price = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_lookup = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); @@ -124,14 +125,14 @@ namespace WindowsFormsApp1.회계 // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, this.book_name, @@ -155,6 +156,82 @@ namespace WindowsFormsApp1.회계 this.dataGridView1.TabIndex = 83; this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; + // + // book_name + // + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + this.book_name.Width = 250; + // + // author + // + this.author.HeaderText = "저자"; + this.author.Name = "author"; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + // + // price + // + this.price.HeaderText = "정가"; + this.price.Name = "price"; + this.price.Width = 70; + // + // count + // + this.count.HeaderText = "수량"; + this.count.Name = "count"; + this.count.Width = 50; + // + // out_per + // + this.out_per.HeaderText = "O%"; + this.out_per.Name = "out_per"; + this.out_per.Width = 40; + // + // in_per + // + this.in_per.HeaderText = "I%"; + this.in_per.Name = "in_per"; + this.in_per.Width = 40; + // + // list_date + // + this.list_date.HeaderText = "목록일자"; + this.list_date.Name = "list_date"; + this.list_date.Width = 80; + // + // list_name + // + this.list_name.HeaderText = "목록명"; + this.list_name.Name = "list_name"; + this.list_name.Width = 170; + // + // out_price + // + this.out_price.HeaderText = "출고가"; + this.out_price.Name = "out_price"; + this.out_price.Width = 80; + // + // in_price + // + this.in_price.HeaderText = "입고가"; + this.in_price.Name = "in_price"; + this.in_price.Width = 80; + // + // etc + // + this.etc.HeaderText = "비고"; + this.etc.Name = "etc"; + this.etc.Width = 130; + // // textBox1 // this.textBox1.Enabled = false; @@ -305,6 +382,7 @@ namespace WindowsFormsApp1.회계 this.tb_out_per.Name = "tb_out_per"; this.tb_out_per.Size = new System.Drawing.Size(53, 21); this.tb_out_per.TabIndex = 86; + this.tb_out_per.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_out_per_KeyDown); this.tb_out_per.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_out_per_KeyPress); // // label3 @@ -316,81 +394,15 @@ namespace WindowsFormsApp1.회계 this.label3.TabIndex = 0; this.label3.Text = "할인율"; // - // idx + // btn_lookup // - this.idx.HeaderText = "idx"; - this.idx.Name = "idx"; - this.idx.Visible = false; - // - // book_name - // - this.book_name.HeaderText = "도서명"; - this.book_name.Name = "book_name"; - this.book_name.Width = 250; - // - // author - // - this.author.HeaderText = "저자"; - this.author.Name = "author"; - // - // book_comp - // - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - // - // price - // - this.price.HeaderText = "정가"; - this.price.Name = "price"; - this.price.Width = 70; - // - // count - // - this.count.HeaderText = "수량"; - this.count.Name = "count"; - this.count.Width = 50; - // - // out_per - // - this.out_per.HeaderText = "O%"; - this.out_per.Name = "out_per"; - this.out_per.Width = 40; - // - // in_per - // - this.in_per.HeaderText = "I%"; - this.in_per.Name = "in_per"; - this.in_per.Width = 40; - // - // list_date - // - this.list_date.HeaderText = "목록일자"; - this.list_date.Name = "list_date"; - this.list_date.Width = 80; - // - // list_name - // - this.list_name.HeaderText = "목록명"; - this.list_name.Name = "list_name"; - this.list_name.Width = 170; - // - // out_price - // - this.out_price.HeaderText = "출고가"; - this.out_price.Name = "out_price"; - this.out_price.Width = 80; - // - // in_price - // - this.in_price.HeaderText = "입고가"; - this.in_price.Name = "in_price"; - this.in_price.Width = 80; - // - // etc - // - this.etc.HeaderText = "비고"; - this.etc.Name = "etc"; - this.etc.Width = 130; + this.btn_lookup.Location = new System.Drawing.Point(493, 35); + this.btn_lookup.Name = "btn_lookup"; + this.btn_lookup.Size = new System.Drawing.Size(75, 23); + this.btn_lookup.TabIndex = 85; + this.btn_lookup.Text = "조 회"; + this.btn_lookup.UseVisualStyleBackColor = true; + this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); // // Sales_Detail // @@ -398,6 +410,7 @@ namespace WindowsFormsApp1.회계 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1266, 518); this.Controls.Add(this.tb_out_per); + this.Controls.Add(this.btn_lookup); this.Controls.Add(this.btn_save); this.Controls.Add(this.label3); this.Controls.Add(this.btn_close); @@ -469,5 +482,6 @@ namespace WindowsFormsApp1.회계 private System.Windows.Forms.DataGridViewTextBoxColumn out_price; private System.Windows.Forms.DataGridViewTextBoxColumn in_price; private System.Windows.Forms.DataGridViewTextBoxColumn etc; + private System.Windows.Forms.Button btn_lookup; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Detail.cs b/unimarc/WindowsFormsApp1/회계/Sales_Detail.cs index 8d27b1b..cd04ff0 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Detail.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Detail.cs @@ -15,6 +15,7 @@ namespace WindowsFormsApp1.회계 { public string compidx; Helper_DB db = new Helper_DB(); + Main main; Sales_Book sb; Sales_Lookup sl; public Sales_Detail(Sales_Book _sb) @@ -23,6 +24,11 @@ namespace WindowsFormsApp1.회계 sb = _sb; compidx = sb.compidx; } + public Sales_Detail(Main _main) + { + InitializeComponent(); + main = _main; + } public Sales_Detail(Sales_Lookup _sl) { InitializeComponent(); @@ -33,40 +39,7 @@ namespace WindowsFormsApp1.회계 { db.DBcon(); - string area = "`idx`, `book_name`, `author`, `book_comp`, `price`, " + - "`count`, `out_per`, `in_per`, `list_date`, `list_name`, " + - "`out_price`, `in_price`, `etc`"; - - string[] search_col = { "compidx", "date", "client" }; - string[] search_data = { compidx, Out_Date.Value.ToString().Substring(0, 10), tb_clt.Text }; - string db_data = db.More_DB_Search("Sales", search_col, search_data, area); - string[] ary = db_data.Split('|'); - input_grid(ary); - } - void input_grid(string[] db_data) - { - string[] grid = { "", "", "", "", "", - "", "", "", "", "", - "", "", "" }; - int cnt = 13; - for (int a = 0; a < db_data.Length; a++) - { - if (a % cnt == 0) { grid[0] = db_data[a]; } - if (a % cnt == 1) { grid[1] = db_data[a]; } - if (a % cnt == 2) { grid[2] = db_data[a]; } - if (a % cnt == 3) { grid[3] = db_data[a]; } - if (a % cnt == 4) { grid[4] = db_data[a]; } - if (a % cnt == 5) { grid[5] = db_data[a]; } - if (a % cnt == 6) { grid[6] = db_data[a]; } - if (a % cnt == 7) { grid[7] = db_data[a]; } - if (a % cnt == 8) { grid[8] = db_data[a]; } - if (a % cnt == 9) { grid[9] = db_data[a]; } - if (a % cnt == 10) { grid[10] = db_data[a]; } - if (a % cnt == 11) { grid[11] = db_data[a]; } - if (a % cnt == 12) { grid[12] = db_data[a]; - dataGridView1.Rows.Add(grid); - } - } + btn_lookup_Click(null, null); } private void btn_per_change_Click(object sender, EventArgs e) { @@ -89,13 +62,73 @@ namespace WindowsFormsApp1.회계 int res = Convert.ToInt32(res_do); dataGridView1.Rows[row].Cells["out_price"].Value = res.ToString(); } + private void btn_lookup_Click(object sender, EventArgs e) + { + dataGridView1.Rows.Clear(); + string area = "`idx`, `book_name`, `author`, `book_comp`, `price`, " + + "`count`, `out_per`, `in_per`, `list_date`, `list_name`, " + + "`out_price`, `in_price`, `etc`"; + + string[] search_col = { "compidx", "date", "client" }; + string[] search_data = { compidx, Out_Date.Value.ToString().Substring(0, 10), tb_clt.Text }; + string db_data = db.More_DB_Search("Sales", search_col, search_data, area); + string[] ary = db_data.Split('|'); + input_grid(ary); + } + void input_grid(string[] db_data) + { + string[] grid = { "", "", "", "", "", + "", "", "", "", "", + "", "", "" }; + int cnt = 13; + for (int a = 0; a < db_data.Length; a++) + { + if (a % cnt == 0) { grid[0] = db_data[a]; } + if (a % cnt == 1) { grid[1] = db_data[a]; } + if (a % cnt == 2) { grid[2] = db_data[a]; } + if (a % cnt == 3) { grid[3] = db_data[a]; } + if (a % cnt == 4) { grid[4] = db_data[a]; } + if (a % cnt == 5) { grid[5] = db_data[a]; } + if (a % cnt == 6) { grid[6] = db_data[a]; } + if (a % cnt == 7) { grid[7] = db_data[a]; } + if (a % cnt == 8) { grid[8] = db_data[a]; } + if (a % cnt == 9) { grid[9] = db_data[a]; } + if (a % cnt == 10) { grid[10] = db_data[a]; } + if (a % cnt == 11) { grid[11] = db_data[a]; } + if (a % cnt == 12) + { + grid[12] = db_data[a]; + dataGridView1.Rows.Add(grid); + } + } + } private void btn_save_Click(object sender, EventArgs e) { + if(MessageBox.Show("저장하시겠습니까?", "저장", MessageBoxButtons.YesNo) == DialogResult.No) { + return; + } + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + string[] search_col = { "idx", "compidx" }; + string[] search_data = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(), compidx }; + string[] edit_col = { "out_per", "out_price" }; + string[] edit_data = { dataGridView1.Rows[a].Cells["out_per"].Value.ToString(), + dataGridView1.Rows[a].Cells["out_price"].Value.ToString() }; + db.More_Update("Sales", edit_col, edit_data, search_col, search_data); + } + MessageBox.Show("저장되었습니다.", "저장", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void btn_delete_Click(object sender, EventArgs e) { - + if (MessageBox.Show("삭제하시겠습니까?", "삭제", MessageBoxButtons.YesNo) == DialogResult.No) { + return; + } + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + db.DB_Delete("Sales", "compidx", compidx, "idx", dataGridView1.Rows[a].Cells["idx"].Value.ToString()); + } + MessageBox.Show("삭제되었습니다.", "삭제", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void btn_close_Click(object sender, EventArgs e) { @@ -111,6 +144,13 @@ namespace WindowsFormsApp1.회계 String_Text st = new String_Text(); st.Only_Int(sender, e); } + + private void tb_out_per_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) { + btn_per_change_Click(null, null); + } + } } } // 목록일자 + " " + 납품처 diff --git a/unimarc/unimarc/Debug/unimarc.msi b/unimarc/unimarc/Debug/unimarc.msi index 4dba890..4a0a771 100644 Binary files a/unimarc/unimarc/Debug/unimarc.msi and b/unimarc/unimarc/Debug/unimarc.msi differ diff --git a/unimarc/unimarc/unimarc.vdproj b/unimarc/unimarc/unimarc.vdproj index 14f9362..a4ab9c1 100644 --- a/unimarc/unimarc/unimarc.vdproj +++ b/unimarc/unimarc/unimarc.vdproj @@ -22,7 +22,7 @@ "Entry" { "MsmKey" = "8:_001D416150A2355AEE369A7D961F735F" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -34,13 +34,13 @@ "Entry" { "MsmKey" = "8:_015C7FC2579570BF1EEDC0F6726C7521" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_028A2ED6F1FB6536AD0681A833F34CE5" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -58,91 +58,91 @@ "Entry" { "MsmKey" = "8:_047071E32C0E797EBEBD022C6E881E4C" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_057B34E4DB1DFF5B1ECCFFCE61E742CA" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_07CF13DAA7371A0C9E960A15EBA73A92" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_07DC850D6E146DEA2D202C749D69B27D" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_07F47DD461E3644DE10EBC6FD1B77607" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_089469DA234DFC3414FCF45E9C46FA63" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0CE9FEBD666F6D8D28214974A4690C04" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0D3B95DB55D7D37D0669527E65755F7D" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0DC00A1761BEA0E35D43F252D5F002FF" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_10B8AE2D6E642D2DFCF2E4C2C96D793D" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_12576CE10AE023355B443DDE5275201B" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_13E253474BC6FE232F3900E9755E0007" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_19C76E4F3C3D3512E080F5F9A9090FDC" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_1C7A7FAD549EA1FA3B37C1E4A392FC82" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_1F688FFFAC6C82AD4DDC4814E3BDC60A" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -154,43 +154,43 @@ "Entry" { "MsmKey" = "8:_3262307A2EAC22A10CA11BAAE0AAEA70" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_32FB2E140B51B69DF2CB20C6CAE6731C" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_33B4D711E7791CC56A57C9B419266A8E" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_33F1D49D655E0BC23C0850ED0A7CFE0A" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_36F7EAA432DB76A2093F6344E2B4A82C" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_3748E55500964F65E1379F080158E310" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_3999D436FA61B323E479B3D0573376AF" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -202,7 +202,7 @@ "Entry" { "MsmKey" = "8:_3A18404D6ADC1AFAE66D04C3A9625CE6" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -214,97 +214,97 @@ "Entry" { "MsmKey" = "8:_421387BA65DC30024F90F6087F7F0008" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42171CE5E891BB11F64E84433568EAFD" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_459C3BABDC2AC56BBD74900F4B3B5D2F" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_45B5C94F2D4B7EC8B71DB782F26436C4" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_49DD3DC63BBBD2DC2B85A10E65147311" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_4E504796387DC2D781431FC06877405F" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_507FC2BF026B8099E89271A951851FF3" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_55726D42B941211F0121A893BEFF5AE3" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5834456CD94E1FF994037B4CFE5FB6F2" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5861CA5031FC995368D8DEA38472E3D7" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_59101A1AD60B4AFCC30AED3F1A90F7C9" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5BEBC3FC2DCD657C10F67137073D545D" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5E2BBD6A6DFE0622385C9945D1F9ECBA" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5FAF629E4023736C41829B9A3A1AAB41" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_600A092D932B77F6409A2B4AD153D886" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_639C004C677797B83E4407C3472AA745" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -334,7 +334,7 @@ "Entry" { "MsmKey" = "8:_67B3BAF3A11E3F8FE5184F11A4F84DA5" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -352,37 +352,37 @@ "Entry" { "MsmKey" = "8:_681C7688D1C1693A77B7B11D91D24FBA" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_6F7A0B94D8AE1C5B1360A8A635155C23" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7018454A69E3C9A0704B1D82F576533B" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_716CB8E3126231BA85E89BC0B71059D4" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_72F47E30A61B6CD357CCA3170433CEDF" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_75BD8D30213E0DB34A7B8B7BCCB84329" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -394,25 +394,31 @@ "Entry" { "MsmKey" = "8:_75E312D843698E7DE72A774A27CBDEFE" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_780AD002FBC9AF29C4EBEB34D9D74ACA" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_79FFE6B72E362807DB42671E92207BAD" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7ABB2B81716CAEA458DCE9D036653490" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -430,31 +436,31 @@ "Entry" { "MsmKey" = "8:_7E9576BAF5432B85EE67D8E00B63B76B" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8109181D8F6DE852A8D0998B751E5DF2" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_81A1B10DBF1C355A1FF093EA608FE488" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8272463C852F8DA44AA8A726254524F4" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_83316D6C462C1466B6849AB26562FD81" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -466,61 +472,61 @@ "Entry" { "MsmKey" = "8:_887FCE0B29694D0FEEDBE73B58903544" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_88CEC0962F4633F0F97CC0299DB49F05" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_88D8733416B5F6985067EC48457585EE" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8D37195979F7A4B439A83A70A8D49A36" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8F8895A9A78400EB14AC0891D7FB1707" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9611F0BB2C07D45490DC34862D69CF98" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_972CF986D39E43BAA48594B702DDD068" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_97BB16793A50D31B0E83016098231328" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9A4A8C2F2ADD54E80C31E5771681A797" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9B6056CB75EF1BC60DE0834C07AD783F" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -532,19 +538,19 @@ "Entry" { "MsmKey" = "8:_9EDAAEEEC759C734AE1F573C6279DB3E" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9F34B53FC5EB70987CEB596911A7D16B" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9F59CCC1F01FDB930467A7E22F26A0CB" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -556,25 +562,25 @@ "Entry" { "MsmKey" = "8:_9F733AE54CFFC50785D33B4A9704B3E5" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9FAE9F821925C3014547993C375B3E9E" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_A1D62BC4E90EB13D13B52EF696912EF0" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_A40F452F3210334298F81F02C814F43E" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -598,73 +604,73 @@ "Entry" { "MsmKey" = "8:_A66A90E2D2EB8E717B92404B335F9975" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ABCF155477AD163B2A4FF80C947C99F9" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ACD9CEF841EFA6B462E02A031D70BCDF" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_AD9E8DDB5E6C37A341E77FD9092E48F2" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ADD85FDF45178A2640084967B858CE8F" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_B4C05544052A1709EEABED1B0B6D08E4" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_B75FC7734F563260D8E3F9A0A0D4566C" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_BA2B720B9BFD919DBEBFD26DB6345F58" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_BBE80AC20E89D64E21B20AC986AAA32D" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_BD94266735939B578EDC8D27C7C1720D" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C26CC85E81B3FBDD11CFFB45327EF671" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C2AF530AB4696A54F7ACD84A6FA75F3C" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -676,7 +682,7 @@ "Entry" { "MsmKey" = "8:_C48F9D543D4025BD236364D7E82E7A25" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -688,43 +694,37 @@ "Entry" { "MsmKey" = "8:_C5F316796D51D3FB2EDC4A68F45DA645" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C6ED1DD8D329AF08A8F8B2B216D164CC" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C73E48094BC649FCA6994724123D4F11" - "OwnerKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C74289BF935BA4538CD7578877BE6C2D" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C93E8CB0368E7BBAB30EE7FEC4B867F9" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_CE9BAC0361AC2FD57821F2915F2E414C" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_D0541BEDF2F6A1AA7112AAA69D9CB995" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -736,19 +736,19 @@ "Entry" { "MsmKey" = "8:_D2A40A3A8C935BB0644F6CFECE539899" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_D40485C9B6765A2866D3C71EE56BAF7C" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_D677201FB496DEC2B90E2815551DE470" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -760,55 +760,55 @@ "Entry" { "MsmKey" = "8:_D752DC2A97BE66CF93CA222B64FD43FB" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DB2E6C0EA1C1B181A25B6DAEEA956F0E" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DB7B4BDB51A9577871D2ECAAFCA7752E" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DCCCEEFFC3C954F20F64E3B65BEAC290" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DD34E92D9B35E215DF2E0241986AEECB" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DD6CFCD9ACC99AEF3B8807A75C873C13" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E1633E3F553A7391FAE9079940F93D52" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E5E831E112A7208BC330BC1207007AF4" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E74E4B6BF9D29A5DB41F25028C9DB751" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -820,55 +820,55 @@ "Entry" { "MsmKey" = "8:_E760C38B0FD4D325F7BADB03ACD09A69" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E91828B2631D7D15C90C20B0AD3BB321" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EB0FE5491BFA6F1EB78E2CBB164DA5D3" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ED3F4EF3AE297F16A362739C80AE42F5" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ED670026055FD5A403F97836FB091815" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EDA9DDFD3DFCD43E48125C8880BAF7C1" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EEFFADE13EF3DB790B64C383DB910893" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_F0D9FB37EF1C0F27C8A2530094552C2C" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_F15E644F02E1953F48A05C89D0509357" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -880,25 +880,25 @@ "Entry" { "MsmKey" = "8:_F6E293644B4F174936F48E42D24E4CAA" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_F886A334BC7C63BA89874677271B4B82" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_FAEFBE38F879F4807F8A236CEAA6F016" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_FB2AA4D59FE1E9770DE547206F9F4720" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -910,7 +910,7 @@ "Entry" { "MsmKey" = "8:_FFFABE2BE7370227C86B5E78B443B53F" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -922,7 +922,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -5952,7 +5952,7 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_234B009C94C0433D9A1D76EFE2DE1685" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FD8672170BFC4456B238700ABD7159B1" { "Name" = "8:unimarc" "Arguments" = "8:" @@ -5960,7 +5960,7 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_C73E48094BC649FCA6994724123D4F11" + "Target" = "8:_7626463629FA4C4CBF6FF818DE4EB2DE" "Folder" = "8:_963D93D6C7184251B8C6C3F785E5957D" "WorkingFolder" = "8:_078186B71DE04C3EBEFD790918AC5E76" "Icon" = "8:" @@ -6365,7 +6365,7 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C73E48094BC649FCA6994724123D4F11" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7626463629FA4C4CBF6FF818DE4EB2DE" { "SourcePath" = "8:..\\WindowsFormsApp1\\obj\\Debug\\WindowsFormsApp1.exe" "TargetName" = "8:"