This commit is contained in:
余宇波 2025-05-19 18:45:03 +08:00
parent c87d28d608
commit e4fba8cde0
3 changed files with 13 additions and 3 deletions

View File

@ -32,6 +32,12 @@ namespace MyCode.Project.Domain.Message.Act.PurchaseOrder
/// </summary> /// </summary>
public string F_URXD_Date { get; set; } public string F_URXD_Date { get; set; }
/// <summary>
/// Desc:发货日期
/// Default:
/// Nullable:True
/// </summary>
public DateTime? FaHuoDate { get; set; }
/// <summary> /// <summary>
/// 明细内容 /// 明细内容

View File

@ -336,10 +336,11 @@ namespace MyCode.Project.Services.Implementation
NewInvoiceOrder.Creater = loginInfo.Name; NewInvoiceOrder.Creater = loginInfo.Name;
NewInvoiceOrder.SupplierId = supplierId; NewInvoiceOrder.SupplierId = supplierId;
NewInvoiceOrder.SupplierName = orderHeadList.FirstOrDefault().SupplierName; NewInvoiceOrder.SupplierName = orderHeadList.FirstOrDefault().SupplierName;
NewInvoiceOrder.FDate = DateTime.Now; NewInvoiceOrder.FDate = act.FaHuoDate;
NewInvoiceOrder.Sheet = DateTime.Now.ToString("yyMMddhhmmssfff"); NewInvoiceOrder.Sheet = DateTime.Now.ToString("yyMMddhhmmssfff");
NewInvoiceOrder.PurchaseOrderId = 0; NewInvoiceOrder.PurchaseOrderId = 0;
NewInvoiceOrder.F_VHUB_Text = act.F_VHUB_Text; NewInvoiceOrder.F_VHUB_Text = act.F_VHUB_Text;
NewInvoiceOrder.F_URXD_Date = act.F_URXD_Date; NewInvoiceOrder.F_URXD_Date = act.F_URXD_Date;
NewInvoiceOrder.FPurchaseOrgId = orderHeadList.FirstOrDefault().FPurchaseOrgId; NewInvoiceOrder.FPurchaseOrgId = orderHeadList.FirstOrDefault().FPurchaseOrgId;
NewInvoiceOrder.FPurchaseOrgName = orderHeadList.FirstOrDefault().FPurchaseOrgName; NewInvoiceOrder.FPurchaseOrgName = orderHeadList.FirstOrDefault().FPurchaseOrgName;
@ -391,6 +392,9 @@ namespace MyCode.Project.Services.Implementation
invoiceOrderItemTemp.MaterialName = t.MaterialName; invoiceOrderItemTemp.MaterialName = t.MaterialName;
invoiceOrderItemTemp.Amount1 = t.UnitPrice * temp.Qty; invoiceOrderItemTemp.Amount1 = t.UnitPrice * temp.Qty;
invoiceOrderItemTemp.Amount2 = t.UnitPrice * temp.Qty * t.TaxRate; invoiceOrderItemTemp.Amount2 = t.UnitPrice * temp.Qty * t.TaxRate;
if (act.FaHuoDate.HasValue)
invoiceOrderItemTemp.DeliveryDate = act.FaHuoDate;
else
invoiceOrderItemTemp.DeliveryDate = DateTime.Now; invoiceOrderItemTemp.DeliveryDate = DateTime.Now;
invoiceOrderItemTemp.Qty = temp.Qty; invoiceOrderItemTemp.Qty = temp.Qty;
invoiceOrderItemTemp.Remark = t.Remark; invoiceOrderItemTemp.Remark = t.Remark;