添加工序配置

修改入库页面,任务完成,库存页面等
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

@@ -226,7 +226,7 @@ namespace HHWMS.Web.Controllers
#endregion
#region InvOut 出库
[ActionDescription("TaskType.Out")]
/*[ActionDescription("TaskType.Out")]
public ActionResult InvOut(string id)
{
var vm = Wtm.CreateVM<InventoryVM>(id);
@@ -234,54 +234,67 @@ namespace HHWMS.Web.Controllers
{
return FFResult().Alert("所选库存已被锁定!,请检查后重试!").RefreshGrid();
}
return PartialView(vm);
}
[HttpPost]
[ActionDescription("TaskType.Out")]
public ActionResult InvOut(InventoryVM vm)
{
var id = vm.Entity.ID;
// 校验参数
if (string.IsNullOrWhiteSpace(vm.OutPort))
// 判断是否存在出口配置
var processConfig = _unitWork.FindSingle<ProcessConfig>(m =>
m.Name == vm.Entity.Lot);
if (processConfig == null)
{
return FFResult().Alert("出口必选,请选择后重试!");
return FFResult().Alert("所选库存下道工序出口未配置!,请检查后重试!").RefreshGrid();
}
return PartialView(vm);
}*/
[ActionDescription("TaskType.Out")]
public ActionResult InvOut(string id)
{
// var vm = Wtm.CreateVM<InventoryVM>(id);
// 校验参数
// if (string.IsNullOrWhiteSpace(vm.OutPort))
// {
// return FFResult().Alert("出口必选,请选择后重试!");
// }
// 校验库存
var inv = _unitWork.FindSingle<Inventory>(x => x.ID == id);
var inv = _unitWork.FindSingle<Inventory>(x => x.ID == int.Parse(id));
if (inv == null)
{
return FFResult().CloseDialog().Alert("所选库存不存在,请检查后重试!").RefreshGrid();
return FFResult().Alert("所选库存不存在,请检查后重试!").RefreshGrid();
}
if (inv.TaskStatus == InventoryTaskStatusEnum.Locked)
{
return FFResult().CloseDialog().Alert("所选库存已被锁定!,请检查后重试!").RefreshGrid();
return FFResult().Alert("所选库存已被锁定!,请检查后重试!").RefreshGrid();
}
// 校验容器
var container = _unitWork.FindSingle<Container>(x => x.Code == inv.ContainerCode);
if (container == null)
{
return FFResult().CloseDialog().Alert("所选库存的容器不存在,请检查后重试!").RefreshGrid();
return FFResult().Alert("所选库存的容器不存在,请检查后重试!").RefreshGrid();
}
if (container.IsLock == ContainerLockEnum.任务锁)
{
return FFResult().CloseDialog().Alert("库存所在容器已被锁定!,请检查后重试!").RefreshGrid();
return FFResult().Alert("库存所在容器已被锁定!,请检查后重试!").RefreshGrid();
}
// 校验库位
var location = _unitWork.FindSingle<Location>(x => x.Code == inv.LocationCode);
if (location == null)
{
return FFResult().CloseDialog().Alert("所选库存不在库内,请检查后重试!").RefreshGrid();
return FFResult().Alert("所选库存不在库内,请检查后重试!").RefreshGrid();
}
if (location.Status == LocationStatusEnum.锁定)
{
return FFResult().CloseDialog().Alert("库存所在仓位已被锁定!,请检查后重试!").RefreshGrid();
return FFResult().Alert("库存所在仓位已被锁定!,请检查后重试!").RefreshGrid();
}
// 判断是否存在出口配置
var processConfig = _unitWork.FindSingle<ProcessConfig>(m =>
m.Name == inv.Lot);
if (processConfig == null)
{
return FFResult().Alert("所选库存下道工序出口未配置!,请检查后重试!").RefreshGrid();
}
// 创建任务
var task = new TaskHeader()
{
@@ -289,7 +302,7 @@ namespace HHWMS.Web.Controllers
ZoneId = inv.ZoneId,
TaskType = TaskTypeEnum.出库,
FromLocation = inv.LocationCode,
ToLocation = vm.OutPort,
ToLocation = processConfig.Port,
ContainerCode = inv.ContainerCode,
RoadWay = 1,
Status = TaskStatusEnum.新建,
@@ -335,12 +348,12 @@ namespace HHWMS.Web.Controllers
location.UpdateTime = DateTime.Now;
_unitWork.Update(location);
return FFResult().CloseDialog().Message("出库任务创建成功").RefreshGrid();
return FFResult().Message("出库任务创建成功").RefreshGrid();
}
else
{
// WCS任务下发失败
return FFResult().CloseDialog().Message(wcsResult?.Msg ?? "WCS任务下发失败").RefreshGrid();
return FFResult().Message(wcsResult?.Msg ?? "WCS任务下发失败").RefreshGrid();
}
}
@@ -358,6 +371,11 @@ namespace HHWMS.Web.Controllers
return PartialView(vm);
}
/// <summary>
/// 成品出库
/// </summary>
/// <param name="vm"></param>
/// <returns></returns>
[HttpPost]
[ActionDescription("TaskType.Out")]
public ActionResult InvOut2(InventoryVM vm)
@@ -26,7 +26,8 @@ namespace HHWMS.Web
this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "inventory", dialogWidth: 800),
this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "inventory"),
this.MakeAction("Inventory","InvOut",Localizer["TaskType.Out"],"",GridActionParameterTypesEnum.SingleId,"inventory")
.SetSize(500,400),
.SetSize(500,400)
.SetShowDialog(false),
this.MakeAction("Inventory","InvOut2",Localizer["TaskType.Out1"],"",GridActionParameterTypesEnum.SingleId,"inventory")
.SetSize(500,400),
};
@@ -42,6 +43,16 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.MaterialCode).SetWidth(90),
this.MakeGridHeader(x => x.MaterialType).SetWidth(100),
this.MakeGridHeader(x => x.SupplierCode).SetWidth(100),
this.MakeGridHeader(x => x.Batch).SetWidth(100),
this.MakeGridHeader(x => x.Lot).SetWidth(100),
this.MakeGridHeader(x => x.TaskStatus).SetWidth(100)
.SetBackGroundFunc((a)=>{
if(a.TaskStatus == InventoryTaskStatusEnum.Locked )
{
return "#FF0000";
}
return "";
}),
this.MakeGridHeader(x => x.MaterialName).SetWidth(100),
this.MakeGridHeader(x => x.CompanyCode).SetWidth(150),
this.MakeGridHeader(x => x.SourceCode).SetWidth(150),
@@ -53,21 +64,11 @@ namespace HHWMS.Web
{
return (int?)a.Qty ?? 0;
}),
this.MakeGridHeader(x => x.Batch).SetWidth(100),
this.MakeGridHeader(x => x.Lot).SetHide(),
this.MakeGridHeader(x => x.ManufactureDate).SetHide(),
this.MakeGridHeader(x => x.ExpirationDate).SetHide(),
this.MakeGridHeader(x => x.ReceiptCode).SetHide(),
this.MakeGridHeader(x => x.ReceiptDetailId).SetHide(),
this.MakeGridHeader(x => x.Status).SetWidth(100),
this.MakeGridHeader(x => x.TaskStatus).SetWidth(100)
.SetBackGroundFunc((a)=>{
if(a.TaskStatus == InventoryTaskStatusEnum.Locked )
{
return "#FF0000";
}
return "";
}),
this.MakeGridHeaderAction(width: 200)
};
}
@@ -5,7 +5,7 @@
<wt:row items-per-row="ItemsPerRowEnum.One">
<wt:hidden field="Entity.ZoneId" />
<wt:hidden field="Entity.ID" />
<wt:combobox field="OutPort" items="AllOutPorts"/>
<wt:hidden field="OutPort" items="AllOutPorts"/>
</wt:row>
<wt:row align="AlignEnum.Right">
<wt:submitbutton />