KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

첨부파일 있는 요청 즉시발행시 : ACommonController.PayTaxRegistIssue -> PopbillService.RegistIssue에서 임시저장->발행처리 하게 변경

This commit is contained in:
lch 2021-07-05 05:47:57 +00:00
parent fa2df36c09
commit 9dba8de3bf
2 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Base/Controller/ACommonCRoom.cs
View File

@ -928,29 +928,6 @@ namespace NP.Base.Controllers
if (Dao.Save("cr.paytax.save", payTax) > 0) if (Dao.Save("cr.paytax.save", payTax) > 0)
{ {
var payItems = Dao.Get<PayItem>("cr.paytaxitem2", new System.Collections.Hashtable() { { "taxno", payTax.taxno } }); var payItems = Dao.Get<PayItem>("cr.paytaxitem2", new System.Collections.Hashtable() { { "taxno", payTax.taxno } });
//첨부파일이 있으면 임시저장 후 발행처리
if(payTax.fgno != null && payTax.fgno != 0)
{
var result = Popbill.PopbillService.TempSave(Dao, payTax, payItems);
if (result.IsSuccess)
{
var resultIssue = Popbill.PopbillService.Issue(payTax.mgtkey);
if (resultIssue.IsSuccess)
{
return JsonOK(resultIssue.Code);
}
else
{
return JsonError(JSONCode.Error, resultIssue.Message, resultIssue);
}
}
else
{
return JsonError(JSONCode.Error, result.Message, result);
}
}
else
{
var result = Popbill.PopbillService.RegistIssue(Dao, payTax, payItems); var result = Popbill.PopbillService.RegistIssue(Dao, payTax, payItems);
if (result.IsSuccess) if (result.IsSuccess)
{ {
@ -961,7 +938,6 @@ namespace NP.Base.Controllers
return JsonError(JSONCode.Error, result.Message, result); return JsonError(JSONCode.Error, result.Message, result);
} }
} }
}
return JsonOK(0); return JsonOK(0);
} }
#endregion #endregion

18
Base/Popbill/PopbillService.cs
View File

@ -409,12 +409,30 @@ namespace NP.Base.Popbill
{ {
Result<IssueResponse> result = new Result<IssueResponse>(); ; Result<IssueResponse> result = new Result<IssueResponse>(); ;
try try
{
//첨부파일이 있으면 임시저장 후 발행
if (payTax.fgno != null && payTax.fgno != 0)
{
var resultResponse = TempSave(Dao, payTax, payItems, keyType);
if (resultResponse.IsSuccess)
{
result = Issue(payTax.mgtkey, keyType, forceIssue, memo);
}
else
{
result.IsSuccess = false;
result.Code = resultResponse.Code;
result.Message = resultResponse.Message;
}
}
else
{ {
var taxinvoice = GetTaxinvoice(payTax, payItems, keyType).Data; var taxinvoice = GetTaxinvoice(payTax, payItems, keyType).Data;
result.Data = PopbillConfig.taxinvoiceService.RegistIssue(PopbillConfig.CorpNum, taxinvoice, forceIssue, memo); result.Data = PopbillConfig.taxinvoiceService.RegistIssue(PopbillConfig.CorpNum, taxinvoice, forceIssue, memo);
result.Code = result.Data.code; result.Code = result.Data.code;
result.Message = result.Data.message; result.Message = result.Data.message;
} }
}
catch (PopbillException ex) catch (PopbillException ex)
{ {
result.IsSuccess = false; result.IsSuccess = false;