Commit 5729c8c9 by 陶然

更新

parent 6cfc2f2c
...@@ -185,12 +185,10 @@ namespace Kivii.Finances.Entities ...@@ -185,12 +185,10 @@ namespace Kivii.Finances.Entities
[StringLength(100), Default("")] [StringLength(100), Default("")]
public string OperatorName { get; set; } public string OperatorName { get; set; }
[IgnoreUpdate]
[DefaultEmptyGuid] [DefaultEmptyGuid]
public Guid AuditorKvid { get; set; } public Guid AuditorKvid { get; set; }
[ApiMember(Description ="审核人")] [ApiMember(Description ="审核人")]
[IgnoreUpdate]
[StringLength(100),Default("")] [StringLength(100),Default("")]
public string AuditorName { get; set; } public string AuditorName { get; set; }
......
...@@ -621,6 +621,7 @@ namespace Kivii.Finances ...@@ -621,6 +621,7 @@ namespace Kivii.Finances
assignPayment.SerialNumber = payment.GetSubSerialNumber(); assignPayment.SerialNumber = payment.GetSubSerialNumber();
assignPayment.Type = PaymentType.Assign; assignPayment.Type = PaymentType.Assign;
//金额设置 //金额设置
assignPayment.AuditorName = assignPayment.OperateTime.Year.ToString();
assignPayment.Amount = amountAssign; assignPayment.Amount = amountAssign;
assignPayment.AmountSplited = 0; assignPayment.AmountSplited = 0;
assignPayment.AmountUsed = amountUsed; assignPayment.AmountUsed = amountUsed;
...@@ -694,6 +695,7 @@ namespace Kivii.Finances ...@@ -694,6 +695,7 @@ namespace Kivii.Finances
splitPayment.SerialNumber = payment.GetSubSerialNumber(); splitPayment.SerialNumber = payment.GetSubSerialNumber();
splitPayment.Type = PaymentType.Split; splitPayment.Type = PaymentType.Split;
//金额设置 //金额设置
splitPayment.AuditorName = splitPayment.OperateTime.Year.ToString();
splitPayment.Amount = amountSplit; splitPayment.Amount = amountSplit;
splitPayment.AmountSplited = 0; splitPayment.AmountSplited = 0;
splitPayment.AmountUsed = 0; splitPayment.AmountUsed = 0;
...@@ -765,6 +767,7 @@ namespace Kivii.Finances ...@@ -765,6 +767,7 @@ namespace Kivii.Finances
splitPayment.SerialNumber = payment.GetSubSerialNumber(); splitPayment.SerialNumber = payment.GetSubSerialNumber();
splitPayment.Type = paymentType; splitPayment.Type = paymentType;
//金额设置 //金额设置
splitPayment.AuditorName = splitPayment.OperateTime.Year.ToString();
splitPayment.Amount = amountSplit; splitPayment.Amount = amountSplit;
splitPayment.AmountSplited = 0; splitPayment.AmountSplited = 0;
splitPayment.AmountUsed = 0; splitPayment.AmountUsed = 0;
......
...@@ -344,7 +344,6 @@ namespace Kivii.Finances.Transforms ...@@ -344,7 +344,6 @@ namespace Kivii.Finances.Transforms
invoice.PayerBankAccount = info.PayerBankAccount; invoice.PayerBankAccount = info.PayerBankAccount;
invoice.OperatorName = info.OperatorName; invoice.OperatorName = info.OperatorName;
invoice.Remark = info.Remark; invoice.Remark = info.Remark;
invoice.Summary = "插入发票!";
invoice.Metadata = new Dictionary<string, string>(); invoice.Metadata = new Dictionary<string, string>();
if (!info.Metadata.IsNullOrEmpty()) if (!info.Metadata.IsNullOrEmpty())
......
...@@ -11,6 +11,12 @@ using System.Threading.Tasks; ...@@ -11,6 +11,12 @@ using System.Threading.Tasks;
namespace Kivii.Finances.Transforms namespace Kivii.Finances.Transforms
{ {
[RequiresAnyRole(SystemRoles.Everyone)] [RequiresAnyRole(SystemRoles.Everyone)]
public class PaymentUpdate : RestfulUpdate<Payment>
{
}
[RequiresAnyRole(SystemRoles.Everyone)]
public class PaymentQuery : RestfulQuery<Payment> public class PaymentQuery : RestfulQuery<Payment>
{ {
......
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