|
|
@ -304,7 +304,7 @@ namespace SCP.SupplierData |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
SCP_TB_PRICE_CONTROLLER.Get_PRICE_List( _p |
|
|
|
SCP_TB_PRICE_CONTROLLER.Get_PRICE_List(_p |
|
|
|
, |
|
|
|
(rs) => |
|
|
|
{ |
|
|
@ -316,7 +316,7 @@ namespace SCP.SupplierData |
|
|
|
#endregion
|
|
|
|
foreach (var itm in temp) |
|
|
|
{ |
|
|
|
var _currPrice = _priceLst.Where(p => p.StartTime <= itm.ShipTime && itm.ShipTime <= p.EndTime && p.PartCode.Trim().ToUpper() == itm.PartCode.Trim().ToUpper()).FirstOrDefault(); |
|
|
|
var _currPrice = _priceLst.Where(p => p.StartTime <= itm.ShipTime && itm.ShipTime <= p.EndTime && p.PartCode.Trim().ToUpper() == itm.PartCode.Trim().ToUpper() && p.SubSite == CurrentUser.UserdSite).FirstOrDefault(); |
|
|
|
if (_currPrice != null && _currPrice.Amt > 0) |
|
|
|
{ |
|
|
|
itm.Price = _currPrice.Amt; |
|
|
@ -349,7 +349,6 @@ namespace SCP.SupplierData |
|
|
|
_p.VendId = DDL_VEND_LIST.SelectedValue; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
SCP_TB_PRICE_CONTROLLER.Get_PRICE_List(_p |
|
|
|
, |
|
|
|
(rs) => |
|
|
@ -359,10 +358,10 @@ namespace SCP.SupplierData |
|
|
|
_priceLst = rs.Result.ToList(); |
|
|
|
} |
|
|
|
}); |
|
|
|
#endregion
|
|
|
|
#endregion`
|
|
|
|
foreach (var itm in temp) |
|
|
|
{ |
|
|
|
var _currPrice = _priceLst.Where(p => p.StartTime <= itm.ShipTime && itm.ShipTime <= p.EndTime && p.PartCode.Trim().ToUpper() == itm.PartCode.Trim().ToUpper()).FirstOrDefault(); |
|
|
|
var _currPrice = _priceLst.Where(p => p.StartTime <= itm.ShipTime && itm.ShipTime <= p.EndTime && p.PartCode.Trim().ToUpper() == itm.PartCode.Trim().ToUpper() && p.SubSite == CurrentUser.UserdSite).FirstOrDefault(); |
|
|
|
if (_currPrice != null && _currPrice.Amt > 0) |
|
|
|
{ |
|
|
|
itm.Price = _currPrice.Amt; |
|
|
@ -651,7 +650,7 @@ namespace SCP.SupplierData |
|
|
|
#endregion
|
|
|
|
foreach (var itm in _lst) |
|
|
|
{ |
|
|
|
var _currPrice = _priceLst.Where(p => p.StartTime <= itm.ShipTime && itm.ShipTime <= p.EndTime && p.PartCode.Trim().ToUpper() == itm.PartCode.Trim().ToUpper()).FirstOrDefault(); |
|
|
|
var _currPrice = _priceLst.Where(p => p.StartTime <= itm.ShipTime && itm.ShipTime <= p.EndTime && p.PartCode.Trim().ToUpper() == itm.PartCode.Trim().ToUpper()&& p.SubSite == CurrentUser.UserdSite).FirstOrDefault(); |
|
|
|
if (_currPrice != null && _currPrice.Amt > 0) |
|
|
|
{ |
|
|
|
itm.Price = _currPrice.Amt; |
|
|
|