Commit 680e0dbf by 陶然

增加发票作废对接OA功能

parent 2393bf86
......@@ -41,17 +41,14 @@ namespace Kivii.Finances.Entities
public Guid BizKvid { get; set; }
[ApiMember(Description = "业务流水号")]
[InternalSetter]
[StringLength(200)]
public string BizId { get; set; }
[ApiMember(Description = "业务类型")]
[InternalSetter]
[StringLength(100)]
public string BizType { get; set; }
[ApiMember(Description = "收付款关联,针对Payment和Invoice多对多的关系 使用中间表Apply(开票申请)关联起来")]
[InternalSetter]
[DefaultEmptyGuid]
public Guid ApplyKvid { get; set; }
......
......@@ -9,7 +9,7 @@ namespace Kivii.Finances
{
public static class InvoiceExtension
{
public static Invoice Offset(this Invoice invoice, string remark)
public static Invoice Offset(this Invoice invoice, string remark,Invoice redInvoice=null)
{
invoice.ThrowIfNull("发票不能为空!");
(invoice.Currency == CurrencyUnit.Unsupported).ThrowIfTrue("不支持的货币单位");
......@@ -39,6 +39,11 @@ namespace Kivii.Finances
offsetInvoice.OperateTime = DateTime.Now;
offsetInvoice.OperatorName = KiviiContext.CurrentMember.FullName;
offsetInvoice.OperatorKvid = KiviiContext.CurrentMember.Kvid;
if (redInvoice != null)
{
if (!redInvoice.SerialNumber.IsNullOrEmpty()) offsetInvoice.SerialNumber = redInvoice.SerialNumber;
if (redInvoice.OperateTime != DateTime.MinValue) offsetInvoice.OperateTime = redInvoice.OperateTime;
}
#endregion
return offsetInvoice;
......
......@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2024.1060")]
[assembly: AssemblyFileVersion("5.4.2024.1060")]
[assembly: AssemblyVersion("5.4.2024.1150")]
[assembly: AssemblyFileVersion("5.4.2024.1150")]
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