Fixed EdiOrderGenerator

This commit is contained in:
2022-09-06 19:17:15 +02:00
parent 0e62cd05dc
commit acb14dbcd3
4 changed files with 17 additions and 16 deletions

View File

@@ -74,8 +74,9 @@ namespace ClientEdiOrdersGenerator.DataProvider
public Guid? CheckIfCustomerOrderExists(string customerNumber, int customerSequenceNumber, string customerPo)
{
return SytelineSaAppDataContext.CustomerOrders.FirstOrDefault(x =>
x.CustomerNumber == customerNumber && x.CustomerSequenceNumber == customerSequenceNumber &&
x.CustomerPoNumber == customerPo && !"CHS".Contains(x.Status))?.RowPointer;
x.CustomerNumber == customerNumber && x.CustomerSequenceNumber == customerSequenceNumber &&
x.CustomerPoNumber == customerPo && !"CHS".Contains(x.Status) && !x.TakenBy.StartsWith("EDI"))
?.RowPointer;
}
public EdiCustomerOrder GetCustomerOrder(Guid rowPointer)

View File

@@ -20,7 +20,7 @@ namespace ClientEdiOrdersGenerator
IList<EdiCustomerOrderLine> ediCustomerOrderLines = new List<EdiCustomerOrderLine>();
IList<EdiCustomerOrderLineItem> ediCustomerOrderLineItems = new List<EdiCustomerOrderLineItem>();
DateTime currentDate = new DateTime(2022, 5, 19, 10, 0, 0);
DateTime currentDate = new DateTime(2022, 8, 30, 10, 0, 0);
DateTime workingDate = currentDate.AddMinutes(-5);
FaKrosnoDataContext faKrosnoDataContext = new FaKrosnoDataContext();
@@ -32,7 +32,7 @@ namespace ClientEdiOrdersGenerator
new SytelineDataProvider(faKrosnoDataContext, sytelineSaAppDataContext);
IList<ScheduleOrder> scheduleOrders = faKrosnoDataProvider.GetFaKrosnoScheduleOrders(workingDate)
.Where(x => x.Id == 7636)
.Where(x => x.Id == 8188)
.Take(1).ToList();
int number = sytelineDataProvider.GetLastCoNumber();
@@ -155,7 +155,7 @@ namespace ClientEdiOrdersGenerator
ShipPartial = customer.ShipPartial,
ShipEarly = customer.ShipEarly,
TpCode = customerTp.TpCode,
RecivedDate = currentDate,
RecivedDate = scheduleOrder.LastUpdateDate,
EdiOrder = 1,
CustomerOrderNumber = orderNumber,
EffectiveDate = scheduleOrder.ScheduleOrderDetail.SelectMany(x => x.ScheduleOrderDetailDetail)
@@ -191,7 +191,7 @@ namespace ClientEdiOrdersGenerator
UfFkrEdiMessageRefNum = scheduleOrder.ScheduleOrderMisc.First(m => m.Type == "DOCNUMBER").Value,
UfFkrEdiConsigneeAddress = "", //dopytac
UfFkrEdiConsigneeName = "", //dopytac
UfFkrEdiFileName = "", //dopytac
UfFkrEdiFileName = $"ID: {scheduleOrder.Id}", //dopytac
};
}
@@ -278,7 +278,7 @@ namespace ClientEdiOrdersGenerator
QtyOrderedReleased = scheduleOrderDetailDetail.Qty,
PriceReleased = ediCustomerOrderLine.ContPrice,
CustomerOrderCustomerNumber = ediCustomerOrder.CustomerNumber,
ReleaseDate = currentDate,
ReleaseDate = scheduleOrderDetailDetail.DateFrom,
Description = ediCustomerOrderLine.Description,
RowPointer = Guid.NewGuid(),
SupplyQtyConvFactor = 1,

View File

@@ -178,10 +178,10 @@ namespace SytelineSaAppDataModel
[Column("ship_partial")]
public byte? ShipPartial { get; set; }
[Column("")]
public byte? ShipEarly { get; set; }
[Column("")]
public decimal? MatlCostT { get; set; }
//[Column("")]
//public byte? ShipEarly { get; set; }
//[Column("")]
//public decimal? MatlCostT { get; set; }
[Column("lbr_cost_t")]
public decimal? LbrCostT { get; set; }
@@ -285,8 +285,8 @@ namespace SytelineSaAppDataModel
[Column("charfld3")]
public string CharFieldThree { get; set; }
[Column("")]
public DateTime? DateField { get; set; }
//[Column("")]
//public DateTime? DateField { get; set; }
[Column("decifld1")]
public decimal? DecimalFieldOne { get; set; }

View File

@@ -960,9 +960,9 @@ namespace SytelineSaAppDataModel
.Property(e => e.Discount)
.HasPrecision(7, 4);
modelBuilder.Entity<CustomerOrder>()
.Property(e => e.MatlCostT)
.HasPrecision(23, 8);
//modelBuilder.Entity<CustomerOrder>()
// .Property(e => e.MatlCostT)
// .HasPrecision(23, 8);
modelBuilder.Entity<CustomerOrder>()
.Property(e => e.LbrCostT)