1. 添加你入库页面验证
2. 库存查询条件 3. 接口任务完成修改 4. 添加物料及物料工序的修改
This commit is contained in:
1 parent
13d3a96f0c
commit
713c3528ad
15 files changed
+281
-155
No files matched your search
@@ -45,6 +45,14 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
[ActionDescription("Sys.Search")]
|
||||
[HttpPost]
|
||||
public string Search2(MaterialProcessListVM2 vm)
|
||||
{
|
||||
vm.Searcher.Page = vm.FC.GetValue<int>("Page");
|
||||
vm.Searcher.Limit = vm.FC.GetValue<int>("Limit");
|
||||
return vm.GetJson(false);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Create
|
||||
@@ -112,6 +120,15 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
else
|
||||
{
|
||||
var code = _unitWork.FindSingle<MaterialProcess>(x => x.ProcessName == vm.Entity.ProcessName)?.ProcessCode;
|
||||
vm.Entity.ProcessCode = code;
|
||||
// 判断是否重复
|
||||
if (_unitWork.IsExit<MaterialProcess>(x => x.ID != vm.Entity.ID && x.MaterialCode == vm.Entity.MaterialCode
|
||||
&& (x.ProcessOrder == vm.Entity.ProcessOrder
|
||||
|| x.ProcessName == vm.Entity.ProcessName)))
|
||||
{
|
||||
return FFResult().Alert("同一物料的工序或者顺序不能重复,请检查后重新编辑!");
|
||||
}
|
||||
vm.DoEdit();
|
||||
if (!ModelState.IsValid)
|
||||
{
|
||||
@@ -120,7 +137,7 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
else
|
||||
{
|
||||
return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID);
|
||||
return FFResult().CloseDialog().RefreshGrid(vm.ParentWindowId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user