入库操作

This commit is contained in:
zgf 2023-08-28 23:30:38 +08:00
parent 8de4bc26cd
commit 2459d4664a
17 changed files with 159 additions and 52 deletions

View File

@ -35,10 +35,11 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<Inventory_View>> InitGridHeader()
{
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
if (SearcherMode != ListVMSearchModeEnum.MasterDetail)
{
return new List<GridColumn<Inventory_View>>{
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.LocationCode),
this.MakeGridHeader(x => x.MaterialCode),
@ -47,17 +48,17 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.MaterialSpec),
this.MakeGridHeader(x => x.MaterialUnit),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.Lot),
this.MakeGridHeader(x => x.ManufactureDate),
this.MakeGridHeader(x => x.ExpirationDate),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode),
//this.MakeGridHeader(x => x.Lot),
//this.MakeGridHeader(x => x.ManufactureDate),
//this.MakeGridHeader(x => x.ExpirationDate),
//this.MakeGridHeader(x => x.CompanyCode),
//this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.TaskQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.ReceiptCode),
this.MakeGridHeader(x => x.ReceiptDetailId),
this.MakeGridHeader(x => x.Status),
//this.MakeGridHeader(x => x.SourceCode),
//this.MakeGridHeader(x => x.ReceiptCode),
//this.MakeGridHeader(x => x.ReceiptDetailId),
//this.MakeGridHeader(x => x.Status),
this.MakeGridHeader(x => x.TaskStatus),
this.MakeGridHeaderAction(width: 200)
};
@ -65,16 +66,17 @@ namespace HHWMS.Web
else
{
return new List<GridColumn<Inventory_View>>{
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.LocationCode),
//this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
//this.MakeGridHeader(x => x.ContainerCode),
//this.MakeGridHeader(x => x.LocationCode),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialType),
this.MakeGridHeader(x => x.MaterialName),
this.MakeGridHeader(x => x.MaterialSpec),
this.MakeGridHeader(x => x.MaterialUnit),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.TaskQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.Status),
@ -88,6 +90,7 @@ namespace HHWMS.Web
{
var query = DC.Set<Inventory>()
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
.CheckContain(Searcher.UniqueCode, x => x.UniqueCode)
.CheckContain(Searcher.LocationCode, x => x.LocationCode)
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
.CheckContain(Searcher.MaterialType, x => x.MaterialType)
@ -103,6 +106,7 @@ namespace HHWMS.Web
{
ID = x.ID,
ZoneCode = x.ZoneCode,
UniqueCode = x.UniqueCode,
ContainerCode = x.ContainerCode,
LocationCode = x.LocationCode,
MaterialCode = x.MaterialCode,
@ -111,10 +115,10 @@ namespace HHWMS.Web
MaterialSpec = x.MaterialSpec,
MaterialUnit = x.MaterialUnit,
Batch = x.Batch,
Lot = x.Lot,
ManufactureDate = x.ManufactureDate,
ExpirationDate = x.ExpirationDate,
CompanyCode = x.CompanyCode,
//Lot = x.Lot,
//ManufactureDate = x.ManufactureDate,
//ExpirationDate = x.ExpirationDate,
//CompanyCode = x.CompanyCode,
SupplierCode = x.SupplierCode,
TaskQty = x.TaskQty,
Qty = x.Qty,

View File

@ -16,6 +16,8 @@ namespace HHWMS.Web
public String ZoneCode { get; set; }
[Display(Name = "Inventory.LocationCode")]
public String LocationCode { get; set; }
[Display(Name = "Inventory.UniqueCode")]
public String UniqueCode { get; set; }
[Display(Name = "Inventory.MaterialCode")]
public String MaterialCode { get; set; }
[Display(Name = "Inventory.MaterialType")]

View File

@ -1,10 +1,11 @@
@model HHWMS.Web.InventoryListVM
@model HHWMS.Web.InventoryListVM
@inject IStringLocalizer<Program> Localizer;
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:textbox field="Searcher.ZoneCode" />
<wt:textbox field="Searcher.MaterialCode" />
<wt:textbox field="Searcher.UniqueCode" />
@*<wt:textbox field="Searcher.MaterialCode" />
<wt:textbox field="Searcher.MaterialType" />
<wt:textbox field="Searcher.MaterialName" />
<wt:textbox field="Searcher.MaterialSpec" />
@ -13,7 +14,7 @@
<wt:textbox field="Searcher.Lot" />
<wt:textbox field="Searcher.SourceCode" />
<wt:textbox field="Searcher.ReceiptCode" />
<wt:textbox field="Searcher.Status" />
<wt:textbox field="Searcher.Status" /> *@
</wt:row>
</wt:searchpanel>
<wt:grid vm="@Model" url="/inventory/Inventory/Search"/>

View File

@ -130,13 +130,25 @@ namespace HHWMS.Web.Controllers
[ActionDescription("Sys.Create")]
public ActionResult CreateDetails(ReceiptDetailVM vm)
{
var materialCodeList = vm.Entity.MaterialCode.Split("\n");
var plList = vm.Entity.MaterialCode.Split("\n");
var slList = vm.Entity.Lot.Split("\n");
var detailList = new List<ReceiptDetail>();
foreach(var item in materialCodeList)
foreach(var item in plList)
{
detailList.Add(new ReceiptDetail
{
MaterialCode = item,
UniqueCode = item,
MaterialType = "PL",
ReceiptHeaderId = vm.Entity.ReceiptHeaderId
});
}
foreach (var item in slList)
{
detailList.Add(new ReceiptDetail
{
UniqueCode = item,
MaterialType = "SL",
ReceiptHeaderId = vm.Entity.ReceiptHeaderId
});
}

View File

@ -49,6 +49,8 @@ namespace HHWMS.Web.Controllers
public ActionResult Create()
{
var vm = Wtm.CreateVM<ReceiptHeaderVM>();
vm.Entity.Code = _unitwork.GetSerialNumber("R");
vm.Entity.AppointmentTime = DateTime.Now;
return PartialView(vm);
}

View File

@ -54,6 +54,7 @@ namespace HHWMS.Web
var query = DC.Set<ReceiptDetail>()
.CheckEqual(Searcher.ReceiptHeaderId, x => x.ReceiptHeaderId)
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
.CheckContain(Searcher.UniqueCode, x => x.UniqueCode)
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
.CheckContain(Searcher.MaterialType, x => x.MaterialType)
.CheckContain(Searcher.MaterialName, x => x.MaterialName)
@ -68,6 +69,7 @@ namespace HHWMS.Web
ID = x.ID,
Code_view = x.ReceiptHeader.Code,
ZoneCode = x.ZoneCode,
UniqueCode = x.UniqueCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,
MaterialName = x.MaterialName,

View File

@ -13,7 +13,6 @@ namespace HHWMS.Web
{
return new List<GridAction>
{
//this.MakeStandardAction("ReceiptDetail", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"receipt", dialogWidth: 800),
this.MakeAction("ReceiptDetail","Create2",Localizer["Sys.Create"],Localizer["Sys.Create"],GridActionParameterTypesEnum.NoId,"receipt").SetOnClickScript("CreateDetail"),
this.MakeAction("ReceiptDetail","CreateDetail",Localizer["Sys.CreateDetails"],Localizer["Sys.CreateDetails"],GridActionParameterTypesEnum.NoId,"receipt").SetOnClickScript("CreateDetails"),
@ -31,22 +30,23 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<ReceiptDetail_View>> InitGridHeader()
{
var result = new List<GridColumn<ReceiptDetail_View>>{
this.MakeGridHeader(x => x.Code_view),
this.MakeGridHeader(x => x.ZoneCode),
//this.MakeGridHeader(x => x.Code_view),
//this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialType),
this.MakeGridHeader(x => x.MaterialName),
this.MakeGridHeader(x => x.MaterialSpec),
this.MakeGridHeader(x => x.MaterialUnit),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.Lot),
this.MakeGridHeader(x => x.ManufactureDate),
this.MakeGridHeader(x => x.ExpirationDate),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.Lot).SetHide(),
//this.MakeGridHeader(x => x.ManufactureDate),
//this.MakeGridHeader(x => x.ExpirationDate),
//this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.InventoryStatus),
//this.MakeGridHeader(x => x.InventoryStatus),
this.MakeGridHeader(x => x.Status)
};
@ -66,6 +66,7 @@ namespace HHWMS.Web
ID = x.ID,
Code_view = x.ReceiptHeader.Code,
ZoneCode = x.ZoneCode,
UniqueCode = x.UniqueCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,
MaterialName = x.MaterialName,

View File

@ -16,6 +16,9 @@ namespace HHWMS.Web
[Display(Name = "Task.ZoneCode")]
public String ZoneCode { get; set; }
[Display(Name = "Inventory.UniqueCode")]
public String UniqueCode { get; set; }
[Display(Name = "Inventory.MaterialCode")]
public String MaterialCode { get; set; }

View File

@ -32,19 +32,19 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<ReceiptHeader_View>> InitGridHeader()
{
return new List<GridColumn<ReceiptHeader_View>>{
this.MakeGridHeader(x => x.SourceCode),
//this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.Code).SetFormat((a,b) =>
{
string rv = UIService.MakeScriptButton(ButtonTypesEnum.Link,a.Code,$"details('{a.ID}')");
return rv;
}),
this.MakeGridHeader(x => x.BillType),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.TotalQty),
this.MakeGridHeader(x => x.TotalLines),
//this.MakeGridHeader(x => x.CompanyCode),
//this.MakeGridHeader(x => x.SupplierCode),
//this.MakeGridHeader(x => x.TotalQty),
//this.MakeGridHeader(x => x.TotalLines),
this.MakeGridHeader(x => x.FirstStatus),
this.MakeGridHeader(x => x.LastStatus),
//this.MakeGridHeader(x => x.LastStatus),
this.MakeGridHeader(x => x.AppointmentTime),
this.MakeGridHeader(x => x.Remark),
this.MakeGridHeaderAction(width: 200)

View File

@ -3,7 +3,8 @@
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.One">
<wt:textarea field="Entity.MaterialCode" />
<wt:textarea field="Entity.MaterialCode" label-text="盘料"/>
<wt:textarea field="Entity.Lot" label-text="散料" />
</wt:row>
<wt:hidden field="Entity.ReceiptHeaderId" />
<wt:row align="AlignEnum.Right">

View File

@ -1,17 +1,17 @@
@model HHWMS.Web.ReceiptHeaderVM
@model HHWMS.Web.ReceiptHeaderVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:textbox field="Entity.SourceCode" />
@* <wt:textbox field="Entity.SourceCode" /> *@
<wt:textbox field="Entity.Code" />
<wt:textbox field="Entity.BillType" />
<wt:textbox field="Entity.CompanyCode" />
@* <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:datetime field="Entity.AppointmentTime" />
<wt:textbox field="Entity.Remark" />
</wt:row>

View File

@ -3,17 +3,17 @@
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.SourceCode" />
@* <wt:display field="Entity.SourceCode" /> *@
<wt:display field="Entity.Code" />
<wt:display field="Entity.BillType" />
@* <wt:display field="Entity.BillType" />
<wt:display field="Entity.CompanyCode" />
<wt:display field="Entity.SupplierCode" />
<wt:display field="Entity.TotalQty" />
<wt:display field="Entity.TotalLines" />
<wt:display field="Entity.FirstStatus" />
<wt:display field="Entity.LastStatus" />
<wt:display field="Entity.LastStatus" /> *@
<wt:display field="Entity.AppointmentTime" />
<wt:display field="Entity.Remark" />
@* <wt:display field="Entity.Remark" /> *@
</wt:row>
<wt:grid vm="@Model.Details" height="300" hidden-checkbox="true" hidden-grid-index="true" use-local-data="true" hidden-panel="true" />

View File

@ -3,11 +3,11 @@
<wt:searchpanel vm="@Model" reset-btn="true" grid-id="header">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:textbox field="Searcher.SourceCode" />
@* <wt:textbox field="Searcher.SourceCode" /> *@
<wt:textbox field="Searcher.Code" />
<wt:textbox field="Searcher.BillType" />
<wt:combobox field="Searcher.FirstStatus" empty-text="@Localizer["Sys.All"]" />
<wt:combobox field="Searcher.LastStatus" empty-text="@Localizer["Sys.All"]" />
@* <wt:combobox field="Searcher.FirstStatus" empty-text="@Localizer["Sys.All"]" /> *@
@* <wt:combobox field="Searcher.LastStatus" empty-text="@Localizer["Sys.All"]" /> *@
</wt:row>
</wt:searchpanel>
<wt:grid vm="@Model" id="header" url="/receipt/ReceiptHeader/Search" limit="7" />

View File

@ -1,10 +1,11 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web;
using HHWMS.Web.Models;
namespace HHWMS.Web.Controllers
{
@ -224,5 +225,42 @@ namespace HHWMS.Web.Controllers
}
#endregion
#region 任务取消
[ActionDescription("TaskHeader.Cancel")]
public ActionResult Cancel(string id)
{
var task = _unitwork.FindById<TaskDetail>(int.Parse(id));
// 判断任务 是否能取消
if (task.Status < TaskStatusEnum.已下发)
{
return FFResult().Alert($"此任务未下发,无需取消!");
}
if (task != null)
{
var taskInfo = new TaskInfo
{
TaskId = $"{task.TaskHeader.TaskNo}-{task.FromLocation}",
TaskType = 99,
};
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data;
try
{
if ((bool)res?.Success)
{
// 删除任务,处理数据
}
else
{
return FFResult().Alert($"操作失败,{res.Msg}");
}
}
catch (Exception ex)
{
return FFResult().Alert($"操作失败,{ex.Message}");
}
}
return FFResult().Message("任务取消成功").RefreshGrid();
}
#endregion 任务取消
}
}

View File

@ -324,7 +324,44 @@ namespace HHWMS.Web.Controllers
}*/
return FFResult().RefreshGrid();
}
#endregion 任务下发
#region 任务取消
[ActionDescription("TaskHeader.Cancel")]
public ActionResult Cancel(string id)
{
var task = _unitwork.FindById<TaskHeader>(int.Parse(id));
if (task != null) {
if(task.Status < TaskStatusEnum.已下发)
{
return FFResult().Alert($"此任务未下发,无需取消!");
}
// 判断任务 是否能取消
if (task.TaskType.Equals(TaskTypeEnum.盘料入库) || task.TaskType.Equals(TaskTypeEnum.盘料出库))
{
return FFResult().Alert($"{task.TaskType}类型任务需要从子任务取消!");
}
var taskInfo = new TaskInfo
{
TaskId = task.TaskNo,
TaskType = 99,
};
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data;
try
{
if ((bool)res?.Success)
{
// 删除任务,处理数据
}
}
catch (Exception ex)
{
return FFResult().Alert($"操作失败,{ex.Message}");
}
}
return FFResult().Message("任务取消成功").RefreshGrid();
}
#endregion 任务取消
}
}

View File

@ -24,6 +24,7 @@ namespace HHWMS.Web
{
return new List<GridAction>
{
this.MakeAction("TaskHeader","Cancel",Localizer["TaskHeader.Cancel"],Localizer["TaskHeader.Cancel"],GridActionParameterTypesEnum.SingleId,"taskManage"),
this.MakeStandardAction("TaskHeader", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"taskManage", dialogWidth: 800),
this.MakeStandardAction("TaskHeader", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "taskManage", dialogWidth: 800),
this.MakeStandardAction("TaskHeader", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "taskManage", dialogWidth: 800),

View File

@ -1008,6 +1008,9 @@
<data name="TaskHeader.Assign" xml:space="preserve">
<value>执行</value>
</data>
<data name="TaskHeader.Cancel" xml:space="preserve">
<value>取消</value>
</data>
<data name="TaskDetail.Status" xml:space="preserve">
<value>状态</value>
</data>