Commit 1673fd53 by 陶然

优化

parent b88ebf22
...@@ -357,7 +357,7 @@ namespace Kivii.Finances.Seeyon.Extensions ...@@ -357,7 +357,7 @@ namespace Kivii.Finances.Seeyon.Extensions
rtns.原发票号 = invoice.SerialNumber; rtns.原发票号 = invoice.SerialNumber;
rtns.原发票类型 = invoice.Type == "增值税专用发票" ? "-4189929216282050282" : (invoice.Type == "增值税普通发票" ? "4529935671729733794" : "4728848026009816823"); rtns.原发票类型 = invoice.Type == "增值税专用发票" ? "-4189929216282050282" : (invoice.Type == "增值税普通发票" ? "4529935671729733794" : "4728848026009816823");
rtns.原发票开票单位 = invoice.PayerName; rtns.原发票开票单位 = invoice.PayerName;
rtns.收款单位名称 = invoice.PayerName; rtns.收款单位名称 = invoice.PayeeName;
rtns.原开票金额 = invoice.Amount.ToString(); rtns.原开票金额 = invoice.Amount.ToString();
return rtns; return rtns;
} }
...@@ -395,7 +395,7 @@ namespace Kivii.Finances.Seeyon.Extensions ...@@ -395,7 +395,7 @@ namespace Kivii.Finances.Seeyon.Extensions
bizKvids.Add(invoice.Kvid.ToString()); bizKvids.Add(invoice.Kvid.ToString());
var rtns = new FormMain_InvoiceRedFlush0338(); var rtns = new FormMain_InvoiceRedFlush0338();
//var settlementType = "code|MonthlySettlement";//默认月结 //var settlementType = "code|MonthlySettlement";//默认月结
rtns.业务类型 = typeof(InvoiceOffsetApply).FullName; rtns.业务类型 = typeof(InvoiceRedFlushApply).FullName;
rtns.业务编号 = bizKvids; rtns.业务编号 = bizKvids;
rtns.单据编号 = invoice.SerialNumber; rtns.单据编号 = invoice.SerialNumber;
rtns.申请日期 = DateTime.Now.ToString("yyyy-MM-dd"); rtns.申请日期 = DateTime.Now.ToString("yyyy-MM-dd");
...@@ -405,7 +405,7 @@ namespace Kivii.Finances.Seeyon.Extensions ...@@ -405,7 +405,7 @@ namespace Kivii.Finances.Seeyon.Extensions
rtns.原发票号 = invoice.SerialNumber; rtns.原发票号 = invoice.SerialNumber;
rtns.原发票类型 = invoice.Type == "增值税专用发票" ? "-4189929216282050282" : (invoice.Type == "增值税普通发票" ? "4529935671729733794" : "4728848026009816823"); rtns.原发票类型 = invoice.Type == "增值税专用发票" ? "-4189929216282050282" : (invoice.Type == "增值税普通发票" ? "4529935671729733794" : "4728848026009816823");
rtns.原发票开票单位 = invoice.PayerName; rtns.原发票开票单位 = invoice.PayerName;
rtns.收款单位名称 = invoice.PayerName; rtns.收款单位名称 = invoice.PayeeName;
rtns.原开票金额 = invoice.Amount.ToString(); rtns.原开票金额 = invoice.Amount.ToString();
return rtns; return rtns;
} }
......
...@@ -450,7 +450,7 @@ namespace Kivii.Finances.Seeyon.Entities ...@@ -450,7 +450,7 @@ namespace Kivii.Finances.Seeyon.Entities
public object OnSubmitApplyForm<T>(T form) public object OnSubmitApplyForm<T>(T form)
{ {
form.ThrowIfNull("请传入发票信息!"); form.ThrowIfNull("请传入发票信息!");
var formOffset = form as InvoiceOffsetApply; var formOffset = form as InvoiceRedFlushApply;
formOffset.ThrowIfNull("传入的发票信息不能为空!"); formOffset.ThrowIfNull("传入的发票信息不能为空!");
var kvids = formOffset.Kvids; var kvids = formOffset.Kvids;
var conn = KiviiContext.GetOpenedDbConnection<Invoice>(); var conn = KiviiContext.GetOpenedDbConnection<Invoice>();
...@@ -474,7 +474,7 @@ namespace Kivii.Finances.Seeyon.Entities ...@@ -474,7 +474,7 @@ namespace Kivii.Finances.Seeyon.Entities
if (resp.code != "0") throw new Exception($"OA接口调用失败,原因:{resp.message}"); if (resp.code != "0") throw new Exception($"OA接口调用失败,原因:{resp.message}");
invoice.BizId = resp.data.subject; invoice.BizId = resp.data.subject;
invoice.AddOnlyProperties(o => o.BizId); invoice.AddOnlyProperties(o => o.BizId);
invoice.BizType = typeof(InvoiceOffsetApply).FullName; invoice.BizType = typeof(InvoiceRedFlushApply).FullName;
invoice.AddOnlyProperties(o => o.BizType); invoice.AddOnlyProperties(o => o.BizType);
conn.UpdateOnly(invoice); conn.UpdateOnly(invoice);
var log = new EntityLog<Invoice>(); var log = new EntityLog<Invoice>();
......
...@@ -369,7 +369,7 @@ namespace Kivii.Finances.Seeyon ...@@ -369,7 +369,7 @@ namespace Kivii.Finances.Seeyon
log.OwnerKvid = item.Kvid; log.OwnerKvid = item.Kvid;
log.Title = item.BizId; log.Title = item.BizId;
log.Type = "OA申请"; log.Type = "OA申请";
log.Summary = "OA审批不通过,驳回了发票作废审批"; log.Summary = "OA审批通过,发票已作废";
log.Remark = Message; log.Remark = Message;
log.CreatorName = "OA审批"; log.CreatorName = "OA审批";
logs.Add(log); logs.Add(log);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment