diff --git a/北京北汽/Controller/SCP_ASK_CONTROLLER.cs b/北京北汽/Controller/SCP_ASK_CONTROLLER.cs index ad45120..59d516f 100644 --- a/北京北汽/Controller/SCP_ASK_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_ASK_CONTROLLER.cs @@ -640,20 +640,24 @@ namespace CK.SCP.Controller if (p_list.Count > 0) { //var _detail = p_list[0]; - var asklist = p_list.Select(q => q.AskBillNum).ToList(); + var asklist = p_list.Select(q => q.AskBillNum).Distinct().ToList(); var arvdetail = db.TB_ARRIVE_DETAIL.Where(p => asklist.Contains(p.Remark) && p.IsDeleted == false && p.State == (int)ArriveState.OK && p.BillType == 3).ToList(); - foreach (V_TB_INCOMPLETE_ASK _detail in p_list) + if (arvdetail.Count() > 0) { - - var reject = arvdetail.Where(p => p.Remark == _detail.AskBillNum).GroupBy(p => new { p.Remark, p.PoLine, p.PartCode }).Select(p => new { RejectSum = p.Sum(itm => itm.Qty), PoLine = p.Key.PoLine, Remark = p.Key.Remark, PartCode = p.Key.PartCode }); - reject.ToList().ForEach(itm => + foreach (V_TB_INCOMPLETE_ASK _detail in p_list) { - if (_detail.AskBillNum == itm.Remark && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode) + + var reject = arvdetail.Where(p => p.Remark == _detail.AskBillNum).GroupBy(p => new { p.Remark, p.PoLine, p.PartCode }).Select(p => new { RejectSum = p.Sum(itm => itm.Qty), PoLine = p.Key.PoLine, Remark = p.Key.Remark, PartCode = p.Key.PartCode }); + reject.ToList().ForEach(itm => { - _detail.Number = _detail.Number + Math.Abs(itm.RejectSum); - } - }); + if (_detail.AskBillNum == itm.Remark && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode) + { + _detail.Number = _detail.Number + Math.Abs(itm.RejectSum); + } + }); + } } + } } diff --git a/北京北汽/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx b/北京北汽/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx index de4452a..78de9d0 100644 --- a/北京北汽/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx +++ b/北京北汽/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx @@ -110,8 +110,8 @@ - - + +