|
@ -640,8 +640,10 @@ namespace CK.SCP.Controller |
|
|
if (p_list.Count > 0) |
|
|
if (p_list.Count > 0) |
|
|
{ |
|
|
{ |
|
|
//var _detail = p_list[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(); |
|
|
var arvdetail = db.TB_ARRIVE_DETAIL.Where(p => asklist.Contains(p.Remark) && p.IsDeleted == false && p.State == (int)ArriveState.OK && p.BillType == 3).ToList(); |
|
|
|
|
|
if (arvdetail.Count() > 0) |
|
|
|
|
|
{ |
|
|
foreach (V_TB_INCOMPLETE_ASK _detail in p_list) |
|
|
foreach (V_TB_INCOMPLETE_ASK _detail in p_list) |
|
|
{ |
|
|
{ |
|
|
|
|
|
|
|
@ -657,6 +659,8 @@ namespace CK.SCP.Controller |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
return p_list; |
|
|
return p_list; |
|
|
} |
|
|
} |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|