|
|
@@ -2628,7 +2628,8 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
return "当前任务工厂编号为空,请检查。";
|
|
|
}
|
|
|
- List<string> tsWork = new List<string> { "test", "tcn", "rw" };
|
|
|
+ //List<string> tsWork = new List<string> { "test", "tcn", "rw" };
|
|
|
+ List<string> tsWork = new List<string> { "test", "rw" };
|
|
|
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;
|
|
|
|
|
|
@@ -3003,7 +3004,7 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
DateTime.TryParse(endtime, out etime);
|
|
|
}*/
|
|
|
- List<string> tsWork = new List<string> { "test", "tcn", "rw" };
|
|
|
+ List<string> tsWork = new List<string> { "test", "rw" };
|
|
|
//var ordlist = _workOrdMaster.Select(x => x.Domain == domain && x.OrdDate>= stime && x.OrdDate <= etime && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && (x.Status.ToLower() == "p" || x.Status.ToLower() == "r")).ToList();
|
|
|
var ordlist = _workOrdMaster.Select(x => x.Domain == domain && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && (x.Status.ToLower() == "p" || x.Status.ToLower() == "r")).ToList();
|
|
|
|
|
|
@@ -3383,7 +3384,7 @@ namespace Business.ResourceExamineManagement
|
|
|
|
|
|
//删除同步Mysql后旧数据
|
|
|
await DeleteMySqlOldData(sentrys);
|
|
|
- List<string> tsWork = new List<string> { "试制工单", "TCN工单", "返工工单" };
|
|
|
+ List<string> tsWork = new List<string> { "试制工单", "返工工单" };
|
|
|
List<mo_ic_bom> boms = _ic_bom.GetListAsync(p => mo_Mes_Morders.Where(x=> !tsWork.Contains(x.morder_type)).Select(m => m.bom_number).Contains(p.bom_number) && p.factory_id == param.factoryId && p.company_id == param.company_id && !p.IsDeleted).Result.ToList();
|
|
|
|
|
|
//物料bom
|
|
|
@@ -4156,7 +4157,8 @@ namespace Business.ResourceExamineManagement
|
|
|
CreateUser = user?.Name,
|
|
|
UpdateUser = user?.Name,
|
|
|
UM = find.UM,
|
|
|
- LotSerial = typed ? a.LotSerial : ""
|
|
|
+ LotSerial = typed ? a.LotSerial : "",
|
|
|
+ ItemName = find.Descr
|
|
|
});
|
|
|
i++;
|
|
|
}
|