任务明细 出库明细 库存分析 启动出库

This commit is contained in:
zgf committed 2023-09-03 18:52:40 +08:00
1 parent eef6df7099
commit f5423e78fe
28 files changed
+500 -77

No files matched your search

@@ -8,6 +8,15 @@ namespace HHWMS.Web
{
public partial class InventoryListVM : BasePagedListVM<Inventory_View, InventorySearcher>
{
public List<ComboSelectListItem> ZoneCodes { get; set; }
public List<ComboSelectListItem> InventoryTaskStatus { get; set; }
protected override void InitVM()
{
var vm = Wtm.CreateVM<InventoryVM>();
ZoneCodes = vm.ZoneCodes;
InventoryTaskStatus = vm.InventoryTaskStatus;
}
protected override List<GridAction> InitGridAction()
{
if (SearcherMode != ListVMSearchModeEnum.MasterDetail)
@@ -35,10 +44,16 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<Inventory_View>> InitGridHeader()
{
InitVM();
if (SearcherMode != ListVMSearchModeEnum.MasterDetail)
{
return new List<GridColumn<Inventory_View>>{
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.ZoneCode)
.SetFormat((a, b) =>
{
var data = ZoneCodes.FirstOrDefault(x => x.Value.ToString() == a.ZoneCode);
return data?.Text ?? a.ZoneCode;
}),
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.LocationCode),
@@ -59,7 +74,12 @@ namespace HHWMS.Web
//this.MakeGridHeader(x => x.ReceiptCode),
//this.MakeGridHeader(x => x.ReceiptDetailId),
//this.MakeGridHeader(x => x.Status),
this.MakeGridHeader(x => x.TaskStatus),
this.MakeGridHeader(x => x.TaskStatus)
.SetFormat((a, b) =>
{
var data = InventoryTaskStatus.FirstOrDefault(x => x.Value.ToString() == a.TaskStatus);
return data?.Text ?? a.TaskStatus;
}),
this.MakeGridHeaderAction(width: 200)
};
}
@@ -71,17 +91,17 @@ namespace HHWMS.Web
//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.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.SupplierCode),
this.MakeGridHeader(x => x.TaskQty),
//this.MakeGridHeader(x => x.SupplierCode),
//this.MakeGridHeader(x => x.TaskQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.Status),
//this.MakeGridHeader(x => x.Status),
this.MakeGridHeader(x => x.TaskStatus),
this.MakeGridHeaderAction(width: 50)
//this.MakeGridHeaderAction(width: 50)
};
}
}
@@ -12,6 +12,8 @@ namespace HHWMS.Web
{
public partial class InventoryVM : BaseCRUDVM<Inventory>
{
public List<ComboSelectListItem> ZoneCodes { get; set; }
public List<ComboSelectListItem> InventoryTaskStatus { get; set; }
public InventoryVM()
{
@@ -19,6 +21,19 @@ namespace HHWMS.Web
protected override void InitVM()
{
var CurrentCulture = Wtm.CurrentCulture;
var dictDatas = DC.Set<SysDictData>().ToList();
ZoneCodes = dictDatas.Where(x => x.DictType == "ZoneCode").Select(x => new ComboSelectListItem
{
Text = CurrentCulture == "zh" ? x.DictLabel : x.DictLabelUs,
Value = x.DictValue
}).ToList();
InventoryTaskStatus = dictDatas.Where(x => x.DictType == "InventoryTaskStatus").Select(x => new ComboSelectListItem
{
Text = CurrentCulture == "zh" ? x.DictLabel : x.DictLabelUs,
Value = x.DictValue
}).ToList();
}
public override void DoAdd()
@@ -1,4 +1,4 @@
@model HHWMS.Web.InventoryVM
@model HHWMS.Web.InventoryVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
@@ -3,7 +3,7 @@
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:textbox field="Searcher.ZoneCode" />
<wt:combobox field="Searcher.ZoneCode" items="ZoneCodes" />
<wt:textbox field="Searcher.UniqueCode" />
@*<wt:textbox field="Searcher.MaterialCode" />
<wt:textbox field="Searcher.MaterialType" />