diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index b6442e5..ced3790 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 3969723..250e18a 100644 --- a/unimarc/WindowsFormsApp1/Main.Designer.cs +++ b/unimarc/WindowsFormsApp1/Main.Designer.cs @@ -42,11 +42,11 @@ 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(); 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(); this.송금내역조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.송금등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -56,8 +56,8 @@ this.매입미결제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.매출입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.매출입력ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - 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(); @@ -124,6 +124,7 @@ this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); + this.매출입금toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -254,14 +255,6 @@ this.주문입력ToolStripMenuItem.Text = "주문입력"; this.주문입력ToolStripMenuItem.Click += new System.EventHandler(this.주문입력ToolStripMenuItem_Click); // - // 예가조회ToolStripMenuItem - // - 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.Enabled = false; @@ -292,6 +285,14 @@ this.재고입력및조회ToolStripMenuItem.Text = "재고입력 및 조회"; this.재고입력및조회ToolStripMenuItem.Click += new System.EventHandler(this.재고입력및조회ToolStripMenuItem_Click); // + // 예가조회ToolStripMenuItem + // + 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.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -307,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); // @@ -325,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); // @@ -346,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); // @@ -354,46 +355,47 @@ // this.매출입력ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.매출입력ToolStripMenuItem1, - this.매출입금ToolStripMenuItem1, - this.매출장부ToolStripMenuItem, + this.매출입금toolStripMenuItem1, + this.매출조회ToolStripMenuItem, + 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 = "매출"; // // 매출입력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 + // 매출집계ToolStripMenuItem1 // - this.매출입금ToolStripMenuItem1.Name = "매출입금ToolStripMenuItem1"; - this.매출입금ToolStripMenuItem1.Size = new System.Drawing.Size(138, 22); - this.매출입금ToolStripMenuItem1.Text = "매출 입금"; - this.매출입금ToolStripMenuItem1.Click += new System.EventHandler(this.매출입금ToolStripMenuItem1_Click); + this.매출집계ToolStripMenuItem1.Name = "매출집계ToolStripMenuItem1"; + 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.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.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.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); // // 매출입금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); // @@ -419,7 +421,7 @@ this.불용어ToolStripMenuItem, this.작업지시서ToolStripMenuItem}); this.설정ToolStripMenuItem.Name = "설정ToolStripMenuItem"; - this.설정ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.설정ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.설정ToolStripMenuItem.Text = "설정"; // // 단축키설정ToolStripMenuItem @@ -458,7 +460,7 @@ this.엑셀작성ToolStripMenuItem, this.iSBN조회ToolStripMenuItem}); this.마크작업ToolStripMenuItem.Name = "마크작업ToolStripMenuItem"; - this.마크작업ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.마크작업ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.마크작업ToolStripMenuItem.Text = "마크 작업"; // // 마크목록ToolStripMenuItem @@ -495,7 +497,7 @@ this.반입ToolStripMenuItem, this.반출ToolStripMenuItem}); this.반입및반출ToolStripMenuItem.Name = "반입및반출ToolStripMenuItem"; - this.반입및반출ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.반입및반출ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.반입및반출ToolStripMenuItem.Text = "반입 및 반출"; // // 반입ToolStripMenuItem @@ -518,7 +520,7 @@ this.복본조사ToolStripMenuItem1, this.dLS복본조사ToolStripMenuItem}); this.복본조사ToolStripMenuItem.Name = "복본조사ToolStripMenuItem"; - this.복본조사ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.복본조사ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.복본조사ToolStripMenuItem.Text = "복본 조사"; // // 복본조사ToolStripMenuItem1 @@ -543,7 +545,7 @@ this.검수ToolStripMenuItem, this.저자기호ToolStripMenuItem}); this.부가기능ToolStripMenuItem.Name = "부가기능ToolStripMenuItem"; - this.부가기능ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.부가기능ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.부가기능ToolStripMenuItem.Text = "부가기능"; // // 마크수집ToolStripMenuItem @@ -580,7 +582,7 @@ this.dLS조회ToolStripMenuItem, this.dLS입력ToolStripMenuItem}); this.dLSToolStripMenuItem.Name = "dLSToolStripMenuItem"; - this.dLSToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.dLSToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.dLSToolStripMenuItem.Text = "DLS"; // // dLS조회ToolStripMenuItem @@ -604,7 +606,7 @@ this.마크통계ToolStripMenuItem, this.장비관리ToolStripMenuItem1}); this.기타ToolStripMenuItem.Name = "기타ToolStripMenuItem"; - this.기타ToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.기타ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.기타ToolStripMenuItem.Text = "기타"; // // 서류작성ToolStripMenuItem @@ -928,6 +930,13 @@ this.toolStripLabel1.Size = new System.Drawing.Size(88, 22); this.toolStripLabel1.Text = "toolStripLabel1"; // + // 매출입금toolStripMenuItem1 + // + this.매출입금toolStripMenuItem1.Name = "매출입금toolStripMenuItem1"; + this.매출입금toolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.매출입금toolStripMenuItem1.Text = "매출 입금"; + this.매출입금toolStripMenuItem1.Click += new System.EventHandler(this.매출입금toolStripMenuItem1_Click_1); + // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -981,8 +990,8 @@ private System.Windows.Forms.ToolStripMenuItem 매입집계ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 매입미결제ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 매출입력ToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem 매출입금ToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem 매출장부ToolStripMenuItem; + 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; @@ -1050,5 +1059,6 @@ private System.Windows.Forms.Button button12; private System.Windows.Forms.Button button11; private System.Windows.Forms.OpenFileDialog openFileDialog1; + private System.Windows.Forms.ToolStripMenuItem 매출입금toolStripMenuItem1; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/Main.cs b/unimarc/WindowsFormsApp1/Main.cs index 2e20816..8a47c3b 100644 --- a/unimarc/WindowsFormsApp1/Main.cs +++ b/unimarc/WindowsFormsApp1/Main.cs @@ -19,6 +19,7 @@ using WindowsFormsApp1.Work_log; using WindowsFormsApp1.마크; using System.IO; +using WindowsFormsApp1.회계; namespace WindowsFormsApp1 { @@ -351,6 +352,7 @@ namespace WindowsFormsApp1 Purchase_Aggregation Acc_purchase_Aggregation; Purchase_not_pay Acc_purchase_Not_Pay; Sales_Input Acc_sales_Input; + Sales_In_Pay Acc_sales_In_Pay; Sales_Deposit Acc_sales_Deposit; Sales_Book Acc_sales_Book; Sales_Not_Pay Acc_sales_Not_Pay; @@ -450,7 +452,19 @@ namespace WindowsFormsApp1 Acc_sales_Input.Show(); } } - + private void 매출입금toolStripMenuItem1_Click_1(object sender, EventArgs e) + { + if (Acc_sales_In_Pay != null) + { + Acc_sales_In_Pay.Focus(); + } + else + { + Acc_sales_In_Pay = new Sales_In_Pay(this); + Acc_sales_In_Pay.FormClosed += (o, ea) => Acc_sales_In_Pay = null; + Acc_sales_In_Pay.Show(); + } + } private void 매출입금ToolStripMenuItem1_Click(object sender, EventArgs e) { if (Acc_sales_Deposit != null) @@ -1190,5 +1204,6 @@ namespace WindowsFormsApp1 fax.Send_BaroFax(filename, "", ""); */ } + } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/WindowsFormsApp1.csproj b/unimarc/WindowsFormsApp1/WindowsFormsApp1.csproj index 716336f..e683363 100644 --- a/unimarc/WindowsFormsApp1/WindowsFormsApp1.csproj +++ b/unimarc/WindowsFormsApp1/WindowsFormsApp1.csproj @@ -211,6 +211,12 @@ Remit_reg.cs + + Form + + + Sales_In_Pay.cs + Form @@ -648,6 +654,9 @@ Remit_reg.cs + + Sales_In_Pay.cs + Sales_Not_Pay.cs diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index 31d56b5..a851e9a 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 af612a0..095ba83 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 daa3d5f..bbeda95 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.CoreCompileInputs.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.CoreCompileInputs.cache index 56d85a9..5261f6a 100644 --- a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.CoreCompileInputs.cache +++ b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -31638290a3c75b4ec84290b2c00f026a8e6e2c75 +bb86ab82b0cfd7ad35e01e13af8660f9dfc7ed7d diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt index d3dbd74..a42fbbb 100644 --- a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt +++ b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.FileListAbsolute.txt @@ -377,3 +377,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\Window C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.마크.Search_Infor_Sub.resources C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.csprojAssemblyReference.cache C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.납품관리.Order_Send_Chk.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\WindowsFormsApp1\obj\Debug\WindowsFormsApp1.회계.Sales_In_Pay.resources diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache index 86659e9..d6e8787 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 55bbc3d..3b33fac 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 31d56b5..a851e9a 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 af612a0..095ba83 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/WindowsFormsApp1.회계.Sales_In_Pay.resources b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.회계.Sales_In_Pay.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.회계.Sales_In_Pay.resources differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll index daa3d5f..bbeda95 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/납품관리/Commodity_Search.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_Search.cs index 84dc271..4633d6d 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_Search.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_Search.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using WindowsFormsApp1.Account; using WindowsFormsApp1.Home; +using WindowsFormsApp1.회계; namespace WindowsFormsApp1.Delivery { @@ -21,6 +22,7 @@ namespace WindowsFormsApp1.Delivery List_aggregation la; Sales_Input si; Sales_Book sb; + Sales_In_Pay sip; public Commodity_Search(Purchase _pur) { InitializeComponent(); @@ -51,6 +53,11 @@ namespace WindowsFormsApp1.Delivery InitializeComponent(); sb = _sb; } + public Commodity_Search(Sales_In_Pay _sip) + { + InitializeComponent(); + sip = _sip; + } #region 거래처 가져오는 폼의 코드 @@ -126,6 +133,7 @@ namespace WindowsFormsApp1.Delivery if (la != null) { la.tb_clt.Text = ""; compidx = la.compidx; } if (si != null) { si.tb_clt.Text = ""; compidx = si.compidx; } if (sb != null) { sb.tb_clt.Text = ""; compidx = sb.compidx; } + if (sip != null) { sip.tb_clt.Text = ""; compidx = sip.compidx; } return compidx; } @@ -136,7 +144,8 @@ namespace WindowsFormsApp1.Delivery if (pur != null) { pur.tb_clt.Text = value; } if (la != null) { la.tb_clt.Text = value; } if (si != null) { si.tb_clt.Text = value; si.lbl_tel.Text = dataGridView1.Rows[idx].Cells[2].Value.ToString(); } - if (sb != null) { sb.tb_clt.Text = value; } + if (sb != null) { sb.tb_clt.Text = value; sb.btn_Lookup_Click(null, null); } + if (sip != null) { sip.tb_clt.Text = value; } } } } diff --git a/unimarc/WindowsFormsApp1/회계/Purchase_Aggregation.cs b/unimarc/WindowsFormsApp1/회계/Purchase_Aggregation.cs index 9ee5ea4..b49b465 100644 --- a/unimarc/WindowsFormsApp1/회계/Purchase_Aggregation.cs +++ b/unimarc/WindowsFormsApp1/회계/Purchase_Aggregation.cs @@ -100,7 +100,7 @@ namespace WindowsFormsApp1.Account pay += Convert.ToInt32(grid[5]); int total = buy - pay; grid[6] = total.ToString(); - + if(chk_grid == true) { if (dataGridView1.Rows.Count > 0) { if (case_up(grid) == false) { @@ -113,7 +113,7 @@ namespace WindowsFormsApp1.Account } } // 0.거래처명 1.이월미수금 2.건수 3.권수 4.매입금액 5.결제금액 6.기간잔고 7.최종잔고 8.매입일자(H) - else if (radioButton2.Checked == true || radioButton3.Checked == true || radioButton4.Checked == true){ + else if (radioButton2.Checked == true || radioButton3.Checked == true || radioButton4.Checked == true) { string msg = ""; int chk_idx = over_chk(grid); if (chk_idx >= 0) { @@ -129,7 +129,7 @@ namespace WindowsFormsApp1.Account grid = ex_handling(grid); } else { - grid[1] = "0"; + grid[1] = "0"; grid[7] = chk_final(grid).ToString(); } for(int a = 0; a < grid.Length; a++) diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Book.Designer.cs b/unimarc/WindowsFormsApp1/회계/Sales_Book.Designer.cs index c96b539..160ca61 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Book.Designer.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Book.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.End_Date = new System.Windows.Forms.DateTimePicker(); this.Start_Date = new System.Windows.Forms.DateTimePicker(); this.label2 = new System.Windows.Forms.Label(); @@ -39,8 +39,6 @@ this.btn_Lookup = new System.Windows.Forms.Button(); this.btn_Close = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.panel1 = new System.Windows.Forms.Panel(); - this.label4 = new System.Windows.Forms.Label(); this.out_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clt = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tel = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -53,6 +51,8 @@ this.out_price = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dif = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label4 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -141,14 +141,14 @@ // 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; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.out_date, this.clt, @@ -169,33 +169,7 @@ this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.Size = new System.Drawing.Size(1151, 421); this.dataGridView1.TabIndex = 82; - // - // panel1 - // - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.label4); - this.panel1.Controls.Add(this.label2); - this.panel1.Controls.Add(this.Start_Date); - this.panel1.Controls.Add(this.btn_Close); - this.panel1.Controls.Add(this.End_Date); - this.panel1.Controls.Add(this.btn_Lookup); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.textBox2); - this.panel1.Controls.Add(this.tb_clt); - this.panel1.Controls.Add(this.label3); - this.panel1.Location = new System.Drawing.Point(12, 12); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1051, 40); - this.panel1.TabIndex = 83; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(157, 13); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(14, 12); - this.label4.TabIndex = 37; - this.label4.Text = "~"; + this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); // // out_date // @@ -267,6 +241,33 @@ this.etc.HeaderText = "비고"; this.etc.Name = "etc"; // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.Start_Date); + this.panel1.Controls.Add(this.btn_Close); + this.panel1.Controls.Add(this.End_Date); + this.panel1.Controls.Add(this.btn_Lookup); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.textBox2); + this.panel1.Controls.Add(this.tb_clt); + this.panel1.Controls.Add(this.label3); + this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1051, 40); + this.panel1.TabIndex = 83; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(157, 13); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(14, 12); + this.label4.TabIndex = 37; + this.label4.Text = "~"; + // // Sales_Book // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -275,7 +276,7 @@ this.Controls.Add(this.panel1); this.Controls.Add(this.dataGridView1); this.Name = "Sales_Book"; - this.Text = "매출장부"; + this.Text = " 매출 조회"; this.Load += new System.EventHandler(this.Sales_Book_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel1.ResumeLayout(false); @@ -292,7 +293,6 @@ private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button btn_Lookup; private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.DataGridView dataGridView1; private System.Windows.Forms.Panel panel1; @@ -310,5 +310,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn out_price; private System.Windows.Forms.DataGridViewTextBoxColumn dif; private System.Windows.Forms.DataGridViewTextBoxColumn etc; + public System.Windows.Forms.Button btn_Lookup; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Book.cs b/unimarc/WindowsFormsApp1/회계/Sales_Book.cs index f4d9986..f3bea0a 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Book.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Book.cs @@ -27,10 +27,12 @@ namespace WindowsFormsApp1.Account private void Sales_Book_Load(object sender, EventArgs e) { db.DBcon(); + Start_Date.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); } - private void btn_Lookup_Click(object sender, EventArgs e) + public void btn_Lookup_Click(object sender, EventArgs e) { - string table = "`date`, `client`, `tel`, `book_name`, `in_per`, `out_per`, `total`, `etc`"; + string table = "`date`, `client`, `tel`, `book_name`, `in_per`, " + + "`out_per`, `in_price`, `out_price`, `total`, `etc`"; string start = Start_Date.Text.Substring(0, 10); string end = End_Date.Text.Substring(0, 10); @@ -45,10 +47,10 @@ namespace WindowsFormsApp1.Account "", "", "", "", "", "" }; string[] data = { "", "", "", "", "", - "", "", "" }; + "", "", "", "", "" }; string[] ary = value.Split('|'); - int cot = 8; + int cot = 10; for(int a = 0; a < ary.Length; a++) { if (a % cot == 0) { data[0] = ary[a]; } @@ -58,43 +60,34 @@ namespace WindowsFormsApp1.Account if (a % cot == 4) { data[4] = ary[a]; } if (a % cot == 5) { data[5] = ary[a]; } if (a % cot == 6) { data[6] = ary[a]; } - if (a % cot == 7) { data[7] = ary[a]; + if (a % cot == 7) { data[7] = ary[a]; } + if (a % cot == 8) { data[8] = ary[a]; } + if (a % cot == 9) { data[9] = ary[a]; + if (tb_clt.Text != "") + { + if (data[1] != tb_clt.Text) { continue; } + } grid_data_check(grid, data); } } - } private void grid_data_check(string[] grid, string[] data) { /* data: 0.출고일자 / 1.거래처 / 2.전화번호 / 3.내용 / 4.입고율 / - * 5.출고율 / 6.합계 / 7.비고 + * 5.출고율 / 6.입고금액 / 7.출고금액 / 8.합계 / 9.비고 + * * * grid: 0.조회기간 / 1.거래처 / 2.전화번호 / 3.내용 / 4.수량 / * 5.총합계 / 6.입고율 / 7.출고율 / 8.매입금액 / 9.매출금액 / 10.차이 / 11.비고 + * + * out_date / clt / tel / content / count / + * total / in_per / out_per / in_price / out_price / dif / etc */ + if (data[3] == "" && data[5] == "0") { return; } - // TODO: 진행해야함 0511 if (dataGridView1.Rows.Count <= 0) { - int in_per = Convert.ToInt32(data[4]); - int out_per = Convert.ToInt32(data[5]); - int total = Convert.ToInt32(data[6]); - - grid[0] = data[0]; - grid[1] = data[1]; - grid[2] = data[2]; - grid[3] = data[4]; - grid[4] = "1"; - grid[5] = total.ToString(); - grid[6] = data[4]; - grid[7] = data[5]; - grid[8] = persent(in_per, total).ToString(); - grid[9] = persent(out_per, total).ToString(); - int dif = Convert.ToInt32(grid[8]) - Convert.ToInt32(grid[9]); - grid[10] = dif.ToString(); - grid[11] = data[7]; - - dataGridView1.Rows.Add(grid); + base_Setting(grid, data); return; } @@ -108,18 +101,50 @@ namespace WindowsFormsApp1.Account int total = Convert.ToInt32(dataGridView1.Rows[a].Cells["total"].Value.ToString()); int in_per = Convert.ToInt32(dataGridView1.Rows[a].Cells["in_per"].Value.ToString()); int out_per = Convert.ToInt32(dataGridView1.Rows[a].Cells["out_per"].Value.ToString()); - - count++; - total = total + Convert.ToInt32(data[6]); + count++; + total = total + Convert.ToInt32(data[8]); + in_per = (in_per + Convert.ToInt32(data[4])) / count; + out_per = (out_per + Convert.ToInt32(data[5])) / count; + int in_price = persent(in_per, total); + int out_price = persent(out_per, total); + int dif = out_price - in_price; - dataGridView1.Rows[a].Cells["content"].Value = data[4]; + dataGridView1.Rows[a].Cells["content"].Value = data[3]; dataGridView1.Rows[a].Cells["count"].Value = count.ToString(); dataGridView1.Rows[a].Cells["total"].Value = total.ToString(); + dataGridView1.Rows[a].Cells["in_per"].Value = in_per.ToString(); + dataGridView1.Rows[a].Cells["out_per"].Value = out_per.ToString(); + dataGridView1.Rows[a].Cells["in_price"].Value = in_price.ToString(); + dataGridView1.Rows[a].Cells["out_price"].Value = out_price.ToString(); + dataGridView1.Rows[a].Cells["dif"].Value = dif.ToString(); + return; + } + else + { + base_Setting(grid, data); + return; } } + } + private void base_Setting(string[] grid, string[] data) + { + grid[0] = data[0]; + grid[1] = data[1]; + grid[2] = data[2]; + grid[3] = data[3]; + grid[4] = "1"; + grid[5] = data[8]; + grid[6] = data[4]; + grid[7] = data[5]; + grid[8] = data[6]; + grid[9] = data[7]; + int dif = Convert.ToInt32(grid[9]) - Convert.ToInt32(grid[8]); + grid[10] = dif.ToString(); + grid[11] = data[9]; - + dataGridView1.Rows.Add(grid); + return; } private int persent(int per, int total) { @@ -137,6 +162,9 @@ namespace WindowsFormsApp1.Account cs.Show(); } } + private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + { + } } } diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Deposit.Designer.cs b/unimarc/WindowsFormsApp1/회계/Sales_Deposit.Designer.cs index 0f159fb..841a9b0 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Deposit.Designer.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Deposit.Designer.cs @@ -28,250 +28,320 @@ /// private void InitializeComponent() { - this.textBox1 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); - this.label1 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.panel1 = new System.Windows.Forms.Panel(); + this.rb_clt = new System.Windows.Forms.RadioButton(); + this.rb_Date = new System.Windows.Forms.RadioButton(); this.label4 = new System.Windows.Forms.Label(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.button1 = new System.Windows.Forms.Button(); - this.label5 = new System.Windows.Forms.Label(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); - this.dateTimePicker3 = new System.Windows.Forms.DateTimePicker(); - this.button5 = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.Start_Date = new System.Windows.Forms.DateTimePicker(); + this.btn_Close = new System.Windows.Forms.Button(); + this.End_Date = new System.Windows.Forms.DateTimePicker(); + this.btn_Lookup = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid0 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.tb_grid1 = new System.Windows.Forms.TextBox(); + this.tb_grid2 = new System.Windows.Forms.TextBox(); + this.tb_grid3 = new System.Windows.Forms.TextBox(); + this.tb_grid4 = new System.Windows.Forms.TextBox(); + this.tb_grid5 = new System.Windows.Forms.TextBox(); + this.tb_grid6 = new System.Windows.Forms.TextBox(); + this.tb_grid7 = new System.Windows.Forms.TextBox(); + this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // - // textBox1 + // panel1 // - this.textBox1.Location = new System.Drawing.Point(354, 36); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(145, 21); - this.textBox1.TabIndex = 70; + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.rb_clt); + this.panel1.Controls.Add(this.rb_Date); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.Start_Date); + this.panel1.Controls.Add(this.btn_Close); + this.panel1.Controls.Add(this.End_Date); + this.panel1.Controls.Add(this.btn_Lookup); + this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(691, 40); + this.panel1.TabIndex = 84; // - // label2 + // rb_clt // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(283, 40); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(65, 12); - this.label2.TabIndex = 69; - this.label2.Text = "매출거래처"; + this.rb_clt.AutoSize = true; + this.rb_clt.Location = new System.Drawing.Point(377, 12); + this.rb_clt.Name = "rb_clt"; + this.rb_clt.Size = new System.Drawing.Size(71, 16); + this.rb_clt.TabIndex = 82; + this.rb_clt.TabStop = true; + this.rb_clt.Text = "거래처별"; + this.rb_clt.UseVisualStyleBackColor = true; + this.rb_clt.CheckedChanged += new System.EventHandler(this.radio_Button_CheckedChanged); // - // dateTimePicker1 + // rb_Date // - this.dateTimePicker1.CustomFormat = "yyyy-MM-dd"; - this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateTimePicker1.Location = new System.Drawing.Point(91, 36); - this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(85, 21); - this.dateTimePicker1.TabIndex = 67; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(32, 40); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(53, 12); - this.label1.TabIndex = 66; - this.label1.Text = "입금일자"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(32, 67); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(49, 12); - this.label3.TabIndex = 69; - this.label3.Text = "입 금 액"; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(91, 63); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(145, 21); - this.textBox2.TabIndex = 70; + this.rb_Date.AutoSize = true; + this.rb_Date.Location = new System.Drawing.Point(309, 12); + this.rb_Date.Name = "rb_Date"; + this.rb_Date.Size = new System.Drawing.Size(59, 16); + this.rb_Date.TabIndex = 82; + this.rb_Date.TabStop = true; + this.rb_Date.Text = "일자별"; + this.rb_Date.UseVisualStyleBackColor = true; + this.rb_Date.CheckedChanged += new System.EventHandler(this.radio_Button_CheckedChanged); // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(295, 67); + this.label4.Location = new System.Drawing.Point(161, 13); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(53, 12); - this.label4.TabIndex = 69; - this.label4.Text = "입금구분"; + this.label4.Size = new System.Drawing.Size(14, 12); + this.label4.TabIndex = 37; + this.label4.Text = "~"; // - // comboBox1 + // label2 // - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(354, 63); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(121, 20); - this.comboBox1.TabIndex = 71; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(13, 13); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.TabIndex = 37; + this.label2.Text = "조회기간"; // - // button1 + // Start_Date // - this.button1.Location = new System.Drawing.Point(535, 61); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(78, 23); - this.button1.TabIndex = 72; - this.button1.Text = "계산서 입력"; - this.button1.UseVisualStyleBackColor = true; + this.Start_Date.CustomFormat = "yyyy-MM-dd"; + this.Start_Date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.Start_Date.Location = new System.Drawing.Point(70, 9); + this.Start_Date.Name = "Start_Date"; + this.Start_Date.Size = new System.Drawing.Size(85, 21); + this.Start_Date.TabIndex = 38; // - // label5 + // btn_Close // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(32, 94); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(49, 12); - this.label5.TabIndex = 69; - this.label5.Text = "비 고"; + this.btn_Close.Location = new System.Drawing.Point(598, 8); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(75, 23); + this.btn_Close.TabIndex = 81; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); // - // textBox3 + // End_Date // - this.textBox3.Location = new System.Drawing.Point(91, 90); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(408, 21); - this.textBox3.TabIndex = 70; + this.End_Date.CustomFormat = "yyyy-MM-dd"; + this.End_Date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.End_Date.Location = new System.Drawing.Point(181, 9); + this.End_Date.Name = "End_Date"; + this.End_Date.Size = new System.Drawing.Size(85, 21); + this.End_Date.TabIndex = 39; // - // button2 + // btn_Lookup // - this.button2.Location = new System.Drawing.Point(34, 126); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(78, 23); - this.button2.TabIndex = 72; - this.button2.Text = "추 가"; - this.button2.UseVisualStyleBackColor = true; - // - // button3 - // - this.button3.Location = new System.Drawing.Point(118, 126); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(78, 23); - this.button3.TabIndex = 72; - this.button3.Text = "저 장"; - this.button3.UseVisualStyleBackColor = true; - // - // button4 - // - this.button4.Location = new System.Drawing.Point(202, 126); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(78, 23); - this.button4.TabIndex = 72; - this.button4.Text = "삭 제"; - this.button4.UseVisualStyleBackColor = true; - // - // dateTimePicker2 - // - this.dateTimePicker2.CustomFormat = "yyyy-MM-dd"; - this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateTimePicker2.Location = new System.Drawing.Point(297, 127); - this.dateTimePicker2.Name = "dateTimePicker2"; - this.dateTimePicker2.Size = new System.Drawing.Size(85, 21); - this.dateTimePicker2.TabIndex = 67; - // - // dateTimePicker3 - // - this.dateTimePicker3.CustomFormat = "yyyy-MM-dd"; - this.dateTimePicker3.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateTimePicker3.Location = new System.Drawing.Point(388, 127); - this.dateTimePicker3.Name = "dateTimePicker3"; - this.dateTimePicker3.Size = new System.Drawing.Size(85, 21); - this.dateTimePicker3.TabIndex = 67; - // - // button5 - // - this.button5.Location = new System.Drawing.Point(479, 126); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(78, 23); - this.button5.TabIndex = 72; - this.button5.Text = "조 회"; - this.button5.UseVisualStyleBackColor = true; + this.btn_Lookup.Location = new System.Drawing.Point(507, 8); + this.btn_Lookup.Name = "btn_Lookup"; + this.btn_Lookup.Size = new System.Drawing.Size(75, 23); + this.btn_Lookup.TabIndex = 79; + this.btn_Lookup.Text = "조 회"; + this.btn_Lookup.UseVisualStyleBackColor = true; + this.btn_Lookup.Click += new System.EventHandler(this.btn_Lookup_Click); // // dataGridView1 // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AllowUserToDeleteRows = false; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column1, - this.Column2, - this.Column3, - this.Column4, - this.Column5, - this.Column6}); - this.dataGridView1.Location = new System.Drawing.Point(34, 155); + this.Grid0, + this.Grid1, + this.Grid2, + this.Grid3, + this.Grid4, + this.Grid5, + this.Grid6, + this.Grid7}); + this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; + this.dataGridView1.Location = new System.Drawing.Point(12, 58); + this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowHeadersWidth = 20; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(654, 150); - this.dataGridView1.TabIndex = 73; + this.dataGridView1.Size = new System.Drawing.Size(691, 492); + this.dataGridView1.TabIndex = 85; // - // Column1 + // Grid0 // - this.Column1.HeaderText = "입금일자"; - this.Column1.Name = "Column1"; + this.Grid0.HeaderText = "거래처명"; + this.Grid0.Name = "Grid0"; // - // Column2 + // Grid1 // - this.Column2.HeaderText = "거래처"; - this.Column2.Name = "Column2"; + this.Grid1.HeaderText = "이월미수금"; + this.Grid1.Name = "Grid1"; + this.Grid1.Width = 90; // - // Column3 + // Grid2 // - this.Column3.HeaderText = "금액"; - this.Column3.Name = "Column3"; + this.Grid2.HeaderText = "건수"; + this.Grid2.Name = "Grid2"; + this.Grid2.Width = 50; // - // Column4 + // Grid3 // - this.Column4.HeaderText = "입금구분"; - this.Column4.Name = "Column4"; + this.Grid3.HeaderText = "권수"; + this.Grid3.Name = "Grid3"; + this.Grid3.Width = 50; // - // Column5 + // Grid4 // - this.Column5.HeaderText = "비고"; - this.Column5.Name = "Column5"; + this.Grid4.HeaderText = "매출금액"; + this.Grid4.Name = "Grid4"; + this.Grid4.Width = 90; // - // Column6 + // Grid5 // - this.Column6.HeaderText = "발행유무"; - this.Column6.Name = "Column6"; + this.Grid5.HeaderText = "입금액"; + this.Grid5.Name = "Grid5"; + this.Grid5.Width = 90; + // + // Grid6 + // + this.Grid6.HeaderText = "기간잔고"; + this.Grid6.Name = "Grid6"; + this.Grid6.Width = 90; + // + // Grid7 + // + this.Grid7.HeaderText = "최종잔고"; + this.Grid7.Name = "Grid7"; + this.Grid7.Width = 90; + // + // textBox1 + // + this.textBox1.Enabled = false; + this.textBox1.Location = new System.Drawing.Point(13, 556); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(20, 21); + this.textBox1.TabIndex = 86; + // + // textBox2 + // + this.textBox2.Enabled = false; + this.textBox2.Location = new System.Drawing.Point(33, 556); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(100, 21); + this.textBox2.TabIndex = 86; + this.textBox2.Text = "합계"; + this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tb_grid1 + // + this.tb_grid1.Enabled = false; + this.tb_grid1.Location = new System.Drawing.Point(133, 556); + this.tb_grid1.Name = "tb_grid1"; + this.tb_grid1.Size = new System.Drawing.Size(90, 21); + this.tb_grid1.TabIndex = 86; + this.tb_grid1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.tb_grid1.TextChanged += new System.EventHandler(this.tb_grid7_TextChanged); + // + // tb_grid2 + // + this.tb_grid2.Enabled = false; + this.tb_grid2.Location = new System.Drawing.Point(223, 556); + this.tb_grid2.Name = "tb_grid2"; + this.tb_grid2.Size = new System.Drawing.Size(50, 21); + this.tb_grid2.TabIndex = 86; + this.tb_grid2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.tb_grid2.TextChanged += new System.EventHandler(this.tb_grid7_TextChanged); + // + // tb_grid3 + // + this.tb_grid3.Enabled = false; + this.tb_grid3.Location = new System.Drawing.Point(273, 556); + this.tb_grid3.Name = "tb_grid3"; + this.tb_grid3.Size = new System.Drawing.Size(50, 21); + this.tb_grid3.TabIndex = 86; + this.tb_grid3.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.tb_grid3.TextChanged += new System.EventHandler(this.tb_grid7_TextChanged); + // + // tb_grid4 + // + this.tb_grid4.Enabled = false; + this.tb_grid4.Location = new System.Drawing.Point(323, 556); + this.tb_grid4.Name = "tb_grid4"; + this.tb_grid4.Size = new System.Drawing.Size(90, 21); + this.tb_grid4.TabIndex = 86; + this.tb_grid4.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.tb_grid4.TextChanged += new System.EventHandler(this.tb_grid7_TextChanged); + // + // tb_grid5 + // + this.tb_grid5.Enabled = false; + this.tb_grid5.Location = new System.Drawing.Point(413, 556); + this.tb_grid5.Name = "tb_grid5"; + this.tb_grid5.Size = new System.Drawing.Size(90, 21); + this.tb_grid5.TabIndex = 86; + this.tb_grid5.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.tb_grid5.TextChanged += new System.EventHandler(this.tb_grid7_TextChanged); + // + // tb_grid6 + // + this.tb_grid6.Enabled = false; + this.tb_grid6.Location = new System.Drawing.Point(503, 556); + this.tb_grid6.Name = "tb_grid6"; + this.tb_grid6.Size = new System.Drawing.Size(90, 21); + this.tb_grid6.TabIndex = 86; + this.tb_grid6.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.tb_grid6.TextChanged += new System.EventHandler(this.tb_grid7_TextChanged); + // + // tb_grid7 + // + this.tb_grid7.Enabled = false; + this.tb_grid7.Location = new System.Drawing.Point(593, 556); + this.tb_grid7.Name = "tb_grid7"; + this.tb_grid7.Size = new System.Drawing.Size(90, 21); + this.tb_grid7.TabIndex = 86; + this.tb_grid7.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.tb_grid7.TextChanged += new System.EventHandler(this.tb_grid7_TextChanged); // // Sales_Deposit // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.dataGridView1); - this.Controls.Add(this.button5); - this.Controls.Add(this.button4); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); - this.Controls.Add(this.comboBox1); - this.Controls.Add(this.textBox3); - this.Controls.Add(this.label5); + this.ClientSize = new System.Drawing.Size(715, 583); + this.Controls.Add(this.tb_grid7); + this.Controls.Add(this.tb_grid6); + this.Controls.Add(this.tb_grid5); + this.Controls.Add(this.tb_grid4); + this.Controls.Add(this.tb_grid3); + this.Controls.Add(this.tb_grid2); + this.Controls.Add(this.tb_grid1); this.Controls.Add(this.textBox2); - this.Controls.Add(this.label3); this.Controls.Add(this.textBox1); - this.Controls.Add(this.label4); - this.Controls.Add(this.label2); - this.Controls.Add(this.dateTimePicker3); - this.Controls.Add(this.dateTimePicker2); - this.Controls.Add(this.dateTimePicker1); - this.Controls.Add(this.label1); + this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.panel1); this.Name = "Sales_Deposit"; - this.Text = "매출입금"; + this.Text = "매출집계"; + this.Load += new System.EventHandler(this.Sales_Deposit_Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -280,29 +350,32 @@ #endregion - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.DateTimePicker dateTimePicker1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.RadioButton rb_clt; + private System.Windows.Forms.RadioButton rb_Date; private System.Windows.Forms.Label label4; - private System.Windows.Forms.ComboBox comboBox1; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; - private System.Windows.Forms.DateTimePicker dateTimePicker2; - private System.Windows.Forms.DateTimePicker dateTimePicker3; - private System.Windows.Forms.Button button5; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.DateTimePicker Start_Date; + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.DateTimePicker End_Date; + public System.Windows.Forms.Button btn_Lookup; private System.Windows.Forms.DataGridView dataGridView1; - private System.Windows.Forms.DataGridViewTextBoxColumn Column1; - private System.Windows.Forms.DataGridViewTextBoxColumn Column2; - private System.Windows.Forms.DataGridViewTextBoxColumn Column3; - private System.Windows.Forms.DataGridViewTextBoxColumn Column4; - private System.Windows.Forms.DataGridViewTextBoxColumn Column5; - private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Grid0; + private System.Windows.Forms.DataGridViewTextBoxColumn Grid1; + private System.Windows.Forms.DataGridViewTextBoxColumn Grid2; + private System.Windows.Forms.DataGridViewTextBoxColumn Grid3; + private System.Windows.Forms.DataGridViewTextBoxColumn Grid4; + private System.Windows.Forms.DataGridViewTextBoxColumn Grid5; + private System.Windows.Forms.DataGridViewTextBoxColumn Grid6; + private System.Windows.Forms.DataGridViewTextBoxColumn Grid7; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox tb_grid1; + private System.Windows.Forms.TextBox tb_grid2; + private System.Windows.Forms.TextBox tb_grid3; + private System.Windows.Forms.TextBox tb_grid4; + private System.Windows.Forms.TextBox tb_grid5; + private System.Windows.Forms.TextBox tb_grid6; + private System.Windows.Forms.TextBox tb_grid7; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Deposit.cs b/unimarc/WindowsFormsApp1/회계/Sales_Deposit.cs index 5977889..262e970 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Deposit.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Deposit.cs @@ -12,11 +12,264 @@ namespace WindowsFormsApp1.Account { public partial class Sales_Deposit : Form { + public string compidx; Main main; + Helper_DB db = new Helper_DB(); public Sales_Deposit(Main _main) { InitializeComponent(); main = _main; + compidx = main.com_idx; + } + private void Sales_Deposit_Load(object sender, EventArgs e) + { + db.DBcon(); + Start_Date.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); + rb_clt.Checked = true; + } + private void btn_Lookup_Click(object sender, EventArgs e) + { + dataGridView1.Rows.Clear(); + string[] grid = { "", "0", "0", "0", "0", "0", "0", "0" }; + string start = Start_Date.Text.Substring(0, 10); + string end = End_Date.Text.Substring(0, 10); + if (rb_Date.Checked) { + string Area = "`date`, `count`, `out_price`, `deposit`"; + string data_base = db.Search_Date("Sales", Area, "date", start, end, compidx); + + input_Grid_Date(grid, data_base); + } + else if (rb_clt.Checked) { + string Area = "`client`, `count`, `out_price`, `deposit`, `date`"; + string data_base = db.DB_Select_Search(Area, "Sales", "compidx", compidx); + input_Grid_Clt(grid, data_base); + } + Print_Total(); + } + #region btn_Lookup_Click_Sub + private void Print_Total() + { + int[] grid = { 0, 0, 0, 0, 0, 0, 0, 0 }; // [0]번은 버림. + + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (rb_clt.Checked) { // 1,7 계산 + grid[1] += Convert.ToInt32(dataGridView1.Rows[a].Cells["grid1"].Value.ToString()); + grid[7] += Convert.ToInt32(dataGridView1.Rows[a].Cells["grid7"].Value.ToString()); + } + grid[2] += Convert.ToInt32(dataGridView1.Rows[a].Cells["grid2"].Value.ToString()); + grid[3] += Convert.ToInt32(dataGridView1.Rows[a].Cells["grid3"].Value.ToString()); + grid[4] += Convert.ToInt32(dataGridView1.Rows[a].Cells["grid4"].Value.ToString()); + grid[5] += Convert.ToInt32(dataGridView1.Rows[a].Cells["grid5"].Value.ToString()); + grid[6] += Convert.ToInt32(dataGridView1.Rows[a].Cells["grid6"].Value.ToString()); + } + tb_grid1.Text = grid[1].ToString(); + tb_grid2.Text = grid[2].ToString(); + tb_grid3.Text = grid[3].ToString(); + tb_grid4.Text = grid[4].ToString(); + tb_grid5.Text = grid[5].ToString(); + tb_grid6.Text = grid[6].ToString(); + tb_grid7.Text = grid[7].ToString(); + } + #endregion + #region 라디오버튼 "일자별" 활성화 + private void input_Grid_Date(string[] grid, string value) + { + // grid + // [0]매출일자 / [1] / [2]건수 / [3]권수 / [4]매출금액 / [5]입금액 / [6]합계금액 / [7] / + // + // db + // [0]매출일자 / [1]권수 / [2]매출금액 / [3]입금액 + + string[] ary = value.Split('|'); + string[] db = { "", "", "", "" }; + int cot = 4; + for (int a = 0; a < ary.Length; a++) + { + if (a % cot == 0) { db[0] = ary[a]; } + if (a % cot == 1) { db[1] = ary[a]; } + if (a % cot == 2) { db[2] = ary[a]; } + if (a % cot == 3) { db[3] = ary[a]; + setting_grid_date(grid, db); + } + } + } + private void setting_grid_date(string[] grid, string[] db) + { + if (dataGridView1.Rows.Count <= 0) { + base_grid_date(grid, db); + return; + } + bool lap = false; + int row = 0; + for(int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["grid0"].Value.ToString() == db[0]) { + lap = true; + row = a; + } + } + if (lap) { + + int count = Convert.ToInt32(dataGridView1.Rows[row].Cells["grid2"].Value.ToString()); + int EA = Convert.ToInt32(dataGridView1.Rows[row].Cells["grid3"].Value.ToString()); + int sales = Convert.ToInt32(dataGridView1.Rows[row].Cells["grid4"].Value.ToString()); + int dep = Convert.ToInt32(dataGridView1.Rows[row].Cells["grid5"].Value.ToString()); + + count++; + EA += Convert.ToInt32(db[1]); + sales += Convert.ToInt32(db[2]); + dep += Convert.ToInt32(db[3]); + + int total = sales - dep; + + dataGridView1.Rows[row].Cells["grid2"].Value = count.ToString(); + dataGridView1.Rows[row].Cells["grid3"].Value = EA.ToString(); + dataGridView1.Rows[row].Cells["grid4"].Value = sales.ToString(); + dataGridView1.Rows[row].Cells["grid5"].Value = dep.ToString(); + dataGridView1.Rows[row].Cells["grid6"].Value = total.ToString(); + } + else { + base_grid_date(grid, db); + } + } + private void base_grid_date(string[] grid, string[] db) + { + int total = Convert.ToInt32(db[2]) - Convert.ToInt32(db[3]); + + grid[0] = db[0]; + grid[2] = "1"; + grid[3] = db[1]; + grid[4] = db[2]; + grid[5] = db[3]; + grid[6] = total.ToString(); + dataGridView1.Rows.Add(grid); + + return; + } + #endregion + #region 라디오버튼 "거래처별" 활성화 + private void input_Grid_Clt(string[] grid, string value) + { + // grid + // [0]거래처명 / [1]이월미수금 / [2]건수 / [3]권수 / [4]매출금액 / [5]입금액 / [6]기간잔고 / [7]최종잔고 / + // + // db + // [0]거래처명 / [1]권수 / [2]매출금액 / [3]입금액 / [4] 매출일자 + string[] ary = value.Split('|'); + string[] db = { "", "", "", "", "" }; + + for(int a= 0; a < ary.Length; a++) + { + if (a % 5 == 0) { db[0] = ary[a]; } + if (a % 5 == 1) { db[1] = ary[a]; } + if (a % 5 == 2) { db[2] = ary[a]; } + if (a % 5 == 3) { db[3] = ary[a]; } + if (a % 5 == 4) { db[4] = ary[a]; + setting_grid_Clt(grid, db); + } + } + } + private void setting_grid_Clt(string[] grid, string[] db) + { + + DateTime start = Start_Date.Value; + DateTime end = End_Date.Value; + DateTime sear = Convert.ToDateTime(db[4]); + bool date_chk = false; + bool chk = false; + + if (sear >= start && sear < end) { date_chk = true; } + if (sear > end) { return; } + + if (dataGridView1.Rows.Count <= 0) { + grid[0] = db[0]; + dataGridView1.Rows.Add(grid); + } + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["grid0"].Value.ToString() == db[0]) + { + if (!date_chk) + { + int sales = Convert.ToInt32(db[2]); + int dep = Convert.ToInt32(db[3]); + int remain = sales - dep; + + int _remain = Convert.ToInt32(dataGridView1.Rows[a].Cells["grid1"].Value.ToString()); + _remain += remain; + dataGridView1.Rows[a].Cells["grid1"].Value = _remain.ToString(); + } + else + { + int count = Convert.ToInt32(dataGridView1.Rows[a].Cells["grid2"].Value.ToString()); + int EA = Convert.ToInt32(dataGridView1.Rows[a].Cells["grid3"].Value.ToString()); + int sales = Convert.ToInt32(dataGridView1.Rows[a].Cells["grid4"].Value.ToString()); + int dep = Convert.ToInt32(dataGridView1.Rows[a].Cells["grid5"].Value.ToString()); + + count++; + EA += Convert.ToInt32(db[1]); + sales += Convert.ToInt32(db[2]); + dep += Convert.ToInt32(db[3]); + + int mid = sales - dep; + int fin = Convert.ToInt32(dataGridView1.Rows[a].Cells["grid1"].Value.ToString()) + mid; + + dataGridView1.Rows[a].Cells["grid2"].Value = count.ToString(); + dataGridView1.Rows[a].Cells["grid3"].Value = EA.ToString(); + dataGridView1.Rows[a].Cells["grid4"].Value = sales.ToString(); + dataGridView1.Rows[a].Cells["grid5"].Value = dep.ToString(); + dataGridView1.Rows[a].Cells["grid6"].Value = mid.ToString(); + dataGridView1.Rows[a].Cells["grid7"].Value = fin.ToString(); + } + } + else { chk = true; } + } + if (chk) + { + grid[0] = db[0]; + dataGridView1.Rows.Add(grid); + } + + } + #endregion + private void radio_Button_CheckedChanged(object sender, EventArgs e) + { + string text = ((RadioButton)sender).Text; + bool chk = ((RadioButton)sender).Checked; + + if (text == "일자별" && chk) { + dataGridView1.Columns[0].HeaderText = "매출일자"; + dataGridView1.Columns[1].HeaderText = ""; + dataGridView1.Columns[2].HeaderText = "건수"; + dataGridView1.Columns[3].HeaderText = "권수"; + dataGridView1.Columns[4].HeaderText = "매출금액"; + dataGridView1.Columns[5].HeaderText = "입금액"; + dataGridView1.Columns[6].HeaderText = "합계금액"; + dataGridView1.Columns[7].HeaderText = ""; + } + else if (text == "거래처별" && chk) + { + dataGridView1.Columns[0].HeaderText = "거래처명"; + dataGridView1.Columns[1].HeaderText = "이월미수금"; + dataGridView1.Columns[2].HeaderText = "건수"; + dataGridView1.Columns[3].HeaderText = "권수"; + dataGridView1.Columns[4].HeaderText = "매출금액"; + dataGridView1.Columns[5].HeaderText = "입금액"; + dataGridView1.Columns[6].HeaderText = "기간잔고"; + dataGridView1.Columns[7].HeaderText = "최종잔고"; + } + // btn_Lookup_Click(null, null); + } + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void tb_grid7_TextChanged(object sender, EventArgs e) + { + String_Text st = new String_Text(); + st.Int_Comma(sender, e); } } } diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Deposit.resx b/unimarc/WindowsFormsApp1/회계/Sales_Deposit.resx index b851021..451c161 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Deposit.resx +++ b/unimarc/WindowsFormsApp1/회계/Sales_Deposit.resx @@ -117,22 +117,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True - + True - + True - + + True + + + True + + True \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/회계/Sales_In_Pay.Designer.cs b/unimarc/WindowsFormsApp1/회계/Sales_In_Pay.Designer.cs new file mode 100644 index 0000000..1a1f955 --- /dev/null +++ b/unimarc/WindowsFormsApp1/회계/Sales_In_Pay.Designer.cs @@ -0,0 +1,392 @@ + +namespace WindowsFormsApp1.회계 +{ + partial class Sales_In_Pay + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + this.panel1 = new System.Windows.Forms.Panel(); + this.cb_gubun = new System.Windows.Forms.ComboBox(); + this.tb_etc = new System.Windows.Forms.TextBox(); + this.tb_price = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.tb_clt = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.Pay_In_Date = new System.Windows.Forms.DateTimePicker(); + this.label4 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.btn_Add = new System.Windows.Forms.Button(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btn_Close = new System.Windows.Forms.Button(); + this.btn_Delete = new System.Windows.Forms.Button(); + this.btn_Lookup = new System.Windows.Forms.Button(); + this.btn_Save = new System.Windows.Forms.Button(); + this.End_Date = new System.Windows.Forms.DateTimePicker(); + this.Start_Date = new System.Windows.Forms.DateTimePicker(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clt = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.gu = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.etc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.lbl_total = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.cb_gubun); + this.panel1.Controls.Add(this.tb_etc); + this.panel1.Controls.Add(this.tb_price); + this.panel1.Controls.Add(this.label5); + this.panel1.Controls.Add(this.tb_clt); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.Pay_In_Date); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.label1); + this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(550, 93); + this.panel1.TabIndex = 0; + // + // cb_gubun + // + this.cb_gubun.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_gubun.FormattingEnabled = true; + this.cb_gubun.Location = new System.Drawing.Point(328, 35); + this.cb_gubun.Name = "cb_gubun"; + this.cb_gubun.Size = new System.Drawing.Size(121, 20); + this.cb_gubun.TabIndex = 65; + // + // tb_etc + // + this.tb_etc.Location = new System.Drawing.Point(65, 62); + this.tb_etc.Name = "tb_etc"; + this.tb_etc.Size = new System.Drawing.Size(475, 21); + this.tb_etc.TabIndex = 64; + // + // tb_price + // + this.tb_price.Location = new System.Drawing.Point(65, 35); + this.tb_price.Name = "tb_price"; + this.tb_price.Size = new System.Drawing.Size(147, 21); + this.tb_price.TabIndex = 64; + this.tb_price.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_price_KeyPress); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(34, 65); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(29, 12); + this.label5.TabIndex = 0; + this.label5.Text = "비고"; + // + // tb_clt + // + this.tb_clt.Location = new System.Drawing.Point(328, 9); + this.tb_clt.Name = "tb_clt"; + this.tb_clt.Size = new System.Drawing.Size(212, 21); + this.tb_clt.TabIndex = 64; + this.tb_clt.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_clt_KeyDown); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(22, 38); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(41, 12); + this.label3.TabIndex = 0; + this.label3.Text = "입금액"; + // + // Pay_In_Date + // + this.Pay_In_Date.CustomFormat = "yyyy-MM-dd"; + this.Pay_In_Date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.Pay_In_Date.Location = new System.Drawing.Point(65, 8); + this.Pay_In_Date.Name = "Pay_In_Date"; + this.Pay_In_Date.Size = new System.Drawing.Size(85, 21); + this.Pay_In_Date.TabIndex = 63; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(267, 39); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(53, 12); + this.label4.TabIndex = 0; + this.label4.Text = "입금구분"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(261, 12); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(65, 12); + this.label2.TabIndex = 0; + this.label2.Text = "매출거래처"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(10, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(53, 12); + this.label1.TabIndex = 0; + this.label1.Text = "입금일자"; + // + // btn_Add + // + this.btn_Add.Location = new System.Drawing.Point(5, 5); + this.btn_Add.Name = "btn_Add"; + this.btn_Add.Size = new System.Drawing.Size(63, 23); + this.btn_Add.TabIndex = 66; + this.btn_Add.Text = "추 가"; + this.btn_Add.UseVisualStyleBackColor = true; + this.btn_Add.Click += new System.EventHandler(this.btn_Add_Click); + // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.btn_Close); + this.panel2.Controls.Add(this.btn_Delete); + this.panel2.Controls.Add(this.btn_Lookup); + this.panel2.Controls.Add(this.btn_Save); + this.panel2.Controls.Add(this.btn_Add); + this.panel2.Controls.Add(this.End_Date); + this.panel2.Controls.Add(this.Start_Date); + this.panel2.Location = new System.Drawing.Point(12, 111); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(550, 35); + this.panel2.TabIndex = 0; + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(477, 5); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(63, 23); + this.btn_Close.TabIndex = 66; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // btn_Delete + // + this.btn_Delete.Location = new System.Drawing.Point(143, 5); + this.btn_Delete.Name = "btn_Delete"; + this.btn_Delete.Size = new System.Drawing.Size(63, 23); + this.btn_Delete.TabIndex = 66; + this.btn_Delete.Text = "삭 제"; + this.btn_Delete.UseVisualStyleBackColor = true; + this.btn_Delete.Click += new System.EventHandler(this.btn_Delete_Click); + // + // btn_Lookup + // + this.btn_Lookup.Location = new System.Drawing.Point(408, 5); + this.btn_Lookup.Name = "btn_Lookup"; + this.btn_Lookup.Size = new System.Drawing.Size(63, 23); + this.btn_Lookup.TabIndex = 66; + this.btn_Lookup.Text = "조 회"; + this.btn_Lookup.UseVisualStyleBackColor = true; + this.btn_Lookup.Click += new System.EventHandler(this.btn_Lookup_Click); + // + // btn_Save + // + this.btn_Save.Location = new System.Drawing.Point(74, 5); + this.btn_Save.Name = "btn_Save"; + this.btn_Save.Size = new System.Drawing.Size(63, 23); + this.btn_Save.TabIndex = 66; + this.btn_Save.Text = "저 장"; + this.btn_Save.UseVisualStyleBackColor = true; + this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); + // + // End_Date + // + this.End_Date.CustomFormat = "yyyy-MM-dd"; + this.End_Date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.End_Date.Location = new System.Drawing.Point(317, 6); + this.End_Date.Name = "End_Date"; + this.End_Date.Size = new System.Drawing.Size(85, 21); + this.End_Date.TabIndex = 63; + // + // Start_Date + // + this.Start_Date.CustomFormat = "yyyy-MM-dd"; + this.Start_Date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.Start_Date.Location = new System.Drawing.Point(226, 6); + this.Start_Date.Name = "Start_Date"; + this.Start_Date.Size = new System.Drawing.Size(85, 21); + this.Start_Date.TabIndex = 63; + // + // dataGridView1 + // + 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; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.idx, + this.date, + this.clt, + this.price, + this.gu, + this.etc}); + this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; + this.dataGridView1.Location = new System.Drawing.Point(12, 153); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowHeadersWidth = 20; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(550, 217); + this.dataGridView1.TabIndex = 1; + this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); + // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; + // + // date + // + this.date.HeaderText = "입금일자"; + this.date.Name = "date"; + this.date.Width = 80; + // + // clt + // + this.clt.HeaderText = "거래처"; + this.clt.Name = "clt"; + this.clt.Width = 150; + // + // price + // + this.price.HeaderText = "금액"; + this.price.Name = "price"; + this.price.Width = 80; + // + // gu + // + this.gu.HeaderText = "구분"; + this.gu.Name = "gu"; + this.gu.Width = 70; + // + // etc + // + this.etc.HeaderText = "비고"; + this.etc.Name = "etc"; + this.etc.Width = 130; + // + // lbl_total + // + this.lbl_total.AutoSize = true; + this.lbl_total.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbl_total.Location = new System.Drawing.Point(277, 378); + this.lbl_total.Name = "lbl_total"; + this.lbl_total.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.lbl_total.Size = new System.Drawing.Size(12, 12); + this.lbl_total.TabIndex = 0; + this.lbl_total.Text = "0"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label7.Location = new System.Drawing.Point(53, 378); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(31, 12); + this.label7.TabIndex = 0; + this.label7.Text = "합계"; + // + // Sales_In_Pay + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(573, 397); + this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.panel2); + this.Controls.Add(this.panel1); + this.Controls.Add(this.lbl_total); + this.Controls.Add(this.label7); + this.Name = "Sales_In_Pay"; + this.Text = "매출 입금"; + this.Load += new System.EventHandler(this.Sales_In_Pay_Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox cb_gubun; + private System.Windows.Forms.TextBox tb_etc; + private System.Windows.Forms.TextBox tb_price; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DateTimePicker Pay_In_Date; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Button btn_Add; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.Button btn_Delete; + private System.Windows.Forms.Button btn_Lookup; + private System.Windows.Forms.Button btn_Save; + private System.Windows.Forms.DateTimePicker End_Date; + private System.Windows.Forms.DateTimePicker Start_Date; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Label lbl_total; + private System.Windows.Forms.Label label7; + public System.Windows.Forms.TextBox tb_clt; + private System.Windows.Forms.DataGridViewTextBoxColumn idx; + private System.Windows.Forms.DataGridViewTextBoxColumn date; + private System.Windows.Forms.DataGridViewTextBoxColumn clt; + private System.Windows.Forms.DataGridViewTextBoxColumn price; + private System.Windows.Forms.DataGridViewTextBoxColumn gu; + private System.Windows.Forms.DataGridViewTextBoxColumn etc; + } +} \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/회계/Sales_In_Pay.cs b/unimarc/WindowsFormsApp1/회계/Sales_In_Pay.cs new file mode 100644 index 0000000..7abd8b8 --- /dev/null +++ b/unimarc/WindowsFormsApp1/회계/Sales_In_Pay.cs @@ -0,0 +1,180 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +// 추가된 참조 +using WindowsFormsApp1.Delivery; + +namespace WindowsFormsApp1.회계 +{ + public partial class Sales_In_Pay : Form + { + Main main; + Helper_DB db = new Helper_DB(); + public string compidx; + bool add_chk = false; + private int row = -1; + public Sales_In_Pay(Main _main) + { + InitializeComponent(); + main = _main; + compidx = main.com_idx; + } + private void Sales_In_Pay_Load(object sender, EventArgs e) + { + db.DBcon(); + string[] combo = { "현금", "통장", "카드", "어음" }; + cb_gubun.Items.AddRange(combo); + Start_Date.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); + } + private void btn_Add_Click(object sender, EventArgs e) + { + Pay_In_Date.Value = End_Date.Value; + tb_clt.Text = ""; + tb_price.Text = ""; + tb_etc.Text = ""; + cb_gubun.SelectedIndex = -1; + + add_chk = true; + } + private void btn_Save_Click(object sender, EventArgs e) + { + if (tb_clt.Text == "") { MessageBox.Show("거래처를 입력해주세요."); return; } + if (tb_price.Text == "") { MessageBox.Show("금액을 입력해주세요."); return; } + if (cb_gubun.SelectedIndex < 0) { MessageBox.Show("구분을 선택해주세요."); return; } + + string date = Pay_In_Date.Text.Substring(0, 10); + if (row < 0 || !add_chk) { + string[] Area = { "compidx", "date", "client", "deposit", "gu", "etc" }; + string[] Data = { compidx, date, tb_clt.Text, tb_price.Text, cb_gubun.Text, tb_etc.Text }; + + db.DB_INSERT("Sales", Area, Data); + insert_data(date); + } + else { + string[] edit_col = { "date", "client", "deposit", "gu", "etc" }; + string[] edit_data = { date, tb_clt.Text, tb_price.Text, cb_gubun.Text, tb_etc.Text }; + string[] sear_col = { "idx" }; + string[] sear_data = { dataGridView1.Rows[row].Cells["idx"].Value.ToString() }; + + db.More_Update("Sales", edit_col, edit_data, sear_col, sear_data); + update_data(date); + } + add_chk = false; + btn_Lookup_Click(null, e); + } + #region Btn_Save_Click_Sub + private void insert_data(string date) + { + string[] grid = { "", date, tb_clt.Text, tb_price.Text, cb_gubun.Text, tb_etc.Text }; + dataGridView1.Rows.Add(grid); + } + private void update_data(string date) + { + dataGridView1.Rows[row].Cells["date"].Value = date; + dataGridView1.Rows[row].Cells["client"].Value = tb_clt.Text; + dataGridView1.Rows[row].Cells["deposit"].Value = tb_price.Text; + dataGridView1.Rows[row].Cells["gu"].Value = cb_gubun.SelectedItem; + dataGridView1.Rows[row].Cells["etc"].Value = tb_etc.Text; + } + #endregion + private void btn_Delete_Click(object sender, EventArgs e) + { + if(MessageBox.Show("삭제하시겠습니까?", "삭제", MessageBoxButtons.YesNo) == DialogResult.No) { return; } + + db.DB_Delete("Sales", "compidx", compidx, "idx", dataGridView1.Rows[row].Cells["idx"].Value.ToString()); + dataGridView1.Rows.Remove(dataGridView1.Rows[row]); + + add_chk = false; + } + private void btn_Lookup_Click(object sender, EventArgs e) + { + dataGridView1.Rows.Clear(); + string table = "`idx`, `date`, `client`, `deposit`, `gu`, `etc`"; + string start = Start_Date.Text.Substring(0, 10); + string end = End_Date.Text.Substring(0, 10); + + string data_base = db.Search_Date("Sales", table, "date", start, end, compidx); + made_grid(data_base); + add_chk = false; + Print_Total(); + } + #region Btn_Lookup_Click_Sub + private void made_grid(string value) + { + string[] grid = { "", "", "", "", "", "" }; + string[] ary = value.Split('|'); + + int cot = 6; + for (int a = 0; a < ary.Length; a++) + { + if (a % cot == 0) { grid[0] = ary[a]; } + if (a % cot == 1) { grid[1] = ary[a]; } + if (a % cot == 2) { grid[2] = ary[a]; } + if (a % cot == 3) { grid[3] = ary[a]; } + if (a % cot == 4) { grid[4] = ary[a]; } + if (a % cot == 5) { grid[5] = ary[a]; + if (grid[4] != "") { + dataGridView1.Rows.Add(grid); + } + } + } + } + private void Print_Total() + { + if (dataGridView1.Rows.Count <= 0) { return; } + int total = 0; + for(int a = 0; a < dataGridView1.Rows.Count; a++) + { + total += Convert.ToInt32(dataGridView1.Rows[a].Cells["price"].Value.ToString()); + } + lbl_total.Text = total.ToString(); + } + #endregion + private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + row = e.RowIndex; + if(e.RowIndex < 0) { return; } + input_Text(); + } + #region Grid_CellClick_Sub + private void input_Text() + { + string date = dataGridView1.Rows[row].Cells["date"].Value.ToString().Replace("-", ""); + int year = Convert.ToInt32(date.Substring(0, 4)); + int month = Convert.ToInt32(date.Substring(4, 2)); + int day = Convert.ToInt32(date.Substring(6, 2)); + + Pay_In_Date.Value = new DateTime(year, month, day); + tb_clt.Text = dataGridView1.Rows[row].Cells["clt"].Value.ToString(); + tb_price.Text = dataGridView1.Rows[row].Cells["price"].Value.ToString(); + cb_gubun.SelectedItem = dataGridView1.Rows[row].Cells["gu"].Value.ToString(); + tb_etc.Text = dataGridView1.Rows[row].Cells["etc"].Value.ToString(); + } + #endregion + private void tb_clt_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + Commodity_Search cs = new Commodity_Search(this); + cs.Clinet_name = tb_clt.Text; + cs.Show(); + } + } + private void tb_price_KeyPress(object sender, KeyPressEventArgs e) + { + String_Text st = new String_Text(); + st.Only_Int(sender, e); + } + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/unimarc/WindowsFormsApp1/회계/Sales_In_Pay.resx b/unimarc/WindowsFormsApp1/회계/Sales_In_Pay.resx new file mode 100644 index 0000000..2440719 --- /dev/null +++ b/unimarc/WindowsFormsApp1/회계/Sales_In_Pay.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/회계/Sales_Input.cs b/unimarc/WindowsFormsApp1/회계/Sales_Input.cs index 00ab62c..9b012fd 100644 --- a/unimarc/WindowsFormsApp1/회계/Sales_Input.cs +++ b/unimarc/WindowsFormsApp1/회계/Sales_Input.cs @@ -91,24 +91,33 @@ namespace WindowsFormsApp1.Account string[] col_name = { "compidx", "date", "client", "isbn", "book_name", "author", "book_comp", "price", "count", "total", - "out_per", "etc", "tel" }; + "out_per", "etc", "tel", "out_price" }; for(int a = 0; a < dataGridView1.Rows.Count; a++) { string[] set_data = { compidx, date, tb_clt.Text, - dataGridView1.Rows[a].Cells["ISBN"].Value.ToString(), + dataGridView1.Rows[a].Cells["ISBN"].Value.ToString(), dataGridView1.Rows[a].Cells["book_name"].Value.ToString(), dataGridView1.Rows[a].Cells["author"].Value.ToString(), dataGridView1.Rows[a].Cells["book_comp"].Value.ToString(), - dataGridView1.Rows[a].Cells["price"].Value.ToString(), + dataGridView1.Rows[a].Cells["price"].Value.ToString(), dataGridView1.Rows[a].Cells["count"].Value.ToString(), - dataGridView1.Rows[a].Cells["total"].Value.ToString(), + dataGridView1.Rows[a].Cells["total"].Value.ToString(), dataGridView1.Rows[a].Cells["persent"].Value.ToString(), tb_etc.Text, - lbl_tel.Text + lbl_tel.Text, + out_price(a) }; db.DB_INSERT("Sales", col_name, set_data); } } + private string out_price(int idx) + { + int total = Convert.ToInt32(dataGridView1.Rows[idx].Cells["total"].Value.ToString()); + int per = Convert.ToInt32(dataGridView1.Rows[idx].Cells["persent"].Value.ToString()); + + double tmp = total * per * 0.01; + return Convert.ToInt32(tmp).ToString(); + } private void chk_Add5000_CheckedChanged(object sender, EventArgs e) { if (chk_Add5000.Checked) { dataGridView1.Rows.Add(5000); } diff --git a/unimarc/unimarc/Debug/unimarc.msi b/unimarc/unimarc/Debug/unimarc.msi index d3a89c5..4dba890 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 8364344..14f9362 100644 --- a/unimarc/unimarc/unimarc.vdproj +++ b/unimarc/unimarc/unimarc.vdproj @@ -22,7 +22,7 @@ "Entry" { "MsmKey" = "8:_001D416150A2355AEE369A7D961F735F" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -34,13 +34,13 @@ "Entry" { "MsmKey" = "8:_015C7FC2579570BF1EEDC0F6726C7521" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_028A2ED6F1FB6536AD0681A833F34CE5" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -58,91 +58,91 @@ "Entry" { "MsmKey" = "8:_047071E32C0E797EBEBD022C6E881E4C" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_057B34E4DB1DFF5B1ECCFFCE61E742CA" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_07CF13DAA7371A0C9E960A15EBA73A92" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_07DC850D6E146DEA2D202C749D69B27D" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_07F47DD461E3644DE10EBC6FD1B77607" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_089469DA234DFC3414FCF45E9C46FA63" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0CE9FEBD666F6D8D28214974A4690C04" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0D3B95DB55D7D37D0669527E65755F7D" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0DC00A1761BEA0E35D43F252D5F002FF" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_10B8AE2D6E642D2DFCF2E4C2C96D793D" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_12576CE10AE023355B443DDE5275201B" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_13E253474BC6FE232F3900E9755E0007" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_19C76E4F3C3D3512E080F5F9A9090FDC" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_1C7A7FAD549EA1FA3B37C1E4A392FC82" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_1F688FFFAC6C82AD4DDC4814E3BDC60A" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -154,43 +154,43 @@ "Entry" { "MsmKey" = "8:_3262307A2EAC22A10CA11BAAE0AAEA70" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_32FB2E140B51B69DF2CB20C6CAE6731C" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_33B4D711E7791CC56A57C9B419266A8E" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_33F1D49D655E0BC23C0850ED0A7CFE0A" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_36F7EAA432DB76A2093F6344E2B4A82C" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_3748E55500964F65E1379F080158E310" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_3999D436FA61B323E479B3D0573376AF" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -202,7 +202,7 @@ "Entry" { "MsmKey" = "8:_3A18404D6ADC1AFAE66D04C3A9625CE6" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -214,97 +214,97 @@ "Entry" { "MsmKey" = "8:_421387BA65DC30024F90F6087F7F0008" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_42171CE5E891BB11F64E84433568EAFD" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_459C3BABDC2AC56BBD74900F4B3B5D2F" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_45B5C94F2D4B7EC8B71DB782F26436C4" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_49DD3DC63BBBD2DC2B85A10E65147311" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_4E504796387DC2D781431FC06877405F" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_507FC2BF026B8099E89271A951851FF3" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_55726D42B941211F0121A893BEFF5AE3" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5834456CD94E1FF994037B4CFE5FB6F2" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5861CA5031FC995368D8DEA38472E3D7" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_59101A1AD60B4AFCC30AED3F1A90F7C9" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5BEBC3FC2DCD657C10F67137073D545D" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5E2BBD6A6DFE0622385C9945D1F9ECBA" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5FAF629E4023736C41829B9A3A1AAB41" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_600A092D932B77F6409A2B4AD153D886" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_639C004C677797B83E4407C3472AA745" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -334,7 +334,7 @@ "Entry" { "MsmKey" = "8:_67B3BAF3A11E3F8FE5184F11A4F84DA5" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -352,37 +352,37 @@ "Entry" { "MsmKey" = "8:_681C7688D1C1693A77B7B11D91D24FBA" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_6F7A0B94D8AE1C5B1360A8A635155C23" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7018454A69E3C9A0704B1D82F576533B" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_716CB8E3126231BA85E89BC0B71059D4" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_72F47E30A61B6CD357CCA3170433CEDF" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_75BD8D30213E0DB34A7B8B7BCCB84329" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -394,25 +394,25 @@ "Entry" { "MsmKey" = "8:_75E312D843698E7DE72A774A27CBDEFE" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_780AD002FBC9AF29C4EBEB34D9D74ACA" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_79FFE6B72E362807DB42671E92207BAD" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7ABB2B81716CAEA458DCE9D036653490" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -430,31 +430,31 @@ "Entry" { "MsmKey" = "8:_7E9576BAF5432B85EE67D8E00B63B76B" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8109181D8F6DE852A8D0998B751E5DF2" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_81A1B10DBF1C355A1FF093EA608FE488" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8272463C852F8DA44AA8A726254524F4" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_83316D6C462C1466B6849AB26562FD81" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -466,61 +466,61 @@ "Entry" { "MsmKey" = "8:_887FCE0B29694D0FEEDBE73B58903544" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_88CEC0962F4633F0F97CC0299DB49F05" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_88D8733416B5F6985067EC48457585EE" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8D37195979F7A4B439A83A70A8D49A36" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8F8895A9A78400EB14AC0891D7FB1707" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9611F0BB2C07D45490DC34862D69CF98" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_972CF986D39E43BAA48594B702DDD068" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_97BB16793A50D31B0E83016098231328" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9A4A8C2F2ADD54E80C31E5771681A797" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9B6056CB75EF1BC60DE0834C07AD783F" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -532,19 +532,19 @@ "Entry" { "MsmKey" = "8:_9EDAAEEEC759C734AE1F573C6279DB3E" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9F34B53FC5EB70987CEB596911A7D16B" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9F59CCC1F01FDB930467A7E22F26A0CB" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -556,31 +556,25 @@ "Entry" { "MsmKey" = "8:_9F733AE54CFFC50785D33B4A9704B3E5" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_9FAE9F821925C3014547993C375B3E9E" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_A1D62BC4E90EB13D13B52EF696912EF0" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" - "OwnerKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_A40F452F3210334298F81F02C814F43E" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -604,73 +598,73 @@ "Entry" { "MsmKey" = "8:_A66A90E2D2EB8E717B92404B335F9975" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ABCF155477AD163B2A4FF80C947C99F9" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ACD9CEF841EFA6B462E02A031D70BCDF" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_AD9E8DDB5E6C37A341E77FD9092E48F2" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ADD85FDF45178A2640084967B858CE8F" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_B4C05544052A1709EEABED1B0B6D08E4" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_B75FC7734F563260D8E3F9A0A0D4566C" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_BA2B720B9BFD919DBEBFD26DB6345F58" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_BBE80AC20E89D64E21B20AC986AAA32D" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_BD94266735939B578EDC8D27C7C1720D" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C26CC85E81B3FBDD11CFFB45327EF671" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C2AF530AB4696A54F7ACD84A6FA75F3C" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -682,7 +676,7 @@ "Entry" { "MsmKey" = "8:_C48F9D543D4025BD236364D7E82E7A25" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -694,37 +688,43 @@ "Entry" { "MsmKey" = "8:_C5F316796D51D3FB2EDC4A68F45DA645" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C6ED1DD8D329AF08A8F8B2B216D164CC" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C73E48094BC649FCA6994724123D4F11" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C74289BF935BA4538CD7578877BE6C2D" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C93E8CB0368E7BBAB30EE7FEC4B867F9" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_CE9BAC0361AC2FD57821F2915F2E414C" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_D0541BEDF2F6A1AA7112AAA69D9CB995" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -736,19 +736,19 @@ "Entry" { "MsmKey" = "8:_D2A40A3A8C935BB0644F6CFECE539899" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_D40485C9B6765A2866D3C71EE56BAF7C" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_D677201FB496DEC2B90E2815551DE470" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -760,55 +760,55 @@ "Entry" { "MsmKey" = "8:_D752DC2A97BE66CF93CA222B64FD43FB" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DB2E6C0EA1C1B181A25B6DAEEA956F0E" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DB7B4BDB51A9577871D2ECAAFCA7752E" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DCCCEEFFC3C954F20F64E3B65BEAC290" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DD34E92D9B35E215DF2E0241986AEECB" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DD6CFCD9ACC99AEF3B8807A75C873C13" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E1633E3F553A7391FAE9079940F93D52" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E5E831E112A7208BC330BC1207007AF4" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E74E4B6BF9D29A5DB41F25028C9DB751" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -820,55 +820,55 @@ "Entry" { "MsmKey" = "8:_E760C38B0FD4D325F7BADB03ACD09A69" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E91828B2631D7D15C90C20B0AD3BB321" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EB0FE5491BFA6F1EB78E2CBB164DA5D3" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ED3F4EF3AE297F16A362739C80AE42F5" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_ED670026055FD5A403F97836FB091815" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EDA9DDFD3DFCD43E48125C8880BAF7C1" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EEFFADE13EF3DB790B64C383DB910893" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_F0D9FB37EF1C0F27C8A2530094552C2C" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_F15E644F02E1953F48A05C89D0509357" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -880,25 +880,25 @@ "Entry" { "MsmKey" = "8:_F6E293644B4F174936F48E42D24E4CAA" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_F886A334BC7C63BA89874677271B4B82" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_FAEFBE38F879F4807F8A236CEAA6F016" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_FB2AA4D59FE1E9770DE547206F9F4720" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -910,7 +910,7 @@ "Entry" { "MsmKey" = "8:_FFFABE2BE7370227C86B5E78B443B53F" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -922,7 +922,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "OwnerKey" = "8:_C73E48094BC649FCA6994724123D4F11" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1706,6 +1706,14 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" + { + "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.7.2" + } + } } } "Release" @@ -1730,6 +1738,14 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" + { + "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.7.2" + } + } } } } @@ -5936,7 +5952,7 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_2665F72AA70B4C56B89F715CC685DFC6" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_234B009C94C0433D9A1D76EFE2DE1685" { "Name" = "8:unimarc" "Arguments" = "8:" @@ -5944,7 +5960,7 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_A2A43FC8516B4EDE9FCFD888E304F87C" + "Target" = "8:_C73E48094BC649FCA6994724123D4F11" "Folder" = "8:_963D93D6C7184251B8C6C3F785E5957D" "WorkingFolder" = "8:_078186B71DE04C3EBEFD790918AC5E76" "Icon" = "8:" @@ -6349,7 +6365,7 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A2A43FC8516B4EDE9FCFD888E304F87C" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C73E48094BC649FCA6994724123D4F11" { "SourcePath" = "8:..\\WindowsFormsApp1\\obj\\Debug\\WindowsFormsApp1.exe" "TargetName" = "8:"