diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..967db76 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/.vs/北京北汽/v16/.suo +/.vs/VSWorkspaceState.json diff --git a/北京北汽/Controller/CK.SCP.Controller.csproj b/北京北汽/Controller/CK.SCP.Controller.csproj index fecd84b..79556f2 100644 --- a/北京北汽/Controller/CK.SCP.Controller.csproj +++ b/北京北汽/Controller/CK.SCP.Controller.csproj @@ -54,7 +54,7 @@ - ..\SCP\bin\Z.EntityFramework.Extensions.dll + ..\DLL\Z.EntityFramework.Extensions.dll diff --git a/北京北汽/Controller/SCP_PO_CONTROLLER.cs b/北京北汽/Controller/SCP_PO_CONTROLLER.cs index 540b479..c68047e 100644 --- a/北京北汽/Controller/SCP_PO_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_PO_CONTROLLER.cs @@ -270,6 +270,32 @@ namespace CK.SCP.Controller } return p_list; } + + + public static List LOAD_PO_DETAIL_SUM_ASK(List p_list) + { + using (ScpEntities db = EntitiesFactory.CreateScpInstance()) + { + if (p_list.Count > 0) + { + //var _detail = p_list[0]; + foreach (V_TB_PO_DETAIL _detail in p_list) + { + var _ask = db.TB_ASK_DETAIL.Where(p => p.PoBillNum == _detail.PoBillNum && p.IsDeleted == false).GroupBy(p => new { p.PoBillNum, p.PoLine, p.PartCode }).Select(p => new { AskSum = p.Sum(itm => itm.AskQty), PoLine = p.Key.PoLine, PoBillNum = p.Key.PoBillNum, PartCode = p.Key.PartCode }); + _ask.ToList().ForEach(itm => + { + if (_detail.PoBillNum == itm.PoBillNum && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode) + { + _detail.TempQty = itm.AskSum; + } + }); + + } + } + + } + return p_list; + } public static ResultObject Save_TB_PO_STATE(List p_list, PoState p_state) { ResultObject _ret = new ResultObject(); diff --git a/北京北汽/DLL/Z.EntityFramework.Extensions.dll b/北京北汽/DLL/Z.EntityFramework.Extensions.dll new file mode 100644 index 0000000..8159bb1 Binary files /dev/null and b/北京北汽/DLL/Z.EntityFramework.Extensions.dll differ diff --git a/北京北汽/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs b/北京北汽/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs index c9be718..fe27cba 100644 --- a/北京北汽/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs +++ b/北京北汽/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs @@ -119,7 +119,7 @@ namespace SCP.PlanData } this.Grid_V_TB_PO_DETAIL.RecordCount = ret.Count(); var list = SortAndPage(ret, Grid_V_TB_PO_DETAIL); - var _ls= SCP_CONTRACT_CONTROLLER.GET_CONTRACT_PRICE_LIST(SCP_PO_CONTROLLER.LOAD_PO_DETAIL_SUM(list.ToList())); + var _ls= SCP_CONTRACT_CONTROLLER.GET_CONTRACT_PRICE_LIST(SCP_PO_CONTROLLER.LOAD_PO_DETAIL_SUM_ASK(list.ToList())); if (qadOrder != null) { if (qadOrder.ModType == (int)BillModType.Non_Contract)