This commit is contained in:
zgf committed 2023-08-12 20:54:55 +08:00
1 parent 3467d4aa9d
commit 820d9d065b
27 files changed
+249 -59

No files matched your search

@@ -13,7 +13,7 @@ namespace HHWMS.Web
public ExcelPropety ContainerCode_Excel = ExcelPropety.CreateProperty<Inventory>(x => x.ContainerCode);
[Display(Name = "Container.LocationCode")]
public ExcelPropety LocaionCode_Excel = ExcelPropety.CreateProperty<Inventory>(x => x.LocaionCode);
public ExcelPropety LocationCode_Excel = ExcelPropety.CreateProperty<Inventory>(x => x.LocationCode);
[Display(Name = "Inventory.MaterialCode")]
public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty<Inventory>(x => x.MaterialCode);
@@ -10,7 +10,9 @@ namespace HHWMS.Web
{
protected override List<GridAction> InitGridAction()
{
return new List<GridAction>
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
{
return new List<GridAction>
{
this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"inventory", dialogWidth: 800),
this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "inventory", dialogWidth: 800),
@@ -21,14 +23,24 @@ namespace HHWMS.Web
this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "inventory", dialogWidth: 800),
this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "inventory"),
};
}
else
{
return new List<GridAction>
{
this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "inventory", dialogWidth: 800),
};
}
}
protected override IEnumerable<IGridColumn<Inventory_View>> InitGridHeader()
{
return new List<GridColumn<Inventory_View>>{
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
{
return new List<GridColumn<Inventory_View>>{
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.LocaionCode),
this.MakeGridHeader(x => x.LocationCode),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialType),
this.MakeGridHeader(x => x.MaterialName),
@@ -49,12 +61,34 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.TaskStatus),
this.MakeGridHeaderAction(width: 200)
};
}
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.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.TaskQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.Status),
this.MakeGridHeader(x => x.TaskStatus),
this.MakeGridHeaderAction(width: 50)
};
}
}
public override IOrderedQueryable<Inventory_View> GetSearchQuery()
{
var query = DC.Set<Inventory>()
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
.CheckContain(Searcher.LocationCode, x => x.LocationCode)
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
.CheckContain(Searcher.MaterialType, x => x.MaterialType)
.CheckContain(Searcher.MaterialName, x => x.MaterialName)
@@ -70,7 +104,7 @@ namespace HHWMS.Web
ID = x.ID,
ZoneCode = x.ZoneCode,
ContainerCode = x.ContainerCode,
LocaionCode = x.LocaionCode,
LocationCode = x.LocationCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,
MaterialName = x.MaterialName,
@@ -14,6 +14,8 @@ namespace HHWMS.Web
{
[Display(Name = "Task.ZoneCode")]
public String ZoneCode { get; set; }
[Display(Name = "Inventory.LocationCode")]
public String LocationCode { get; set; }
[Display(Name = "Inventory.MaterialCode")]
public String MaterialCode { get; set; }
[Display(Name = "Inventory.MaterialType")]