yuyubo/MeiSaiSiXieTongApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
余宇波 2025-05-20 14:43:24 +08:00
parent e4fba8cde0
commit 58f7dfa648
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs
View File

@ -671,9 +671,26 @@ namespace MyCode.Project.Domain.Message.Act.PurchaseOrder
/// ///
/// </summary> /// </summary>
public int FEntryID { get; set; } public int FEntryID { get; set; }
/// <summary>
/// 供应商承诺交期 测试环境
/// </summary>
public string FSupDueDate { get; set; } public string FSupDueDate { get; set; }
/// <summary>
/// 供应商承诺最新交期 测试环境
/// </summary>
public string FSupDueNewDate { get; set; } 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 public class FPayMaterialId

15
MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
View File

@ -18,6 +18,7 @@ using MyCode.Project.Repositories;
using MyCode.Project.Repositories.Common; using MyCode.Project.Repositories.Common;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Senparc.CO2NET.Extensions;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Configuration; using System.Configuration;
@ -224,7 +225,7 @@ namespace MyCode.Project.Services.Implementation
act.NeedUpDateFields = new List<string>(); act.NeedUpDateFields = new List<string>();
act.NeedUpDateFields.Add("FPOOrderEntry"); act.NeedUpDateFields.Add("FPOOrderEntry");
act.NeedUpDateFields.Add("FSupDueDate"); act.NeedUpDateFields.Add("FSupDueDate");
act.NeedUpDateFields.Add("F_YRVD_Date_re5");
list.ForEach(t => list.ForEach(t =>
{ {
var temp = updateList.FirstOrDefault(h => h.Id == t.Id); 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 = new List<string>();
act.NeedUpDateFields.Add("FPOOrderEntry"); act.NeedUpDateFields.Add("FPOOrderEntry");
act.NeedUpDateFields.Add("FSupDueNewDate"); act.NeedUpDateFields.Add("FSupDueNewDate");
act.NeedUpDateFields.Add("F_YRVD_Date_apv");
list.ForEach(t => list.ForEach(t =>
{ {
var temp = updateList.FirstOrDefault(h => h.Id == t.Id); var temp = updateList.FirstOrDefault(h => h.Id == t.Id);
@ -305,6 +307,8 @@ namespace MyCode.Project.Services.Implementation
[TransactionCallHandler] [TransactionCallHandler]
public string BatchAddInvoiceOrder(AddOrder act , LoginInfo loginInfo) public string BatchAddInvoiceOrder(AddOrder act , LoginInfo loginInfo)
{ {
if (!act.FaHuoDate.HasValue)
act.FaHuoDate = DateTime.Now;
List<UpdateQty> updateList = act.UpDateList; List<UpdateQty> updateList = act.UpDateList;
string supplierId = loginInfo.SupplierId; string supplierId = loginInfo.SupplierId;
var ids = updateList.Select(t => t.Id).ToList(); ; var ids = updateList.Select(t => t.Id).ToList(); ;
@ -391,11 +395,8 @@ namespace MyCode.Project.Services.Implementation
invoiceOrderItemTemp.MaterialCode = t.MaterialCode; invoiceOrderItemTemp.MaterialCode = t.MaterialCode;
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;
invoiceOrderItemTemp.DeliveryDate = act.FaHuoDate;
else
invoiceOrderItemTemp.DeliveryDate = DateTime.Now;
invoiceOrderItemTemp.Qty = temp.Qty; invoiceOrderItemTemp.Qty = temp.Qty;
invoiceOrderItemTemp.Remark = t.Remark; invoiceOrderItemTemp.Remark = t.Remark;
invoiceOrderItemTemp.SpecificationModel = t.SpecificationModel; invoiceOrderItemTemp.SpecificationModel = t.SpecificationModel;
@ -717,6 +718,8 @@ namespace MyCode.Project.Services.Implementation
temp.FEntryID = act.EntityId; temp.FEntryID = act.EntityId;
temp.FSupDueDate = act.values.ToString(); temp.FSupDueDate = act.values.ToString();
temp.FSupDueNewDate = 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); orderSaveModel.FPOOrderEntry.Add(temp);
//Dictionary<string, object> keyValuePairs = new Dictionary<string, object>(); //Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
//keyValuePairs.Add(NeedUpDateFields, values); //keyValuePairs.Add(NeedUpDateFields, values);