diff --git a/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs b/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs index 7f84dff..819d09a 100644 --- a/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs +++ b/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs @@ -32,6 +32,12 @@ namespace MyCode.Project.Domain.Message.Act.PurchaseOrder /// public string F_URXD_Date { get; set; } + /// + /// Desc:发货日期 + /// Default: + /// Nullable:True + /// + public DateTime? FaHuoDate { get; set; } /// /// 明细内容 diff --git a/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs b/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs index 96a404c..e413499 100644 --- a/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs +++ b/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs @@ -183,7 +183,7 @@ namespace MyCode.Project.Domain.Message.Response.InvoiceOrder /// /// 每包数量 /// - public decimal CuseQty { get; set; } + public decimal CuseQty { get; set; } } } diff --git a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs index 1cdbf59..1886aeb 100644 --- a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs +++ b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs @@ -336,10 +336,11 @@ namespace MyCode.Project.Services.Implementation NewInvoiceOrder.Creater = loginInfo.Name; NewInvoiceOrder.SupplierId = supplierId; NewInvoiceOrder.SupplierName = orderHeadList.FirstOrDefault().SupplierName; - NewInvoiceOrder.FDate = DateTime.Now; + NewInvoiceOrder.FDate = act.FaHuoDate; NewInvoiceOrder.Sheet = DateTime.Now.ToString("yyMMddhhmmssfff"); NewInvoiceOrder.PurchaseOrderId = 0; NewInvoiceOrder.F_VHUB_Text = act.F_VHUB_Text; + NewInvoiceOrder.F_URXD_Date = act.F_URXD_Date; NewInvoiceOrder.FPurchaseOrgId = orderHeadList.FirstOrDefault().FPurchaseOrgId; NewInvoiceOrder.FPurchaseOrgName = orderHeadList.FirstOrDefault().FPurchaseOrgName; @@ -391,7 +392,10 @@ namespace MyCode.Project.Services.Implementation invoiceOrderItemTemp.MaterialName = t.MaterialName; invoiceOrderItemTemp.Amount1 = t.UnitPrice * temp.Qty; invoiceOrderItemTemp.Amount2 = t.UnitPrice * temp.Qty * t.TaxRate; - invoiceOrderItemTemp.DeliveryDate = DateTime.Now; + if (act.FaHuoDate.HasValue) + invoiceOrderItemTemp.DeliveryDate = act.FaHuoDate; + else + invoiceOrderItemTemp.DeliveryDate = DateTime.Now; invoiceOrderItemTemp.Qty = temp.Qty; invoiceOrderItemTemp.Remark = t.Remark; invoiceOrderItemTemp.SpecificationModel = t.SpecificationModel;