diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index 828e520..f7d479c 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -110,6 +110,7 @@ namespace HHWMS.Web var query = DC.Set() .CheckContain(Searcher.ZoneCode, x => x.ZoneCode) .CheckContain(Searcher.LocationCode, x => x.LocationCode) + .CheckContain(Searcher.ContainerCode, x => x.ContainerCode) .CheckContain(Searcher.MaterialCode, x => x.MaterialCode) .CheckContain(Searcher.MaterialType, x => x.MaterialType) .CheckContain(Searcher.MaterialName, x => x.MaterialName) diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs index 364671b..8d135a6 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs @@ -14,8 +14,12 @@ namespace HHWMS.Web { [Display(Name = "Task.ZoneCode")] public String ZoneCode { get; set; } - [Display(Name = "Inventory.LocationCode")] + [Display(Name = "Container.LocationCode")] public String LocationCode { get; set; } + + [Display(Name = "Task.ContainerCode")] + public String ContainerCode { get; set; } + [Display(Name = "Inventory.UniqueCode")] public String UniqueCode { get; set; } [Display(Name = "Inventory.MaterialCode")] diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml index cd924f2..8a71b64 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml @@ -5,6 +5,9 @@ + + + @* diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index ceb0506..2219ef9 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -89,7 +89,7 @@ namespace HHWMS.Web.Controllers var inventory = new Inventory() { ZoneCode = ZoneCodeEnum.立库, - ContainerCode = containerCode, + ContainerCode = container.Code, MaterialCode = material.MaterialCode, MaterialName = material.MaterialName, MaterialType = material.MaterialType, @@ -108,7 +108,7 @@ namespace HHWMS.Web.Controllers MaterialCode = material.MaterialCode, MaterialName = material.MaterialName, MaterialUnit = material.MaterialUnit, - ContainerCode = containerCode, + ContainerCode = container.Code, Qty = qty, CreateTime = DateTime.Now, CreateBy = "WMS", @@ -194,7 +194,7 @@ namespace HHWMS.Web.Controllers ZoneCode = ZoneCodeEnum.立库, TaskNo = _unitWork.GetSerialNumber("In"), TaskType = TaskTypeEnum.立库入库, - ContainerCode = containerCode, + ContainerCode = container.Code, FromLocation = "", ToLocation = location.Code, Status = TaskStatusEnum.待下发,