111
This commit is contained in:
parent
e4fba8cde0
commit
58f7dfa648
@ -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
|
||||
|
@ -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(); ;
|
||||
@ -392,10 +396,7 @@ namespace MyCode.Project.Services.Implementation
|
||||
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.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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user