|
|
@@ -4632,9 +4632,9 @@ namespace Business.ResourceExamineManagement
|
|
|
var nbrDetails = _nbrDetail.Select(n=> workOrds.Select(s => s.WorkOrd).Contains(n.WorkOrd));
|
|
|
//排除领料单已发料数量
|
|
|
var pretreatments = AutoCreateBomFromOrderDetail(boms, icitemlist, mo_Mes_Morders, workOrdDetails, nbrDetails);
|
|
|
+ var comwork= pretreatments.Where(s => s.version == "ok").ToList();
|
|
|
//排除已发完料的工单
|
|
|
pretreatments = pretreatments.Where(s => s.version != "ok").ToList();
|
|
|
-
|
|
|
await AsyncItemStockFromWMS(pretreatments);
|
|
|
//数据库快照-同步mysql库数据到mongoDB中
|
|
|
await DbSnapShot(param.company_id, param.factoryId, bangid, pretreatments);
|
|
|
@@ -4761,6 +4761,10 @@ namespace Business.ResourceExamineManagement
|
|
|
work.LocationStock = 0;
|
|
|
}
|
|
|
}
|
|
|
+ if (comwork.Where(s => s.sourceid == item.Id).ToList().Any())
|
|
|
+ {
|
|
|
+ work.LocationStock = work.QtyOrded;
|
|
|
+ }
|
|
|
//替代关系展开list
|
|
|
dtl.BomChildExamineList = getBomList;
|
|
|
//添加订单行开工信息
|
|
|
@@ -6345,9 +6349,9 @@ namespace Business.ResourceExamineManagement
|
|
|
//刷新优先级
|
|
|
_replenishmentAppService.RefreshPriority(workOrds.Select(s => s.WorkOrd).ToList(), domain);
|
|
|
//获取工单领料单
|
|
|
- var nbrMasterList = _nbrMaster.Select(x => x.Domain == domain && x.Type.ToUpper() == "SM" && workOrds.Select(s => s.WorkOrd).Contains(x.WorkOrd)).ToList();
|
|
|
+ //var nbrMasterList = _nbrMaster.Select(x => x.Domain == domain && x.Type.ToUpper() == "SM" && workOrds.Select(s => s.WorkOrd).Contains(x.WorkOrd)).ToList();
|
|
|
//获取领料单明细
|
|
|
- var nbrDtlLists = _nbrDetail.Select(x => x.Domain == domain && nbrMasterList.Select(s => s.Nbr).Contains(x.Nbr)).ToList();
|
|
|
+ //var nbrDtlLists = _nbrDetail.Select(x => x.Domain == domain && nbrMasterList.Select(s => s.Nbr).Contains(x.Nbr)).ToList();
|
|
|
workOrds = workOrds.OrderBy(p => p.Priority).ToList();
|
|
|
#region 优先级
|
|
|
|
