From 02f854807b4c5c5e85470dd065129e9f11b762d4 Mon Sep 17 00:00:00 2001 From: lch Date: Thu, 22 Apr 2021 09:28:05 +0000 Subject: [PATCH] =?UTF-8?q?=ED=8C=9D=EB=B9=8C=20api=20=EB=AA=A8=EB=93=88?= =?UTF-8?q?=20=EC=97=B0=EB=8F=99=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/croomController.cs | 19 +- BO/Global.asax.cs | 12 +- BO/Views/croom/taxdetail.cshtml | 40 +- BO/Web.config | 154 ++++--- Base/Base.csproj | 11 + Base/Popbill/PopbillConfig.cs | 82 ++++ Base/Popbill/PopbillService.cs | 106 +++++ FO/Global.asax.cs | 10 +- FO/Web.config | 672 +++++++++++++++--------------- Model/Pay.cs | 4 + 10 files changed, 695 insertions(+), 415 deletions(-) create mode 100644 Base/Popbill/PopbillConfig.cs create mode 100644 Base/Popbill/PopbillService.cs diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 1f349c5..81fa057 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -2,12 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; -using System.Net.Http.Headers; -using System.Web; using System.Web.Mvc; +using NP.Model; +using NP.Base.Popbill; -using NP.Model; -using System.Net.Http; namespace NP.BO.Controllers { public class croomController : BOBaseController @@ -770,6 +768,7 @@ namespace NP.BO.Controllers } vm.PayTaxes = Dao.Get("cr.paytaxes", ht); vm.pagetotalcount = GetCount(vm.PayTaxes.FirstOrDefault()); + return View(vm); } public ActionResult taxdetail(VMCRoom vm) @@ -793,6 +792,18 @@ namespace NP.BO.Controllers else vm.PayTaxItem = Dao.Get("cr.paytaxitem2", new System.Collections.Hashtable() { { "taxno", vm.longval } }); + #region 세금계산서 Popbill 연동 + var mgtKey = vm.PayTaxes.First()?.mgtKey; + if (!string.IsNullOrEmpty(mgtKey)) + { + ViewBag.Taxinvoice = PopbillService.GetTaxinvoice(mgtKey); + } + else + { + ViewBag.Taxinvoice = PopbillService.GetTaxinvoiceR(); + } + #endregion + return View(vm); } public ActionResult taxsmart(VMCRoom vm) diff --git a/BO/Global.asax.cs b/BO/Global.asax.cs index a8e99f7..88bb317 100644 --- a/BO/Global.asax.cs +++ b/BO/Global.asax.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; +using System.Web.Mvc; using System.Web.Optimization; using System.Web.Routing; - +using NP.Base.Popbill; using Spring.Web.Mvc; namespace BO @@ -18,7 +14,7 @@ namespace BO FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); RouteConfig.RegisterRoutes(RouteTable.Routes); BundleConfig.RegisterBundles(BundleTable.Bundles); - } - + PopbillConfig.StartTaxinvoiceService(); + } } } diff --git a/BO/Views/croom/taxdetail.cshtml b/BO/Views/croom/taxdetail.cshtml index 9395269..77d9917 100644 --- a/BO/Views/croom/taxdetail.cshtml +++ b/BO/Views/croom/taxdetail.cshtml @@ -5,7 +5,7 @@
@@ -100,6 +100,44 @@
+
+
공급업체정보
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
회사명대표자
사업자등록번호업태
종목사업장주소
담당자연락처
이메일주소문서번호
+
발행업체정보
diff --git a/BO/Web.config b/BO/Web.config index 86f6ba4..96a8e80 100644 --- a/BO/Web.config +++ b/BO/Web.config @@ -29,55 +29,73 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -126,27 +144,27 @@ - - + + - - - - - + + + + + - - - + + + - - - + + + @@ -196,18 +214,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - -
- -
- - -
-
-
-
- + +
+
+
+
+ - - - -
+ + + +
- - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -130,113 +148,113 @@ - - - + + + - - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +