|
|
@@ -1150,7 +1150,7 @@ namespace Business.Replenishment
|
|
|
//出库记录
|
|
|
var invTransHists = _invTransHist.Select(a => a.Domain == input.factory_id.ToString() && a.IsActive && a.CreateTime >= dateBegin && itemList.Contains(a.ItemNum) && a.QtyChange<0);
|
|
|
//对账单,取对账日期最新的数据
|
|
|
- string sqldzd = @"SELECT ItemNum,NETPR FROM (SELECT MATNR AS ItemNum,NETPR,ROW_NUMBER() OVER (PARTITION BY MATNR ORDER BY BUDAT DESC) AS rn FROM SupplierStatement ) as SupplierStatement WHERE rn = 1";
|
|
|
+ string sqldzd = @"SELECT ItemNum,1.0*NETPR/PEINH * (1+kbetr) as NETPR FROM (SELECT MATNR AS ItemNum,NETPR,PEINH,kbetr,ROW_NUMBER() OVER (PARTITION BY MATNR ORDER BY BUDAT DESC) AS rn FROM SupplierStatement ) as SupplierStatement WHERE rn = 1";
|
|
|
var supplierStatementDtos = _businessDbContext.SupplierStatementDto.FromSqlRaw(sqldzd).ToList();
|
|
|
List<ReplenishmentROPWeekPlanDto> replenishmentROPWeekPlanDtos = GetRopAmount(itemList.Distinct().ToList(), supplierStatementDtos, invTransHists,input);
|
|
|
|