From 265b4a1f3f2766d787f7131b759e4686bc359881 Mon Sep 17 00:00:00 2001 From: zhougf Date: Mon, 25 Mar 2024 19:11:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=8E=86=E5=8F=B2=E6=98=8E=E7=BB=86=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReceiptHeaderHistoryController.cs | 1 + .../ReceiptDetailHistoryListVM.cs | 99 +++++++++++++------ .../ReceiptDetailHistorySearcher.cs | 18 +++- .../ReceiptDetailVMs/ReceiptDetailListVM.cs | 11 ++- .../ReceiptHeaderHistoryListVM.cs | 12 +-- .../ReceiptHeaderHistoryVM.cs | 6 +- .../Receipt/Views/ReceiptDetail/Index.cshtml | 3 +- .../Views/ReceiptDetailHistory/Index.cshtml | 6 +- .../Views/ReceiptHeaderHistory/Details.cshtml | 22 ++--- .../ShipmentHeaderHistoryController.cs | 1 + .../ShipmentDetailHistoryListVM.cs | 95 ++++++++++++------ .../ShipmentDetailHistorySearcher.cs | 4 + .../ShipmentDetailVMs/ShipmentDetailListVM.cs | 11 ++- .../ShipmentHeaderHistoryListVM.cs | 8 +- .../ShipmentHeaderHistoryVM.cs | 6 +- .../Views/ShipmentDetail/Index.cshtml | 2 +- .../Views/ShipmentDetailHistory/Index.cshtml | 2 +- .../ShipmentHeaderHistory/Details.cshtml | 18 ++-- .../Views/ShipmentHeaderHistory/Index.cshtml | 6 -- .../TaskDetailHistoryController.cs | 9 +- .../TaskHeaderHistoryController.cs | 3 +- .../TaskDetailHistoryBatchVM.cs | 15 ++- .../TaskDetailHistoryImportVM.cs | 26 ++--- .../TaskDetailHistoryListVM.cs | 62 ++++++------ .../TaskDetailHistorySearcher.cs | 18 ++-- .../TaskDetailVMs/TaskDetailListVM.cs | 6 +- .../TaskDetailVMs/TaskDetailListVM2.cs | 2 +- .../TaskHeaderHistoryListVM.cs | 6 +- .../TaskHeaderHistoryVM.cs | 6 +- .../Views/TaskDetailHistory/Create.cshtml | 13 +-- .../Views/TaskDetailHistory/Delete.cshtml | 13 +-- .../Views/TaskDetailHistory/Details.cshtml | 13 +-- .../Views/TaskDetailHistory/Edit.cshtml | 13 +-- .../Views/TaskDetailHistory/Index.cshtml | 9 +- .../Views/TaskHeaderHistory/Details.cshtml | 6 +- HHWMS.Web/Models/Task/TaskDetailHistory.cs | 12 +++ 36 files changed, 305 insertions(+), 258 deletions(-) diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderHistoryController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderHistoryController.cs index 28eb419..d16f13e 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderHistoryController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderHistoryController.cs @@ -133,6 +133,7 @@ namespace HHWMS.Web.Controllers public ActionResult Details(string id) { var vm = Wtm.CreateVM(id); + vm.Details.SearcherMode = ListVMSearchModeEnum.MasterDetail; return PartialView(vm); } #endregion diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs index dfac10c..2e0eff1 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs @@ -15,42 +15,77 @@ namespace HHWMS.Web { protected override List InitGridAction() { - return new List + 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(); + } + else + { + return new List + { + 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> InitGridHeader() { - return new List>{ - 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> + { + 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> + { + 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 GetSearchQuery() @@ -58,14 +93,13 @@ namespace HHWMS.Web var query = DC.Set() .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, diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistorySearcher.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistorySearcher.cs index 60abcc9..2f34132 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistorySearcher.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistorySearcher.cs @@ -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; } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs index 21b9955..b2d13e1 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs @@ -29,17 +29,18 @@ namespace HHWMS.Web { return new List>{ 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), diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderHistoryVMs/ReceiptHeaderHistoryListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderHistoryVMs/ReceiptHeaderHistoryListVM.cs index 5fa8983..6969ba8 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderHistoryVMs/ReceiptHeaderHistoryListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderHistoryVMs/ReceiptHeaderHistoryListVM.cs @@ -32,15 +32,15 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { return new List>{ - 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) diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderHistoryVMs/ReceiptHeaderHistoryVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderHistoryVMs/ReceiptHeaderHistoryVM.cs index c5a07ed..c58f7d1 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderHistoryVMs/ReceiptHeaderHistoryVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderHistoryVMs/ReceiptHeaderHistoryVM.cs @@ -12,17 +12,19 @@ namespace HHWMS.Web { public partial class ReceiptHeaderHistoryVM : BaseCRUDVM { - + 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(); } diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Index.cshtml index 0c6d28f..f9cb52f 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Index.cshtml @@ -4,14 +4,13 @@ - + - diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Index.cshtml index 27a19fd..b7bbc22 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Index.cshtml @@ -4,15 +4,13 @@ - + + - - - diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeaderHistory/Details.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeaderHistory/Details.cshtml index 5c574ec..f91d724 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeaderHistory/Details.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeaderHistory/Details.cshtml @@ -2,19 +2,15 @@ @inject IStringLocalizer Localizer; - - - - - - - - - - - - - + + + + + + + + + diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderHistoryController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderHistoryController.cs index 76c78b1..7457c31 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderHistoryController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderHistoryController.cs @@ -133,6 +133,7 @@ namespace HHWMS.Web.Controllers public ActionResult Details(string id) { var vm = Wtm.CreateVM(id); + vm.Details.SearcherMode = ListVMSearchModeEnum.MasterDetail; return PartialView(vm); } #endregion diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs index 0676e18..726f614 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs @@ -15,49 +15,79 @@ namespace HHWMS.Web { protected override List InitGridAction() { - return new List + 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(); + } + else + { + return new List + { + 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> InitGridHeader() { - return new List>{ - 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>{ + 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> + { + 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 GetSearchQuery() { var query = DC.Set() - .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, diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistorySearcher.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistorySearcher.cs index 7bbabc9..1bbc79e 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistorySearcher.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistorySearcher.cs @@ -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")] diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs index 08c1040..8d643aa 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs @@ -60,19 +60,20 @@ namespace HHWMS.Web } else return new List>{ - 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), diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderHistoryVMs/ShipmentHeaderHistoryListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderHistoryVMs/ShipmentHeaderHistoryListVM.cs index a0c0cf3..eab0b49 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderHistoryVMs/ShipmentHeaderHistoryListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderHistoryVMs/ShipmentHeaderHistoryListVM.cs @@ -32,17 +32,11 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { return new List>{ - 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) }; } diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderHistoryVMs/ShipmentHeaderHistoryVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderHistoryVMs/ShipmentHeaderHistoryVM.cs index 5a6edeb..fc7b0b5 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderHistoryVMs/ShipmentHeaderHistoryVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderHistoryVMs/ShipmentHeaderHistoryVM.cs @@ -12,17 +12,19 @@ namespace HHWMS.Web { public partial class ShipmentHeaderHistoryVM : BaseCRUDVM { - + 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(); } diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml index b037f2f..806c38b 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml @@ -4,7 +4,7 @@ - + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Index.cshtml index 52d04c0..5cd5a15 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Index.cshtml @@ -4,7 +4,7 @@ - + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeaderHistory/Details.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeaderHistory/Details.cshtml index 5b30044..7e2d252 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeaderHistory/Details.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeaderHistory/Details.cshtml @@ -2,18 +2,12 @@ @inject IStringLocalizer Localizer; - - - - - - - - - - - - + + + + + + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeaderHistory/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeaderHistory/Index.cshtml index 425a97e..3e41daf 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeaderHistory/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeaderHistory/Index.cshtml @@ -3,13 +3,7 @@ - - - - - - diff --git a/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailHistoryController.cs b/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailHistoryController.cs index 2971c91..040f71f 100644 --- a/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailHistoryController.cs +++ b/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailHistoryController.cs @@ -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() diff --git a/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderHistoryController.cs b/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderHistoryController.cs index b794c36..03c2d2e 100644 --- a/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderHistoryController.cs +++ b/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderHistoryController.cs @@ -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(id); + vm.Details.SearcherMode = ListVMSearchModeEnum.MasterDetail; return PartialView(vm); } #endregion diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryBatchVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryBatchVM.cs index 056b0c9..24a1485 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryBatchVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryBatchVM.cs @@ -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(); } + } - /// + /// /// Class to define batch edit fields /// public class TaskDetailHistory_BatchEdit : BaseVM { + protected override void InitVM() { } + } + } diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryImportVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryImportVM.cs index 1119bbd..69d45cb 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryImportVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryImportVM.cs @@ -13,28 +13,14 @@ namespace HHWMS.Web public partial class TaskDetailHistoryTemplateVM : BaseTemplateVM { public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty(x => x.TaskHeaderId); - [Display(Name = "Inventory.ReceiptCode")] - public ExcelPropety OrderCode_Excel = ExcelPropety.CreateProperty(x => x.OrderCode); - [Display(Name = "Inventory.ReceiptDetailId")] - public ExcelPropety OrderDetailId_Excel = ExcelPropety.CreateProperty(x => x.OrderDetailId); - [Display(Name = "Inventory.MaterialCode")] - public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty(x => x.MaterialCode); - [Display(Name = "Inventory.MaterialName")] - public ExcelPropety MaterialName_Excel = ExcelPropety.CreateProperty(x => x.MaterialName); - [Display(Name = "Inventory.MaterialSpec")] - public ExcelPropety MaterialSpec_Excel = ExcelPropety.CreateProperty(x => x.MaterialSpec); - [Display(Name = "Inventory.MaterialUnit")] - public ExcelPropety MaterialUnit_Excel = ExcelPropety.CreateProperty(x => x.MaterialUnit); - [Display(Name = "Inventory.Batch")] - public ExcelPropety Batch_Excel = ExcelPropety.CreateProperty(x => x.Batch); - [Display(Name = "Inventory.Lot")] - public ExcelPropety Lot_Excel = ExcelPropety.CreateProperty(x => x.Lot); + [Display(Name = "Inventory.UniqueCode")] + public ExcelPropety UniqueCode_Excel = ExcelPropety.CreateProperty(x => x.UniqueCode); [Display(Name = "Task.ContainerCode")] public ExcelPropety ContainerCode_Excel = ExcelPropety.CreateProperty(x => x.ContainerCode); - [Display(Name = "Inventory.Qty")] - public ExcelPropety Qty_Excel = ExcelPropety.CreateProperty(x => x.Qty); - [Display(Name = "TaskDetail.InventoryId")] - public ExcelPropety InventoryId_Excel = ExcelPropety.CreateProperty(x => x.InventoryId); + [Display(Name = "Task.FromLocation")] + public ExcelPropety FromLocation_Excel = ExcelPropety.CreateProperty(x => x.FromLocation); + [Display(Name = "Task.ToLocation")] + public ExcelPropety ToLocation_Excel = ExcelPropety.CreateProperty(x => x.ToLocation); [Display(Name = "TaskDetail.Status")] public ExcelPropety Status_Excel = ExcelPropety.CreateProperty(x => x.Status); diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryListVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryListVM.cs index ae04956..462a639 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryListVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryListVM.cs @@ -15,7 +15,13 @@ namespace HHWMS.Web { protected override List InitGridAction() { - return new List + if (SearcherMode == ListVMSearchModeEnum.MasterDetail) + { + return new List(); + } + else + { + return new List { 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> InitGridHeader() { - return new List>{ + if (SearcherMode == ListVMSearchModeEnum.MasterDetail) + { + return new List>{ 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>{ + 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 GetSearchQuery() { var query = DC.Set() .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); diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistorySearcher.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistorySearcher.cs index af70c73..847737c 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistorySearcher.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistorySearcher.cs @@ -14,20 +14,14 @@ namespace HHWMS.Web { public List 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() { diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs index 1ce8984..c7bdffb 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs @@ -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, diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs index b522e3b..e4af5f4 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs @@ -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(), diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderHistoryVMs/TaskHeaderHistoryListVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderHistoryVMs/TaskHeaderHistoryListVM.cs index 124e4f4..f816488 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderHistoryVMs/TaskHeaderHistoryListVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderHistoryVMs/TaskHeaderHistoryListVM.cs @@ -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) diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderHistoryVMs/TaskHeaderHistoryVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderHistoryVMs/TaskHeaderHistoryVM.cs index 90b05ae..cd770e5 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderHistoryVMs/TaskHeaderHistoryVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderHistoryVMs/TaskHeaderHistoryVM.cs @@ -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 { - + 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() diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Create.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Create.cshtml index feacc98..4591537 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Create.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Create.cshtml @@ -4,17 +4,10 @@ - - - - - - - - + - - + + diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Delete.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Delete.cshtml index febab5c..cb406e4 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Delete.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Delete.cshtml @@ -5,17 +5,10 @@ @Localizer["Sys.DeleteConfirm"] - - - - - - - - + - - + + diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Details.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Details.cshtml index 0b7a41f..86ea7ff 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Details.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Details.cshtml @@ -4,17 +4,10 @@ - - - - - - - - + - - + + diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Edit.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Edit.cshtml index 0556a2b..eb73611 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Edit.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Edit.cshtml @@ -4,17 +4,10 @@ - - - - - - - - + - - + + diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Index.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Index.cshtml index 6c1a663..c36a506 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Index.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Index.cshtml @@ -4,13 +4,10 @@ - - - - - + - + + diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskHeaderHistory/Details.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskHeaderHistory/Details.cshtml index eb4b8a7..e6c575e 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskHeaderHistory/Details.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskHeaderHistory/Details.cshtml @@ -1,20 +1,18 @@ -@model HHWMS.Web.TaskHeaderHistoryVM +@model HHWMS.Web.TaskHeaderHistoryVM @inject IStringLocalizer Localizer; - - - + diff --git a/HHWMS.Web/Models/Task/TaskDetailHistory.cs b/HHWMS.Web/Models/Task/TaskDetailHistory.cs index 0a6e389..035bbea 100644 --- a/HHWMS.Web/Models/Task/TaskDetailHistory.cs +++ b/HHWMS.Web/Models/Task/TaskDetailHistory.cs @@ -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; } }