添加datapage页面
修改新物料没有订单是返回所有的工序,优先满足入库
This commit is contained in:
1 parent
59f2af943b
commit
b78861a3d6
6 files changed
+641
-2
No files matched your search
@@ -235,6 +235,19 @@ namespace HHWMS.Web.Controllers
|
||||
processName = x.ProcessName
|
||||
})
|
||||
.ToList();
|
||||
if (processes.Count == 0)
|
||||
{
|
||||
processes = _unitWork.Find<ProcessConfig>(x => x.ID > 0)
|
||||
.OrderBy(x => x.Code)
|
||||
.Select(x => new
|
||||
{
|
||||
value = x.ID.ToString(),
|
||||
label = x.Name,
|
||||
processCode = x.Code,
|
||||
processName = x.Name
|
||||
})
|
||||
.ToList();
|
||||
}
|
||||
return Json(new { Code = 200, Data = processes });
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -266,7 +279,7 @@ namespace HHWMS.Web.Controllers
|
||||
var orders = result.Data.Select(x => new
|
||||
{
|
||||
value = x.MoDetailId,
|
||||
label = x.MoCode,
|
||||
label = string.IsNullOrEmpty(x.MoCode) ? x.MoDetailId : x.MoCode,
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
||||
Reference in new issue
Block a user