修改历史表,历史明细表的展示,方便历史查询

This commit is contained in:
zhougf committed 2024-03-25 19:11:53 +08:00
1 parent 894ec3e0b0
commit 265b4a1f3f
36 files changed
+305 -258

No files matched your search

@@ -133,6 +133,7 @@ namespace HHWMS.Web.Controllers
public ActionResult Details(string id)
{
var vm = Wtm.CreateVM<ReceiptHeaderHistoryVM>(id);
vm.Details.SearcherMode = ListVMSearchModeEnum.MasterDetail;
return PartialView(vm);
}
#endregion
@@ -15,42 +15,77 @@ namespace HHWMS.Web
{
protected override List<GridAction> InitGridAction()
{
return new List<GridAction>
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
{
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.BatchEdit, Localizer["Sys.BatchEdit"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "receipt"),
};
return new List<GridAction>();
}
else
{
return new List<GridAction>
{
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Create,
Localizer["Sys.Create"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Edit,
Localizer["Sys.Edit"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Delete,
Localizer["Sys.Delete"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Details,
Localizer["Sys.Details"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.BatchEdit,
Localizer["Sys.BatchEdit"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.BatchDelete,
Localizer["Sys.BatchDelete"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.Import,
Localizer["Sys.Import"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptDetailHistory", GridActionStandardTypesEnum.ExportExcel,
Localizer["Sys.Export"], "receipt"),
};
}
}
protected override IEnumerable<IGridColumn<ReceiptDetailHistory_View>> InitGridHeader()
{
return new List<GridColumn<ReceiptDetailHistory_View>>{
this.MakeGridHeader(x => x.Code_view),
this.MakeGridHeader(x => x.ZoneCode),
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.SupplierCode),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.InventoryStatus),
this.MakeGridHeader(x => x.Status),
this.MakeGridHeaderAction(width: 200)
};
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
{
return new List<GridColumn<ReceiptDetailHistory_View>>
{
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialName),
this.MakeGridHeader(x => x.MaterialUnit),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.Status)
};
}
else
{
return new List<GridColumn<ReceiptDetailHistory_View>>
{
this.MakeGridHeader(x => x.Code_view),
this.MakeGridHeader(x => x.ZoneCode).SetHide(),
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).SetHide(),
this.MakeGridHeader(x => x.ManufactureDate).SetHide(),
this.MakeGridHeader(x => x.ExpirationDate).SetHide(),
this.MakeGridHeader(x => x.CompanyCode).SetHide(),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.InventoryStatus),
this.MakeGridHeader(x => x.Status),
this.MakeGridHeaderAction(width: 200)
};
}
}
public override IOrderedQueryable<ReceiptDetailHistory_View> GetSearchQuery()
@@ -58,14 +93,13 @@ namespace HHWMS.Web
var query = DC.Set<ReceiptDetailHistory>()
.CheckEqual(Searcher.ReceiptHeaderHistoryId, x=>x.ReceiptHeaderHistoryId)
.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)
.CheckContain(Searcher.MaterialSpec, x=>x.MaterialSpec)
.CheckContain(Searcher.Batch, x=>x.Batch)
.CheckContain(Searcher.Lot, x=>x.Lot)
.CheckContain(Searcher.CompanyCode, x=>x.CompanyCode)
.CheckContain(Searcher.SupplierCode, x=>x.SupplierCode)
.CheckContain(Searcher.InventoryStatus, x=>x.InventoryStatus)
.CheckEqual(Searcher.Status, x=>x.Status)
.Select(x => new ReceiptDetailHistory_View
@@ -73,6 +107,7 @@ namespace HHWMS.Web
ID = x.ID,
Code_view = x.ReceiptHeaderHistory.Code,
ZoneCode = x.ZoneCode,
UniqueCode = x.UniqueCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,
MaterialName = x.MaterialName,
@@ -17,24 +17,34 @@ namespace HHWMS.Web
public int? ReceiptHeaderHistoryId { get; set; }
[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; }
[Display(Name = "Inventory.MaterialType")]
public String MaterialType { get; set; }
[Display(Name = "Inventory.MaterialName")]
public String MaterialName { get; set; }
[Display(Name = "Inventory.MaterialSpec")]
public String MaterialSpec { get; set; }
[Display(Name = "Inventory.MaterialUnit")]
public String MaterialUnit { get; set; }
[Display(Name = "Inventory.Batch")]
public String Batch { get; set; }
[Display(Name = "Inventory.Lot")]
public String Lot { get; set; }
[Display(Name = "Inventory.CompanyCode")]
public String CompanyCode { get; set; }
[Display(Name = "Inventory.SupplierCode")]
public String SupplierCode { get; set; }
[Display(Name = "Inventory.Status")]
public String InventoryStatus { get; set; }
[Display(Name = "Receipt.Status")]
public ReceiptStatusEnum? Status { get; set; }
@@ -29,17 +29,18 @@ namespace HHWMS.Web
{
return new List<GridColumn<ReceiptDetail_View>>{
this.MakeGridHeader(x => x.Code_view),
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.ZoneCode).SetHide(),
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).SetHide(),
this.MakeGridHeader(x => x.ExpirationDate).SetHide(),
this.MakeGridHeader(x => x.CompanyCode).SetHide(),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.Qty),
@@ -32,15 +32,15 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<ReceiptHeaderHistory_View>> InitGridHeader()
{
return new List<GridColumn<ReceiptHeaderHistory_View>>{
this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.SourceCode).SetHide(),
this.MakeGridHeader(x => x.Code),
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).SetHide(),
this.MakeGridHeader(x => x.SupplierCode).SetHide(),
this.MakeGridHeader(x => x.TotalQty).SetHide(),
this.MakeGridHeader(x => x.TotalLines).SetHide(),
this.MakeGridHeader(x => x.FirstStatus),
this.MakeGridHeader(x => x.LastStatus),
this.MakeGridHeader(x => x.LastStatus).SetHide(),
this.MakeGridHeader(x => x.AppointmentTime),
this.MakeGridHeader(x => x.Remark),
this.MakeGridHeaderAction(width: 200)
@@ -12,17 +12,19 @@ namespace HHWMS.Web
{
public partial class ReceiptHeaderHistoryVM : BaseCRUDVM<ReceiptHeaderHistory>
{
public ReceiptDetailHistoryListVM Details { get; set; } = new ReceiptDetailHistoryListVM();
public ReceiptHeaderHistoryVM()
{
}
protected override void InitVM()
{
Details.CopyContext(this);
Details.Searcher.ReceiptHeaderHistoryId = Entity.ID;
}
public override void DoAdd()
{
{
base.DoAdd();
}
@@ -4,14 +4,13 @@
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:combobox field="Searcher.ReceiptHeaderId" items="Searcher.AllReceiptHeaders" empty-text="@Localizer["Sys.All"]" />
<wt:textbox field="Searcher.ZoneCode" />
<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" />
<wt:textbox field="Searcher.MaterialUnit" />
<wt:textbox field="Searcher.Batch" />
<wt:textbox field="Searcher.Lot" />
<wt:textbox field="Searcher.InventoryStatus" />
<wt:combobox field="Searcher.Status" empty-text="@Localizer["Sys.All"]" />
</wt:row>
@@ -4,15 +4,13 @@
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:combobox field="Searcher.ReceiptHeaderHistoryId" items="Searcher.AllReceiptHeaderHistorys" empty-text="@Localizer["Sys.All"]" />
<wt:textbox field="Searcher.ZoneCode" />
<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" />
<wt:textbox field="Searcher.MaterialUnit" />
<wt:textbox field="Searcher.Batch" />
<wt:textbox field="Searcher.Lot" />
<wt:textbox field="Searcher.CompanyCode" />
<wt:textbox field="Searcher.SupplierCode" />
<wt:textbox field="Searcher.InventoryStatus" />
<wt:combobox field="Searcher.Status" empty-text="@Localizer["Sys.All"]" />
</wt:row>
@@ -2,19 +2,15 @@
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.SourceCode" />
<wt:display field="Entity.Code" />
<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.AppointmentTime" />
<wt:display field="Entity.Remark" />
</wt:row>
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.Code" />
<wt:display field="Entity.BillType" />
<wt:display field="Entity.FirstStatus" />
<wt:display field="Entity.AppointmentTime" />
<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" />
<wt:row align="AlignEnum.Right">
<wt:closebutton />
</wt:row>
@@ -133,6 +133,7 @@ namespace HHWMS.Web.Controllers
public ActionResult Details(string id)
{
var vm = Wtm.CreateVM<ShipmentHeaderHistoryVM>(id);
vm.Details.SearcherMode = ListVMSearchModeEnum.MasterDetail;
return PartialView(vm);
}
#endregion
@@ -15,49 +15,79 @@ namespace HHWMS.Web
{
protected override List<GridAction> InitGridAction()
{
return new List<GridAction>
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
{
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.BatchEdit, Localizer["Sys.BatchEdit"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "shipment"),
};
return new List<GridAction>();
}
else
{
return new List<GridAction>
{
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Create,
Localizer["Sys.Create"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Edit,
Localizer["Sys.Edit"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Delete,
Localizer["Sys.Delete"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Details,
Localizer["Sys.Details"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.BatchEdit,
Localizer["Sys.BatchEdit"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.BatchDelete,
Localizer["Sys.BatchDelete"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.Import,
Localizer["Sys.Import"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentDetailHistory", GridActionStandardTypesEnum.ExportExcel,
Localizer["Sys.Export"], "shipment"),
};
}
}
protected override IEnumerable<IGridColumn<ShipmentDetailHistory_View>> InitGridHeader()
{
return new List<GridColumn<ShipmentDetailHistory_View>>{
this.MakeGridHeader(x => x.Code_view),
this.MakeGridHeader(x => x.ZoneCode),
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.SupplierCode),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.DividedQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.InventoryStatus),
this.MakeGridHeader(x => x.Status),
this.MakeGridHeaderAction(width: 200)
};
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
{
return new List<GridColumn<ShipmentDetailHistory_View>>{
this.MakeGridHeader(x => x.UniqueCode).SetWidth(220),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.Status)
};
}
else
{
return new List<GridColumn<ShipmentDetailHistory_View>>
{
this.MakeGridHeader(x => x.Code_view).SetWidth(150),
this.MakeGridHeader(x => x.ZoneCode).SetHide(),
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).SetHide(),
this.MakeGridHeader(x => x.ManufactureDate),
this.MakeGridHeader(x => x.ExpirationDate).SetHide(),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode).SetHide(),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.DividedQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.InventoryStatus),
this.MakeGridHeader(x => x.Status),
this.MakeGridHeaderAction(width: 200)
};
}
}
public override IOrderedQueryable<ShipmentDetailHistory_View> GetSearchQuery()
{
var query = DC.Set<ShipmentDetailHistory>()
.CheckEqual(Searcher.ShipmentHeaderHistoryId, x=>x.ShipmentHeaderHistoryId)
.CheckEqual(Searcher.ShipmentHeaderHistoryId, x=>x.ShipmentHeaderHistoryId)
.CheckContain(Searcher.ZoneCode, x=>x.ZoneCode)
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
.CheckContain(Searcher.MaterialType, x=>x.MaterialType)
@@ -73,6 +103,7 @@ namespace HHWMS.Web
{
ID = x.ID,
Code_view = x.ShipmentHeaderHistory.Code,
UniqueCode = x.UniqueCode,
ZoneCode = x.ZoneCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,
@@ -19,6 +19,10 @@ namespace HHWMS.Web
public String ZoneCode { get; set; }
[Display(Name = "Inventory.MaterialCode")]
public String MaterialCode { get; set; }
[Display(Name = "Inventory.UniqueCode")]
public String UniqueCode { get; set; }
[Display(Name = "Inventory.MaterialType")]
public String MaterialType { get; set; }
[Display(Name = "Inventory.MaterialName")]
@@ -60,19 +60,20 @@ namespace HHWMS.Web
}
else
return new List<GridColumn<ShipmentDetail_View>>{
this.MakeGridHeader(x => x.Code_view),
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.Code_view).SetWidth(150),
this.MakeGridHeader(x => x.ZoneCode).SetHide(),
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.Lot).SetHide(),
this.MakeGridHeader(x => x.ManufactureDate),
this.MakeGridHeader(x => x.ExpirationDate),
this.MakeGridHeader(x => x.ExpirationDate).SetHide(),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.SupplierCode).SetHide(),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.DividedQty),
this.MakeGridHeader(x => x.Qty),
@@ -32,17 +32,11 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<ShipmentHeaderHistory_View>> InitGridHeader()
{
return new List<GridColumn<ShipmentHeaderHistory_View>>{
this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.Code),
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.FirstStatus),
this.MakeGridHeader(x => x.LastStatus),
this.MakeGridHeader(x => x.Remark),
this.MakeGridHeaderAction(width: 200)
this.MakeGridHeaderAction(width: 300)
};
}
@@ -12,17 +12,19 @@ namespace HHWMS.Web
{
public partial class ShipmentHeaderHistoryVM : BaseCRUDVM<ShipmentHeaderHistory>
{
public ShipmentDetailHistoryListVM Details { get; set; } = new ShipmentDetailHistoryListVM();
public ShipmentHeaderHistoryVM()
{
}
protected override void InitVM()
{
Details.CopyContext(this);
Details.Searcher.ShipmentHeaderHistoryId = Entity.ID;
}
public override void DoAdd()
{
{
base.DoAdd();
}
@@ -4,7 +4,7 @@
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:combobox field="Searcher.ShipmentHeaderId" items="Searcher.AllShipmentHeaders" empty-text="@Localizer["Sys.All"]" />
<wt:textbox field="Searcher.ZoneCode" />
<wt:textbox field="Searcher.UniqueCode" />
<wt:textbox field="Searcher.MaterialCode" />
<wt:textbox field="Searcher.MaterialType" />
<wt:textbox field="Searcher.MaterialName" />
@@ -4,7 +4,7 @@
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:combobox field="Searcher.ShipmentHeaderHistoryId" items="Searcher.AllShipmentHeaderHistorys" empty-text="@Localizer["Sys.All"]" />
<wt:textbox field="Searcher.ZoneCode" />
<wt:textbox field="Searcher.UniqueCode" />
<wt:textbox field="Searcher.MaterialCode" />
<wt:textbox field="Searcher.MaterialType" />
<wt:textbox field="Searcher.MaterialName" />
@@ -2,18 +2,12 @@
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.SourceCode" />
<wt:display field="Entity.Code" />
<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.Remark" />
</wt:row>
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.Code" />
<wt:display field="Entity.BillType" />
</wt:row>
<wt:grid vm="@Model.Details" height="300" hidden-checkbox="true" hidden-grid-index="true" use-local-data="true" hidden-panel="true" />
<wt:row align="AlignEnum.Right">
<wt:closebutton />
</wt:row>
@@ -3,13 +3,7 @@
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:textbox field="Searcher.SourceCode" />
<wt:textbox field="Searcher.Code" />
<wt:textbox field="Searcher.BillType" />
<wt:textbox field="Searcher.CompanyCode" />
<wt:textbox field="Searcher.SupplierCode" />
<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" url="/shipment/ShipmentHeaderHistory/Search"/>
@@ -1,4 +1,4 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using WalkingTec.Mvvm.Core;
@@ -12,6 +12,13 @@ namespace HHWMS.Web.Controllers
[ActionDescription("任务明细历史")]
public partial class TaskDetailHistoryController : BaseController
{
private readonly IUnitWork _unitwork;
public TaskDetailHistoryController(IUnitWork unitwork)
{
_unitwork = unitwork;
}
#region Search
[ActionDescription("Sys.Search")]
public ActionResult Index()
@@ -1,4 +1,4 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using WalkingTec.Mvvm.Core;
@@ -133,6 +133,7 @@ namespace HHWMS.Web.Controllers
public ActionResult Details(string id)
{
var vm = Wtm.CreateVM<TaskHeaderHistoryVM>(id);
vm.Details.SearcherMode = ListVMSearchModeEnum.MasterDetail;
return PartialView(vm);
}
#endregion
@@ -1,5 +1,12 @@
using HHWMS.Web.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web.Models;
namespace HHWMS.Web
{
@@ -10,15 +17,19 @@ namespace HHWMS.Web
ListVM = new TaskDetailHistoryListVM();
LinkedVM = new TaskDetailHistory_BatchEdit();
}
}
/// <summary>
/// <summary>
/// Class to define batch edit fields
/// </summary>
public class TaskDetailHistory_BatchEdit : BaseVM
{
protected override void InitVM()
{
}
}
}
@@ -13,28 +13,14 @@ namespace HHWMS.Web
public partial class TaskDetailHistoryTemplateVM : BaseTemplateVM
{
public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.TaskHeaderId);
[Display(Name = "Inventory.ReceiptCode")]
public ExcelPropety OrderCode_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.OrderCode);
[Display(Name = "Inventory.ReceiptDetailId")]
public ExcelPropety OrderDetailId_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.OrderDetailId);
[Display(Name = "Inventory.MaterialCode")]
public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.MaterialCode);
[Display(Name = "Inventory.MaterialName")]
public ExcelPropety MaterialName_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.MaterialName);
[Display(Name = "Inventory.MaterialSpec")]
public ExcelPropety MaterialSpec_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.MaterialSpec);
[Display(Name = "Inventory.MaterialUnit")]
public ExcelPropety MaterialUnit_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.MaterialUnit);
[Display(Name = "Inventory.Batch")]
public ExcelPropety Batch_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.Batch);
[Display(Name = "Inventory.Lot")]
public ExcelPropety Lot_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.Lot);
[Display(Name = "Inventory.UniqueCode")]
public ExcelPropety UniqueCode_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.UniqueCode);
[Display(Name = "Task.ContainerCode")]
public ExcelPropety ContainerCode_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.ContainerCode);
[Display(Name = "Inventory.Qty")]
public ExcelPropety Qty_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.Qty);
[Display(Name = "TaskDetail.InventoryId")]
public ExcelPropety InventoryId_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.InventoryId);
[Display(Name = "Task.FromLocation")]
public ExcelPropety FromLocation_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.FromLocation);
[Display(Name = "Task.ToLocation")]
public ExcelPropety ToLocation_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.ToLocation);
[Display(Name = "TaskDetail.Status")]
public ExcelPropety Status_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.Status);
@@ -15,7 +15,13 @@ namespace HHWMS.Web
{
protected override List<GridAction> InitGridAction()
{
return new List<GridAction>
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
{
return new List<GridAction>();
}
else
{
return new List<GridAction>
{
this.MakeStandardAction("TaskDetailHistory", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"taskManage", dialogWidth: 800),
this.MakeStandardAction("TaskDetailHistory", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "taskManage", dialogWidth: 800),
@@ -26,55 +32,53 @@ namespace HHWMS.Web
this.MakeStandardAction("TaskDetailHistory", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "taskManage", dialogWidth: 800),
this.MakeStandardAction("TaskDetailHistory", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "taskManage"),
};
}
}
protected override IEnumerable<IGridColumn<TaskDetailHistory_View>> InitGridHeader()
{
return new List<GridColumn<TaskDetailHistory_View>>{
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
{
return new List<GridColumn<TaskDetailHistory_View>>{
this.MakeGridHeader(x => x.TaskNo_view),
this.MakeGridHeader(x => x.OrderCode),
this.MakeGridHeader(x => x.OrderDetailId),
this.MakeGridHeader(x => x.MaterialCode),
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.UniqueCode),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.InventoryId),
this.MakeGridHeader(x => x.FromLocation),
this.MakeGridHeader(x => x.ToLocation),
this.MakeGridHeader(x => x.Status),
};
}
else
{
return new List<GridColumn<TaskDetailHistory_View>>{
this.MakeGridHeader(x => x.TaskNo_view),
this.MakeGridHeader(x => x.UniqueCode),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.FromLocation),
this.MakeGridHeader(x => x.ToLocation),
this.MakeGridHeader(x => x.Status),
this.MakeGridHeaderAction(width: 200)
};
}
}
public override IOrderedQueryable<TaskDetailHistory_View> GetSearchQuery()
{
var query = DC.Set<TaskDetailHistory>()
.CheckEqual(Searcher.TaskHeaderId, x=>x.TaskHeaderId)
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
.CheckContain(Searcher.MaterialName, x=>x.MaterialName)
.CheckContain(Searcher.MaterialSpec, x=>x.MaterialSpec)
.CheckContain(Searcher.Batch, x=>x.Batch)
.CheckContain(Searcher.Lot, x=>x.Lot)
.CheckContain(Searcher.UniqueCode, x=>x.UniqueCode)
.CheckContain(Searcher.ContainerCode, x=>x.ContainerCode)
.CheckEqual(Searcher.Status, x=>x.Status)
.CheckContain(Searcher.FromLocation, x=>x.FromLocation)
.CheckContain(Searcher.ToLocation, x=>x.ToLocation)
.Select(x => new TaskDetailHistory_View
{
ID = x.ID,
TaskNo_view = x.TaskHeader.TaskNo,
OrderCode = x.OrderCode,
OrderDetailId = x.OrderDetailId,
MaterialCode = x.MaterialCode,
MaterialName = x.MaterialName,
MaterialSpec = x.MaterialSpec,
MaterialUnit = x.MaterialUnit,
Batch = x.Batch,
Lot = x.Lot,
TaskNo_view = $"{x.TaskHeader.TaskNo}-{x.FromLocation}",
UniqueCode = x.UniqueCode,
ContainerCode = x.ContainerCode,
Qty = x.Qty,
InventoryId = x.InventoryId,
FromLocation = x.FromLocation,
ToLocation = x.ToLocation,
Status = x.Status,
})
.OrderBy(x => x.ID);
@@ -14,20 +14,14 @@ namespace HHWMS.Web
{
public List<ComboSelectListItem> AllTaskHeaders { get; set; }
public int? TaskHeaderId { get; set; }
[Display(Name = "Inventory.MaterialCode")]
public String MaterialCode { get; set; }
[Display(Name = "Inventory.MaterialName")]
public String MaterialName { get; set; }
[Display(Name = "Inventory.MaterialSpec")]
public String MaterialSpec { get; set; }
[Display(Name = "Inventory.Batch")]
public String Batch { get; set; }
[Display(Name = "Inventory.Lot")]
public String Lot { get; set; }
[Display(Name = "Inventory.UniqueCode")]
public String UniqueCode { get; set; }
[Display(Name = "Task.ContainerCode")]
public String ContainerCode { get; set; }
[Display(Name = "TaskDetail.Status")]
public TaskStatusEnum? Status { get; set; }
[Display(Name = "Task.FromLocation")]
public String FromLocation { get; set; }
[Display(Name = "Task.ToLocation")]
public String ToLocation { get; set; }
protected override void InitVM()
{
@@ -36,14 +36,14 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.OrderCode).SetHide(),
this.MakeGridHeader(x => x.OrderDetailId).SetHide(),
this.MakeGridHeader(x => x.UniqueCode),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialCode).SetHide(),
this.MakeGridHeader(x => x.MaterialName).SetHide(),
this.MakeGridHeader(x => x.MaterialSpec).SetHide(),
this.MakeGridHeader(x => x.MaterialUnit).SetHide(),
this.MakeGridHeader(x => x.Batch).SetHide(),
this.MakeGridHeader(x => x.Lot).SetHide(),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.Qty).SetHide(),
this.MakeGridHeader(x => x.InventoryId).SetHide(),
this.MakeGridHeader(x => x.FromLocation),
this.MakeGridHeader(x => x.ToLocation),
@@ -62,7 +62,7 @@ namespace HHWMS.Web
.Select(x => new TaskDetail_View
{
ID = x.ID,
TaskNo_view = x.TaskHeader.TaskNo,
TaskNo_view = $"{x.TaskHeader.TaskNo}-{x.FromLocation}",
OrderCode = x.OrderCode,
OrderDetailId = x.OrderDetailId,
UniqueCode = x.UniqueCode,
@@ -29,7 +29,7 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.OrderCode).SetHide(),
this.MakeGridHeader(x => x.OrderDetailId).SetHide(),
this.MakeGridHeader(x => x.UniqueCode),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialCode).SetHide(),
this.MakeGridHeader(x => x.MaterialName).SetHide(),
this.MakeGridHeader(x => x.MaterialSpec).SetHide(),
this.MakeGridHeader(x => x.MaterialUnit).SetHide(),
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -39,8 +39,8 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.ToLocation),
this.MakeGridHeader(x => x.Station),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.RoadWay),
this.MakeGridHeader(x => x.Priority),
this.MakeGridHeader(x => x.RoadWay).SetHide(),
this.MakeGridHeader(x => x.Priority).SetHide(),
this.MakeGridHeader(x => x.Status),
this.MakeGridHeader(x => x.ErrorMsg),
this.MakeGridHeaderAction(width: 200)
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -12,13 +12,15 @@ namespace HHWMS.Web
{
public partial class TaskHeaderHistoryVM : BaseCRUDVM<TaskHeaderHistory>
{
public TaskDetailHistoryListVM Details { get; set; } = new TaskDetailHistoryListVM();
public TaskHeaderHistoryVM()
{
}
protected override void InitVM()
{
Details.CopyContext(this);
Details.Searcher.TaskHeaderId = Entity.ID;
}
public override void DoAdd()
@@ -4,17 +4,10 @@
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:combobox field="Entity.TaskHeaderId" items="AllTaskHeaders"/>
<wt:textbox field="Entity.OrderCode" />
<wt:textbox field="Entity.OrderDetailId" />
<wt:textbox field="Entity.MaterialCode" />
<wt:textbox field="Entity.MaterialName" />
<wt:textbox field="Entity.MaterialSpec" />
<wt:textbox field="Entity.MaterialUnit" />
<wt:textbox field="Entity.Batch" />
<wt:textbox field="Entity.Lot" />
<wt:textbox field="Entity.UniqueCode" />
<wt:textbox field="Entity.ContainerCode" />
<wt:textbox field="Entity.Qty" />
<wt:textbox field="Entity.InventoryId" />
<wt:textbox field="Entity.FromLocation" />
<wt:textbox field="Entity.ToLocation" />
<wt:combobox field="Entity.Status" />
</wt:row>
<wt:row align="AlignEnum.Right">
@@ -5,17 +5,10 @@
<wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote>
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.TaskHeader.TaskNo" />
<wt:display field="Entity.OrderCode" />
<wt:display field="Entity.OrderDetailId" />
<wt:display field="Entity.MaterialCode" />
<wt:display field="Entity.MaterialName" />
<wt:display field="Entity.MaterialSpec" />
<wt:display field="Entity.MaterialUnit" />
<wt:display field="Entity.Batch" />
<wt:display field="Entity.Lot" />
<wt:display field="Entity.UniqueCode" />
<wt:display field="Entity.ContainerCode" />
<wt:display field="Entity.Qty" />
<wt:display field="Entity.InventoryId" />
<wt:display field="Entity.FromLocation" />
<wt:display field="Entity.ToLocation" />
<wt:display field="Entity.Status" />
</wt:row>
<wt:hidden field="Entity.ID" />
@@ -4,17 +4,10 @@
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.TaskHeader.TaskNo" />
<wt:display field="Entity.OrderCode" />
<wt:display field="Entity.OrderDetailId" />
<wt:display field="Entity.MaterialCode" />
<wt:display field="Entity.MaterialName" />
<wt:display field="Entity.MaterialSpec" />
<wt:display field="Entity.MaterialUnit" />
<wt:display field="Entity.Batch" />
<wt:display field="Entity.Lot" />
<wt:display field="Entity.UniqueCode" />
<wt:display field="Entity.ContainerCode" />
<wt:display field="Entity.Qty" />
<wt:display field="Entity.InventoryId" />
<wt:display field="Entity.FromLocation" />
<wt:display field="Entity.ToLocation" />
<wt:display field="Entity.Status" />
</wt:row>
<wt:row align="AlignEnum.Right">
@@ -4,17 +4,10 @@
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:combobox field="Entity.TaskHeaderId" items="AllTaskHeaders"/>
<wt:textbox field="Entity.OrderCode" />
<wt:textbox field="Entity.OrderDetailId" />
<wt:textbox field="Entity.MaterialCode" />
<wt:textbox field="Entity.MaterialName" />
<wt:textbox field="Entity.MaterialSpec" />
<wt:textbox field="Entity.MaterialUnit" />
<wt:textbox field="Entity.Batch" />
<wt:textbox field="Entity.Lot" />
<wt:textbox field="Entity.UniqueCode" />
<wt:textbox field="Entity.ContainerCode" />
<wt:textbox field="Entity.Qty" />
<wt:textbox field="Entity.InventoryId" />
<wt:textbox field="Entity.FromLocation" />
<wt:textbox field="Entity.ToLocation" />
<wt:combobox field="Entity.Status" />
</wt:row>
<wt:hidden field="Entity.ID" />
@@ -4,13 +4,10 @@
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:combobox field="Searcher.TaskHeaderId" items="Searcher.AllTaskHeaders" empty-text="@Localizer["Sys.All"]" />
<wt:textbox field="Searcher.MaterialCode" />
<wt:textbox field="Searcher.MaterialName" />
<wt:textbox field="Searcher.MaterialSpec" />
<wt:textbox field="Searcher.Batch" />
<wt:textbox field="Searcher.Lot" />
<wt:textbox field="Searcher.UniqueCode" />
<wt:textbox field="Searcher.ContainerCode" />
<wt:combobox field="Searcher.Status" empty-text="@Localizer["Sys.All"]" />
<wt:textbox field="Searcher.FromLocation" />
<wt:textbox field="Searcher.ToLocation" />
</wt:row>
</wt:searchpanel>
<wt:grid vm="@Model" url="/taskManage/TaskDetailHistory/Search"/>
@@ -1,20 +1,18 @@
@model HHWMS.Web.TaskHeaderHistoryVM
@model HHWMS.Web.TaskHeaderHistoryVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.ZoneCode" />
<wt:display field="Entity.TaskNo" />
<wt:display field="Entity.TaskType" />
<wt:display field="Entity.FromLocation" />
<wt:display field="Entity.ToLocation" />
<wt:display field="Entity.Station" />
<wt:display field="Entity.ContainerCode" />
<wt:display field="Entity.RoadWay" />
<wt:display field="Entity.Priority" />
<wt:display field="Entity.Status" />
<wt:display field="Entity.ErrorMsg" />
</wt:row>
<wt:grid vm="@Model.Details" height="300" hidden-checkbox="true" hidden-grid-index="true" use-local-data="true" />
<wt:row align="AlignEnum.Right">
<wt:closebutton />
</wt:row>
@@ -22,6 +22,10 @@ namespace HHWMS.Web.Models
[Display(Name = "Inventory.ReceiptDetailId", Description = "明细ID")]
public int? OrderDetailId { get; set; }
[Display(Name = "Inventory.UniqueCode", Description = "唯一码")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string UniqueCode { get; set; }
[Display(Name = "Inventory.MaterialCode", Description = "物料编码")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string MaterialCode { get; set; }
@@ -56,6 +60,14 @@ namespace HHWMS.Web.Models
[Display(Name = "TaskDetail.InventoryId", Description = "库存Id")]
public int? InventoryId { get; set; }
[Display(Name = "Task.FromLocation", Description = "起始仓位")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string FromLocation { get; set; }
[Display(Name = "Task.ToLocation", Description = "目标仓位")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ToLocation { get; set; }
[Display(Name = "TaskDetail.Status", Description = "状态")]
public TaskStatusEnum? Status { get; set; }
}