出库 不同时生成两个料盒出库到一个工位的任务

新建出库单 明细
This commit is contained in:
zgf 2023-11-30 16:53:30 +08:00
parent e7c558ecf9
commit 8e11aa092b
6 changed files with 48 additions and 7 deletions

View File

@ -66,6 +66,33 @@ namespace HHWMS.Web.Controllers
}
else
{
if (string.IsNullOrEmpty(vm.Entity.UniqueCode))
{
return FFResult().Alert($"唯一码不能为空!");
}
var header = _unitwork.FindSingle<ShipmentHeader>(x => x.ID == vm.Entity.ShipmentHeaderId);
if (header != null && header.FirstStatus != ShipStatusEnum.新建)
{
return FFResult().Alert($"非新建状态的出库单,无法新建明细!");
}
var inv = _unitwork.FindSingle<Inventory>(x => x.UniqueCode == vm.Entity.UniqueCode
&& x.TaskStatus != InventoryTaskStatus.任务中);
if(inv == null)
{
return FFResult().Alert($"{vm.Entity.UniqueCode}不存在或已有任务,检查后重新添加!");
}
if(_unitwork.IsExit<ShipmentDetail>(x => x.UniqueCode == vm.Entity.UniqueCode))
{
return FFResult().Alert($"{vm.Entity.UniqueCode}已在出库单内,请勿重复添加!");
}
vm.Entity.MaterialCode = inv.MaterialCode;
vm.Entity.MaterialName = inv.MaterialName;
vm.Entity.MaterialSpec = inv.MaterialSpec;
vm.Entity.MaterialUnit = inv.MaterialUnit;
vm.Entity.MaterialType = inv.MaterialType;
vm.Entity.Batch = inv.Batch;
vm.Entity.Qty = inv.Qty;
vm.Entity.Status = ShipStatusEnum.新建;
vm.DoAdd();
if (!ModelState.IsValid)
{

View File

@ -54,6 +54,7 @@ namespace HHWMS.Web.Controllers
public ActionResult Create()
{
var vm = Wtm.CreateVM<ShipmentHeaderVM>();
vm.Entity.Code = _unitwork.GetSerialNumber("SO");
return PartialView(vm);
}
@ -67,6 +68,8 @@ namespace HHWMS.Web.Controllers
}
else
{
vm.Entity.FirstStatus = ShipStatusEnum.新建;
vm.Entity.BillType = "sout";
vm.DoAdd();
if (!ModelState.IsValid)
{

View File

@ -1,10 +1,11 @@
@model HHWMS.Web.ShipmentDetailVM
@model HHWMS.Web.ShipmentDetailVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:combobox field="Entity.ShipmentHeaderId" items="AllShipmentHeaders"/>
<wt:textbox field="Entity.ZoneCode" />
<wt:textbox field="Entity.UniqueCode" />
@* <wt:textbox field="Entity.ZoneCode" />
<wt:textbox field="Entity.MaterialCode" />
<wt:textbox field="Entity.MaterialType" />
<wt:textbox field="Entity.MaterialName" />
@ -20,7 +21,7 @@
<wt:textbox field="Entity.DividedQty" />
<wt:textbox field="Entity.Qty" />
<wt:textbox field="Entity.InventoryStatus" />
<wt:combobox field="Entity.Status" />
<wt:combobox field="Entity.Status" /> *@
</wt:row>
<wt:row align="AlignEnum.Right">
<wt:submitbutton />

View File

@ -1,17 +1,17 @@
@model HHWMS.Web.ShipmentHeaderVM
@model HHWMS.Web.ShipmentHeaderVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:textbox field="Entity.SourceCode" />
<wt:textbox field="Entity.Code" />
<wt:textbox field="Entity.BillType" />
@*<wt:combobox field="Entity.BillType" items="ShipTypes" />
<wt:textbox field="Entity.SourceCode" />
<wt:textbox field="Entity.CompanyCode" />
<wt:textbox field="Entity.SupplierCode" />
<wt:textbox field="Entity.TotalQty" />
<wt:textbox field="Entity.TotalLines" />
<wt:combobox field="Entity.FirstStatus" />
<wt:combobox field="Entity.LastStatus" />
<wt:combobox field="Entity.LastStatus" /> *@
<wt:textbox field="Entity.Remark" />
</wt:row>
<wt:row align="AlignEnum.Right">

View File

@ -185,8 +185,15 @@ namespace HHWMS.Web
gLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault();
if (gLoc != null)
{
// 工位为空,先判断是否有去此工位的任务
var gTask = _unitwork.FindSingle<TaskHeader>(x => x.ToLocation.Equals(gLoc.Code));
if (gTask != null)
{
continue;
}
var pTask = new TaskHeader
{
ZoneCode = ZoneCodeEnum.盘料库,

View File

@ -1382,5 +1382,8 @@
</data>
<data name="Inventory.ReturnToMes" xml:space="preserve">
<value>回传</value>
</data>Ship.ShipmentCode
<data name="Ship.ShipmentCode" xml:space="preserve">
<value>出库单号</value>
</data>
</root>