From 58f7dfa64848df09093cb35ef2b824c343a44ee6 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Tue, 20 May 2025 14:43:24 +0800
Subject: [PATCH] 111

---
 .../Message/Act/PurchaseOrder/UpdateTime.cs     | 17 +++++++++++++++++
 .../PurchaseOrder/PurchaseOrderService.cs       | 15 +++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs b/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs
index 819d09a..a6d6143 100644
--- a/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs
+++ b/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs
@@ -671,9 +671,26 @@ namespace MyCode.Project.Domain.Message.Act.PurchaseOrder
         /// 
         /// </summary>
         public int FEntryID { get; set; }
+
+        /// <summary>
+        /// 供应商承诺交期  测试环境
+        /// </summary>
         public string FSupDueDate { get; set; }
 
+        /// <summary>
+        /// 供应商承诺最新交期 测试环境
+        /// </summary>
         public string FSupDueNewDate { get; set; }
+
+        /// <summary>
+        /// 供应商承诺交期  正式环境
+        /// </summary>
+        public string F_YRVD_Date_re5 { get; set; }
+
+        /// <summary>
+        /// 供应商承诺最新交期 正式环境
+        /// </summary>
+        public string F_YRVD_Date_apv { get; set; }
     }
 
     public class FPayMaterialId
diff --git a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
index 1886aeb..1b6ae3e 100644
--- a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
+++ b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
@@ -18,6 +18,7 @@ using MyCode.Project.Repositories;
 using MyCode.Project.Repositories.Common;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Senparc.CO2NET.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -224,7 +225,7 @@ namespace MyCode.Project.Services.Implementation
             act.NeedUpDateFields = new List<string>();
             act.NeedUpDateFields.Add("FPOOrderEntry");
             act.NeedUpDateFields.Add("FSupDueDate");
-
+            act.NeedUpDateFields.Add("F_YRVD_Date_re5");
             list.ForEach(t =>
             {
                 var temp = updateList.FirstOrDefault(h => h.Id == t.Id);
@@ -267,6 +268,7 @@ namespace MyCode.Project.Services.Implementation
             act.NeedUpDateFields = new List<string>();
             act.NeedUpDateFields.Add("FPOOrderEntry");
             act.NeedUpDateFields.Add("FSupDueNewDate");
+            act.NeedUpDateFields.Add("F_YRVD_Date_apv");
             list.ForEach(t =>
             {
                 var temp = updateList.FirstOrDefault(h => h.Id == t.Id);
@@ -305,6 +307,8 @@ namespace MyCode.Project.Services.Implementation
         [TransactionCallHandler]
         public string BatchAddInvoiceOrder(AddOrder act , LoginInfo loginInfo)
         {
+            if (!act.FaHuoDate.HasValue)
+                act.FaHuoDate = DateTime.Now;
             List<UpdateQty> updateList = act.UpDateList;
             string supplierId = loginInfo.SupplierId;
             var ids = updateList.Select(t => t.Id).ToList(); ;
@@ -391,11 +395,8 @@ namespace MyCode.Project.Services.Implementation
                         invoiceOrderItemTemp.MaterialCode = t.MaterialCode;
                         invoiceOrderItemTemp.MaterialName = t.MaterialName;
                         invoiceOrderItemTemp.Amount1 = t.UnitPrice * temp.Qty;
-                        invoiceOrderItemTemp.Amount2 = t.UnitPrice * temp.Qty * t.TaxRate;
-                        if (act.FaHuoDate.HasValue)
-                            invoiceOrderItemTemp.DeliveryDate = act.FaHuoDate;
-                        else
-                            invoiceOrderItemTemp.DeliveryDate = DateTime.Now;
+                        invoiceOrderItemTemp.Amount2 = t.UnitPrice * temp.Qty * t.TaxRate;                       
+                            invoiceOrderItemTemp.DeliveryDate = act.FaHuoDate;                       
                         invoiceOrderItemTemp.Qty = temp.Qty;
                         invoiceOrderItemTemp.Remark = t.Remark;
                         invoiceOrderItemTemp.SpecificationModel = t.SpecificationModel;
@@ -717,6 +718,8 @@ namespace MyCode.Project.Services.Implementation
             temp.FEntryID = act.EntityId;
             temp.FSupDueDate = act.values.ToString();
             temp.FSupDueNewDate = act.values.ToString();
+            temp.F_YRVD_Date_re5 = act.values.ToString();
+            temp.F_YRVD_Date_apv = act.values.ToString();
             orderSaveModel.FPOOrderEntry.Add(temp);
             //Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
             //keyValuePairs.Add(NeedUpDateFields, values);