diff --git a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs index d8b302b..4907d20 100644 --- a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs @@ -647,8 +647,8 @@ namespace CK.SCP.Controller { ScpEntities scpdb = EntitiesFactory.CreateScpInstance(); ExchangeCenterContext db = EntitiesFactory.CreateExchangeCenterInstance(); - var _list = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "BJBMPT").OrderBy(p => p.UID).ToList(); - var _list1 = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "BJBMPT" && p.InterfaceType == "Price").OrderBy(p => p.UID).ToList(); + var _list = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "CQBMPT").OrderBy(p => p.UID).ToList(); + var _list1 = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "CQBMPT" && p.InterfaceType == "Price").OrderBy(p => p.UID).ToList(); var apiii = _list1.Count(); if (apiii > 0) diff --git a/北京北汽/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx.cs b/北京北汽/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx.cs index 6963d40..fb2ef61 100644 --- a/北京北汽/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx.cs +++ b/北京北汽/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx.cs @@ -142,7 +142,7 @@ namespace SCP.Views.SupplierData 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; diff --git a/北京北汽/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs b/北京北汽/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs index bc1e3df..7a5839c 100644 --- a/北京北汽/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs +++ b/北京北汽/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs @@ -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;