From 26c40944f0536bf2b20cca5dabda374be02328b5 Mon Sep 17 00:00:00 2001 From: jity7777 Date: Thu, 18 May 2023 02:02:41 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?= =?UTF-8?q?MS=20NO=20:=207907=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?= =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20(1)=20Base/Controller/ACommonCRoo?= =?UTF-8?q?m.cs=20=20-=20web.config=20=EC=97=90=EC=84=9C=20"popbillManager?= =?UTF-8?q?"=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EB=B6=88=EB=9F=AC=EC=99=80?= =?UTF-8?q?=EC=84=9C=20"=EB=AF=B8=EB=B0=9C=ED=96=89"=EC=8B=9C=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=20(2)=20Base/Popbill/PopbillService?= =?UTF-8?q?.cs=20=20-=20=EB=B0=9C=ED=96=89=EC=8B=9C=20web.config=20?= =?UTF-8?q?=EC=97=90=EC=84=9C=20"popbillManager"=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EB=A1=9C=20=EB=8B=B4=EB=8B=B9=EC=9E=90=20=EC=9D=B4=EB=A6=84,?= =?UTF-8?q?=EC=97=B0=EB=9D=BD=EC=B2=98=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20(3)=20BO/Controllers/croomController.cs=20=20-=20?= =?UTF-8?q?=EB=B0=9C=ED=96=89=EC=8B=9C=20web.config=20=EC=97=90=EC=84=9C?= =?UTF-8?q?=20"popbillManager"=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20=ED=8C=9D?= =?UTF-8?q?=EB=B9=8C=20=EB=B0=9C=ED=96=89=EC=A0=95=EB=B3=B4=EC=97=90=20?= =?UTF-8?q?=EB=84=98=EA=B9=80=20(4)=20BO/Web.config=20=20-=20"popbillManag?= =?UTF-8?q?er"=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80=20(5)=20Dao/MyBat?= =?UTF-8?q?is/Maps/CRoom.xml=20=20-=20mgtkey=20=EA=B0=92=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=EB=95=8C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=20(db=EC=97=90=EC=84=9C=20uipaytaxmgtkey=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EC=98=A4=EB=A5=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/croomController.cs | 14 +++++++++++++- BO/Web.config | 8 +++++--- Base/Controller/ACommonCRoom.cs | 4 +++- Base/Popbill/PopbillService.cs | 4 +++- Dao/MyBatis/Maps/CRoom.xml | 12 ++++++------ 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index eb6563a..3ef4948 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -1182,7 +1182,16 @@ namespace NP.BO.Controllers { ViewBag.Taxinvoice = result.Data; ViewBag.TaxinvoiceInfo = PopbillService.GetTaxinvoiceInfo(payTax).Data; - if(ViewBag.TaxinvoiceInfo != null && payTax.statecode == 0) + + string[] popbillManager = GetConfig("popbillManager").Split(';'); + + if (payTax.statecode == 0) + { + ViewBag.Taxinvoice.invoicerTEL = popbillManager[0]; + ViewBag.Taxinvoice.invoicerContactName = popbillManager[1]; + } + + if (ViewBag.TaxinvoiceInfo != null && payTax.statecode == 0) { #region 세금계산서 상태코드 업데이트 payTax.uno = SUserInfo.UserNo; @@ -1193,6 +1202,9 @@ namespace NP.BO.Controllers } } } + + + #endregion return View(vm); diff --git a/BO/Web.config b/BO/Web.config index 9b979cd..7d4c0ec 100644 --- a/BO/Web.config +++ b/BO/Web.config @@ -37,7 +37,9 @@ - + + + @@ -55,8 +57,8 @@ - - + + diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index 5821f28..ed8b173 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -1422,7 +1422,9 @@ namespace NP.Base.Controllers if (Dao.Save("cr.paytax.save", payTax) > 0) { var payItems = Dao.Get("cr.paytaxitem2", new System.Collections.Hashtable() { { "taxno", payTax.taxno } }); - var result = Popbill.PopbillService.RegistIssue(Dao, payTax, payItems); + string[] popbillManager = GetConfig("popbillManager").Split(';'); + + var result = Popbill.PopbillService.RegistIssue(Dao, payTax, payItems, popbillManager[0], popbillManager[1]); if (result.IsSuccess) { #region 세금계산서 상태코드 업데이트 diff --git a/Base/Popbill/PopbillService.cs b/Base/Popbill/PopbillService.cs index 1a09408..ab7d707 100644 --- a/Base/Popbill/PopbillService.cs +++ b/Base/Popbill/PopbillService.cs @@ -430,7 +430,7 @@ namespace NP.Base.Popbill /// 메모 /// IssueResponse /// 작성된 세금계산서 데이터를 팝빌에 저장과 동시에 발행(전자서명)하여 "발행완료" 상태로 처리합니다. - public static Result RegistIssue(CommonDao Dao, PayTax payTax, IList payItems, MgtKeyType keyType = MgtKeyType.SELL, bool forceIssue = false, string memo = "") + public static Result RegistIssue(CommonDao Dao, PayTax payTax, IList payItems, string managerPhone = "", string managerName = "", MgtKeyType keyType = MgtKeyType.SELL, bool forceIssue = false, string memo = "") { Result result = new Result(); ; try @@ -453,6 +453,8 @@ namespace NP.Base.Popbill else { var taxinvoice = GetTaxinvoice(payTax, payItems, keyType).Data; + taxinvoice.invoicerTEL = managerPhone; // 세금계산서 발행시 invoicerTEL번호를 기업에 등록된 연락처로 변경 2023.05.17 (pms: 7903) + taxinvoice.invoicerContactName = managerName;// 세금계산서 발행시 invoicerTEL번호를 기업에 등록된 연락처로 변경 2023.05.17 (pms: 7903) result.Data = PopbillConfig.taxinvoiceService.RegistIssue(PopbillConfig.CorpNum, taxinvoice, forceIssue, memo); result.Code = result.Data.code; result.Message = result.Data.message; diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index c23306f..178df43 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -1511,12 +1511,12 @@ ,manname=#manname# ,telno=HEX(AES_ENCRYPT(#telno#, )) ,email=HEX(AES_ENCRYPT(#email#, )) - ,taxdate=#taxdate# - ,taxinfo=#taxinfo# - ,isreceipt=#isreceipt# - ,iscancel=#iscancel# - ,asaddr=#asaddr# - ,mgtkey=#mgtkey# + ,taxdate=#taxdate# + ,taxinfo=#taxinfo# + ,isreceipt=#isreceipt# + ,iscancel=#iscancel# + ,asaddr=#asaddr# + ,mgtkey=#mgtkey# ,taxdatereq=#taxdatereq# ,statecode=#statecode# ,realtaxdate=case when #statecode#=300 and realtaxdate is null then now() else realtaxdate end