|
|
@@ -2074,7 +2074,7 @@ namespace Business.ResourceExamineManagement
|
|
|
await MongoHelper<mo_ic_item_stock>.InsertManyAsync(moIcitemStokc);
|
|
|
}
|
|
|
|
|
|
- var workordmsters = _workOrdMaster.Select(s => s.Domain == factoryId.ToString() && string.IsNullOrEmpty(s.Status) != true && s.Status.ToLower() != "c" && string.IsNullOrEmpty(s.AnalogCalcVersion) == true);
|
|
|
+ var workordmsters = _workOrdMaster.Select(s => s.Domain == factoryId.ToString() && string.IsNullOrEmpty(s.Status) != true && s.Status.ToLower() != "c" && string.IsNullOrEmpty(s.AnalogCalcVersion));
|
|
|
if (workordmsters.Any())
|
|
|
{
|
|
|
//根据工单表找到工单明细，然后根据DOP工单占用记录，对比工单明细发货数量，来做冲销。
|
|
|
@@ -2637,7 +2637,7 @@ namespace Business.ResourceExamineManagement
|
|
|
return "当前任务工厂编号为空，请检查。";
|
|
|
}
|
|
|
List<string> tsWork = new List<string> { "test", "tcn", "rw" };
|
|
|
- var ordlist = _workOrdMaster.Select(x => x.Domain == domain && x.WorkOrd== "M500413982" && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && x.Status.ToLower() == "p").ToList();
|
|
|
+ var ordlist = _workOrdMaster.Select(x => x.Domain == domain && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && x.Status.ToLower() == "p").ToList();
|
|
|
List<mes_morder> Mes_Morders = _mysql_mes_morder.GetListAsync(x => ordlist.Select(c=>c.WorkOrd).Contains(x.morder_no) && x.factory_id.ToString() == domain).Result;
|
|
|
|
|
|
/*//先排除锁定期内的工单 //优先级排序
|
