添加工序配置

修改入库页面,任务完成,库存页面等
This commit is contained in:
zhougf committed 2025-08-31 15:57:46 +08:00
1 parent c2b039ea47
commit 5a04ca9d59
41 files changed
+1151 -84

No files matched your search

@@ -249,6 +249,13 @@ namespace HHWMS.Web.Controllers
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.Print")]
public ActionResult Print(ContainerVM vm)
{
return Ok();
}
[HttpPost]
[ActionDescription("Container.AddContainer")]
public ActionResult AddContainer(ContainerVM vm)
@@ -265,8 +272,10 @@ namespace HHWMS.Web.Controllers
vm.MSD.AddModelError(vm.Entity.BatchError, "数量和类型必填,且数量要大于0!");
return PartialView(vm);
}
var maxContainer = _unitwork.Find<Container>(x => x.Type == vm.Entity.Type).ToList().MaxBy(x => x.Code);
int maxNum = 1;
var zoneid = _unitwork.FindSingle<LocationZone>(x => x.ZoneCode == vm.Entity.Type).ID;
var maxContainer = _unitwork.Find<Container>(x => x.Type == vm.Entity.Type).ToList().MaxBy(x => x.ID);
int maxNum = 0;
if (maxContainer != null)
int.TryParse(maxContainer?.Code.Substring(1, 4), out maxNum);
// 查询已有的最大托盘值 在此基础上累加
@@ -281,7 +290,8 @@ namespace HHWMS.Web.Controllers
Status = ContainerStatus.空,
Length = vm.Entity.Length,
Width = vm.Entity.Width,
Height = vm.Entity.Height
Height = vm.Entity.Height,
ZoneId = zoneid
});
}
_unitwork.BatchAdd<Container>(containerList.ToArray());
@@ -1,10 +1,12 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Linq;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web;
using HHWMS.Web.Models;
namespace HHWMS.Web.Controllers
{
@@ -63,6 +65,15 @@ namespace HHWMS.Web.Controllers
}
else
{
if (DC.Set<Material>().Any(x => x.MaterialCode == vm.Entity.MaterialCode))
{
return FFResult().Alert($"已存在 物料编码 为{vm.Entity.MaterialCode}的数据");
}
if (DC.Set<Material>().Any(x => x.MaterialType == vm.Entity.MaterialType))
{
return FFResult().Alert($"已存在 图号 为{vm.Entity.MaterialType}的数据");
}
vm.DoAdd();
if (!ModelState.IsValid)
{
@@ -1,10 +1,12 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Linq;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web;
using HHWMS.Web.Models;
namespace HHWMS.Web.Controllers
{
@@ -63,6 +65,20 @@ namespace HHWMS.Web.Controllers
}
else
{
if (!DC.Set<Material>().Any(x => x.MaterialCode == vm.Entity.MaterialCode))
{
return FFResult().Alert($"物料编码 为{vm.Entity.MaterialCode}的物料基础数据不存在!请先添加物料基础数据!");
}
if (DC.Set<MaterialProcess>().Any(x => x.MaterialCode == vm.Entity.MaterialCode
&& x.ProcessOrder == vm.Entity.ProcessOrder))
{
return FFResult().Alert($"已存在 工序顺序 为{vm.Entity.ProcessOrder}的数据!");
}
if (DC.Set<MaterialProcess>().Any(x => x.MaterialCode == vm.Entity.MaterialCode
&& x.ProcessCode == vm.Entity.ProcessCode))
{
return FFResult().Alert($"已存在 工序编码 为{vm.Entity.ProcessCode}的数据!");
}
vm.DoAdd();
if (!ModelState.IsValid)
{
@@ -0,0 +1,238 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Linq;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web;
using HHWMS.Web.Models;
namespace HHWMS.Web.Controllers
{
[Area("configs")]
[ActionDescription("工序配置")]
public partial class ProcessConfigController : BaseController
{
private readonly IUnitWork _unitWork;
public ProcessConfigController(IUnitWork unitWork)
{
_unitWork = unitWork;
}
#region Search
[ActionDescription("Sys.Search")]
public ActionResult Index()
{
var vm = Wtm.CreateVM<ProcessConfigListVM>();
return PartialView(vm);
}
[ActionDescription("Sys.Search")]
[HttpPost]
public string Search(ProcessConfigSearcher searcher)
{
var vm = Wtm.CreateVM<ProcessConfigListVM>(passInit: true);
if (ModelState.IsValid)
{
vm.Searcher = searcher;
return vm.GetJson(false);
}
else
{
return vm.GetError();
}
}
#endregion
#region Create
[ActionDescription("Sys.Create")]
public ActionResult Create()
{
var vm = Wtm.CreateVM<ProcessConfigVM>();
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.Create")]
public ActionResult Create(ProcessConfigVM vm)
{
if (!ModelState.IsValid)
{
return PartialView(vm);
}
else
{
if (DC.Set<ProcessConfig>().Any(x => x.Code == vm.Entity.Code))
{
return FFResult().Alert($"已存在 工序编码 为{vm.Entity.Code}的数据");
}
if (DC.Set<ProcessConfig>().Any(x => x.Name == vm.Entity.Name))
{
return FFResult().Alert($"已存在 工序名称 为{vm.Entity.Name}的数据");
}
vm.DoAdd();
if (!ModelState.IsValid)
{
vm.DoReInit();
return PartialView(vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid();
}
}
}
#endregion
#region Edit
[ActionDescription("Sys.Edit")]
public ActionResult Edit(string id)
{
var vm = Wtm.CreateVM<ProcessConfigVM>(id);
return PartialView(vm);
}
[ActionDescription("Sys.Edit")]
[HttpPost]
[ValidateFormItemOnly]
public ActionResult Edit(ProcessConfigVM vm)
{
if (!ModelState.IsValid)
{
return PartialView(vm);
}
else
{
vm.DoEdit();
if (!ModelState.IsValid)
{
vm.DoReInit();
return PartialView(vm);
}
else
{
return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID);
}
}
}
#endregion
#region Delete
[ActionDescription("Sys.Delete")]
public ActionResult Delete(string id)
{
var vm = Wtm.CreateVM<ProcessConfigVM>(id);
return PartialView(vm);
}
[ActionDescription("Sys.Delete")]
[HttpPost]
public ActionResult Delete(string id, IFormCollection nouse)
{
var vm = Wtm.CreateVM<ProcessConfigVM>(id);
vm.DoDelete();
if (!ModelState.IsValid)
{
return PartialView(vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid();
}
}
#endregion
#region Details
[ActionDescription("Sys.Details")]
public ActionResult Details(string id)
{
var vm = Wtm.CreateVM<ProcessConfigVM>(id);
return PartialView(vm);
}
#endregion
#region BatchEdit
[HttpPost]
[ActionDescription("Sys.BatchEdit")]
public ActionResult BatchEdit(string[] IDs)
{
var vm = Wtm.CreateVM<ProcessConfigBatchVM>(Ids: IDs);
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.BatchEdit")]
public ActionResult DoBatchEdit(ProcessConfigBatchVM vm, IFormCollection nouse)
{
if (!ModelState.IsValid || !vm.DoBatchEdit())
{
return PartialView("BatchEdit",vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchEditSuccess", vm.Ids.Length]);
}
}
#endregion
#region BatchDelete
[HttpPost]
[ActionDescription("Sys.BatchDelete")]
public ActionResult BatchDelete(string[] IDs)
{
var vm = Wtm.CreateVM<ProcessConfigBatchVM>(Ids: IDs);
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.BatchDelete")]
public ActionResult DoBatchDelete(ProcessConfigBatchVM vm, IFormCollection nouse)
{
if (!ModelState.IsValid || !vm.DoBatchDelete())
{
return PartialView("BatchDelete",vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchDeleteSuccess", vm.Ids.Length]);
}
}
#endregion
#region Import
[ActionDescription("Sys.Import")]
public ActionResult Import()
{
var vm = Wtm.CreateVM<ProcessConfigImportVM>();
return PartialView(vm);
}
[HttpPost]
[ActionDescription("Sys.Import")]
public ActionResult Import(ProcessConfigImportVM vm, IFormCollection nouse)
{
if (vm.ErrorListVM.EntityList.Count > 0 || !vm.BatchSaveData())
{
return PartialView(vm);
}
else
{
return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.ImportSuccess", vm.EntityList.Count.ToString()]);
}
}
#endregion
#region Export
[ActionDescription("Sys.Export")]
[HttpPost]
public IActionResult ExportExcel(ProcessConfigListVM vm)
{
return vm.GetExportData();
}
#endregion
}
}