|
|
@@ -5724,7 +5724,7 @@ namespace Business.ResourceExamineManagement
|
|
|
var examineIds = workExamineResult.Select(s => s.examineId).ToList();
|
|
|
var examines=_mysql_bom_child_examine.GetListAsync(a => examineIds.Contains(a.examine_id.Value) && (a.erp_cls==3 || a.erp_cls==2) && a.is_use && a.factory_id.ToString() == domain).Result;
|
|
|
var pickBills = _nbrDetail.Select(a => workordListPickBill.Contains(a.WorkOrd) && a.Type.ToUpper()=="SM" && (a.QtyOrd - a.QtyRec)>0 && a.Domain == domain);
|
|
|
- var dsList=_srm_polist_ds.Select(a => a.requestdate <= endTime && a.domain==domain);
|
|
|
+ var dsList=_srm_polist_ds.Select(a => a.requestdate <= endTime && a.domain==domain && a.isactive==1);
|
|
|
var items = examines.Select(e => e.item_number).Distinct().ToList();
|
|
|
var itempickbills=pickBills.Select(s => s.ItemNum);
|
|
|
items.AddRange(itempickbills);
|