From e90e0db0195aa78f2b840182186d540596acd11c Mon Sep 17 00:00:00 2001 From: zhougf Date: Tue, 13 May 2025 17:26:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=93=E4=BD=8D=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=20=E5=BA=93=E5=AD=98=20=E5=BA=93=E4=BD=8D=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0zone=E6=9D=83=E9=99=90=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Api/IWCSController.cs | 5 + .../Configs/Controllers/LocationController.cs | 2 +- .../Controllers/LocationMonitorController.cs | 40 +++ .../LocationMonitor/LocationMonitor2DVM.cs | 72 +++++ .../LocationVMs/LocationImportVM.cs | 2 +- .../ViewModels/LocationVMs/LocationListVM.cs | 4 +- .../ViewModels/LocationVMs/LocationVM.cs | 2 +- .../Configs/Views/Location/AddLocation.cshtml | 2 +- .../Configs/Views/Location/Create.cshtml | 2 +- .../Configs/Views/Location/Delete.cshtml | 2 +- .../Configs/Views/Location/Details.cshtml | 2 +- .../Areas/Configs/Views/Location/Edit.cshtml | 2 +- .../Views/LocationMonitor/Index.cshtml | 266 ++++++++++++++++ .../Controllers/InventoryController.cs | 13 +- .../InventoryVMs/InventoryBatchVM.cs | 15 +- .../InventoryVMs/InventoryImportVM.cs | 40 +-- .../InventoryVMs/InventoryListVM.cs | 134 +++----- .../InventoryVMs/InventorySearcher.cs | 26 +- .../ViewModels/InventoryVMs/InventoryVM.cs | 22 +- .../Inventory/Views/Inventory/Create.cshtml | 4 +- .../Inventory/Views/Inventory/Delete.cshtml | 3 +- .../Inventory/Views/Inventory/Details.cshtml | 5 +- .../Inventory/Views/Inventory/Edit.cshtml | 3 +- .../Inventory/Views/Inventory/Index.cshtml | 16 +- .../ShipmentHeaderVMs/ShipmentHeaderVM.cs | 290 +----------------- HHWMS.Web/Models/Configs/Location.cs | 6 +- HHWMS.Web/Models/Inventory/Inventory.cs | 17 +- HHWMS.Web/Resources/Program.zh.resx | 6 + HHWMS.Web/wwwroot/images/container/Empty.png | Bin 0 -> 3705 bytes .../images/container/EmptyContainer.png | Bin 0 -> 3446 bytes HHWMS.Web/wwwroot/images/container/Full.png | Bin 0 -> 3962 bytes HHWMS.Web/wwwroot/images/container/Some.png | Bin 0 -> 3768 bytes HHWMS.Web/wwwroot/images/container/empty.svg | 3 + HHWMS.Web/wwwroot/images/container/locked.svg | 5 + .../wwwroot/images/container/occupied.svg | 4 + .../wwwroot/images/container/半盘禁用.png | Bin 0 -> 6181 bytes .../wwwroot/images/container/半盘锁定.png | Bin 0 -> 4981 bytes .../wwwroot/images/container/整盘禁用.png | Bin 0 -> 6034 bytes .../wwwroot/images/container/整盘锁定.png | Bin 0 -> 4886 bytes .../wwwroot/images/container/空柜禁用.png | Bin 0 -> 5510 bytes .../wwwroot/images/container/空柜锁定.png | Bin 0 -> 4561 bytes .../wwwroot/images/container/空盘禁用.png | Bin 0 -> 5176 bytes .../wwwroot/images/container/空盘锁定.png | Bin 0 -> 4075 bytes 43 files changed, 536 insertions(+), 479 deletions(-) create mode 100644 HHWMS.Web/Areas/Configs/Controllers/LocationMonitorController.cs create mode 100644 HHWMS.Web/Areas/Configs/ViewModels/LocationMonitor/LocationMonitor2DVM.cs create mode 100644 HHWMS.Web/Areas/Configs/Views/LocationMonitor/Index.cshtml create mode 100644 HHWMS.Web/wwwroot/images/container/Empty.png create mode 100644 HHWMS.Web/wwwroot/images/container/EmptyContainer.png create mode 100644 HHWMS.Web/wwwroot/images/container/Full.png create mode 100644 HHWMS.Web/wwwroot/images/container/Some.png create mode 100644 HHWMS.Web/wwwroot/images/container/empty.svg create mode 100644 HHWMS.Web/wwwroot/images/container/locked.svg create mode 100644 HHWMS.Web/wwwroot/images/container/occupied.svg create mode 100644 HHWMS.Web/wwwroot/images/container/半盘禁用.png create mode 100644 HHWMS.Web/wwwroot/images/container/半盘锁定.png create mode 100644 HHWMS.Web/wwwroot/images/container/整盘禁用.png create mode 100644 HHWMS.Web/wwwroot/images/container/整盘锁定.png create mode 100644 HHWMS.Web/wwwroot/images/container/空柜禁用.png create mode 100644 HHWMS.Web/wwwroot/images/container/空柜锁定.png create mode 100644 HHWMS.Web/wwwroot/images/container/空盘禁用.png create mode 100644 HHWMS.Web/wwwroot/images/container/空盘锁定.png diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 56d4ce2..d7fe8d9 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -133,6 +133,11 @@ namespace HHWMS.Web { return Task.FromResult(ApiResultError("容器编码不能为空")); } + + if (!request.RoadWay.HasValue) + { + return Task.FromResult(ApiResultError("巷道不能为空")); + } return WithDebounce($"RequestLocation_{request.PalletNo}", () => { diff --git a/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs b/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs index aad58a3..e999b5d 100644 --- a/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs +++ b/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs @@ -260,7 +260,7 @@ namespace HHWMS.Web.Controllers locationList.Add(new Location { Code = $"{vm.Entity.Type}{vm.Entity.RoadWay.ToString().PadLeft(2, '0')}-{row.ToString().PadLeft(2, '0')}-{line.ToString().PadLeft(2, '0')}-{layer.ToString().PadLeft(2, '0')}", - LocationZoneId = vm.Entity.LocationZoneId, + ZoneId = vm.Entity.ZoneId, Type = vm.Entity.Type, RoadWay = vm.Entity.RoadWay, Row = row, diff --git a/HHWMS.Web/Areas/Configs/Controllers/LocationMonitorController.cs b/HHWMS.Web/Areas/Configs/Controllers/LocationMonitorController.cs new file mode 100644 index 0000000..1e6442f --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Controllers/LocationMonitorController.cs @@ -0,0 +1,40 @@ +using Microsoft.AspNetCore.Mvc; +using System.Collections.Generic; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Mvc; + +namespace HHWMS.Web.Controllers +{ + [Area("configs")] + [ActionDescription("库位监控")] + public partial class LocationMonitorController : BaseController + { + [ActionDescription("二维监控")] + public IActionResult Index() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [HttpGet] + public IActionResult GetAreas() + { + var vm = Wtm.CreateVM(); + return Json(vm.GetAreas()); + } + + [HttpGet] + public IActionResult GetRows([FromQuery]int area) + { + var vm = Wtm.CreateVM(); + return Json(vm.GetRows(area)); + } + + [HttpGet] + public IActionResult GetLocationsByAreaAndRow([FromQuery]int area, short row) + { + var vm = Wtm.CreateVM(); + return Json(vm.GetLocationsByAreaAndRow(area, row)); + } + } +} \ No newline at end of file diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationMonitor/LocationMonitor2DVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationMonitor/LocationMonitor2DVM.cs new file mode 100644 index 0000000..78f959c --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationMonitor/LocationMonitor2DVM.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Reflection; +using WalkingTec.Mvvm.Core; +using HHWMS.Web.Models; + +namespace HHWMS.Web +{ + public class LocationMonitor2DVM : BaseVM + { + public string Area { get; set; } + public string Row { get; set; } + + public class LocationGridItem + { + public string Code { get; set; } + public short Row { get; set; } + public short Line { get; set; } + public short Layer { get; set; } + public LocationStatusEnum Status { get; set; } + public string ContainerCode { get; set; } + } + + public IEnumerable GetAreas() + { + return DC.Set() + .Select(x => x.ZoneId) + .Distinct() + .OrderBy(x => x) + .ToList(); + } + + public IEnumerable GetRows(int area) + { + return DC.Set() + .Where(x => x.ZoneId == area) + .Select(x => x.Row) + .Distinct() + .OrderBy(x => x) + .ToList(); + } + + public IEnumerable GetLocationsByAreaAndRow(int area, short row) + { + var result = DC.Set() + .Where(x => x.ZoneId == area && x.Row == row) + .OrderBy(x => x.Line) + .Select(x => new + { + Code = x.Code, + Row = x.Row, + Line = x.Line, + Layer = x.Layer, + x.Status, + Status1 = x.Status.GetEnumDisplayName(), + ContainerCode = x.ContainerCode + }).ToList(); + return result; + } + + private string GetEnumDisplayName(Enum enumValue) + { + var fieldInfo = enumValue.GetType().GetField(enumValue.ToString()); + var displayAttribute = fieldInfo.GetCustomAttributes(typeof(DisplayAttribute), false).FirstOrDefault() as DisplayAttribute; + + return displayAttribute?.Name ?? enumValue.ToString(); + } + } +} \ No newline at end of file diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationImportVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationImportVM.cs index c1f24ce..4996d6f 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationImportVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationImportVM.cs @@ -12,7 +12,7 @@ namespace HHWMS.Web { public partial class LocationTemplateVM : BaseTemplateVM { - public ExcelPropety LocationZone_Excel = ExcelPropety.CreateProperty(x => x.LocationZoneId); + public ExcelPropety LocationZone_Excel = ExcelPropety.CreateProperty(x => x.ZoneId); [Display(Name = "Location.Code")] public ExcelPropety Code_Excel = ExcelPropety.CreateProperty(x => x.Code); [Display(Name = "Location.Type")] diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationListVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationListVM.cs index fd8da83..107de55 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationListVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationListVM.cs @@ -57,7 +57,7 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() - .CheckEqual(Searcher.LocationZoneId, x=>x.LocationZoneId) + .CheckEqual(Searcher.LocationZoneId, x=>x.ZoneId) .CheckContain(Searcher.Code, x=>x.Code) .CheckEqual(Searcher.Type, x=>x.Type) .CheckEqual(Searcher.Status, x=>x.Status) @@ -68,7 +68,7 @@ namespace HHWMS.Web .Select(x => new Location_View { ID = x.ID, - Name_view = x.LocationZone.Name, + Name_view = x.Zone.Name, Code = x.Code, Type = x.Type, Status = x.Status, diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs index 1d3a009..621a924 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs @@ -28,7 +28,7 @@ namespace HHWMS.Web public LocationVM() { - SetInclude(x => x.LocationZone); + SetInclude(x => x.Zone); } protected override void InitVM() diff --git a/HHWMS.Web/Areas/Configs/Views/Location/AddLocation.cshtml b/HHWMS.Web/Areas/Configs/Views/Location/AddLocation.cshtml index fc7e71a..ecc8f58 100644 --- a/HHWMS.Web/Areas/Configs/Views/Location/AddLocation.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Location/AddLocation.cshtml @@ -3,7 +3,7 @@ - + diff --git a/HHWMS.Web/Areas/Configs/Views/Location/Create.cshtml b/HHWMS.Web/Areas/Configs/Views/Location/Create.cshtml index 86b7ef7..73297f2 100644 --- a/HHWMS.Web/Areas/Configs/Views/Location/Create.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Location/Create.cshtml @@ -3,7 +3,7 @@ - + diff --git a/HHWMS.Web/Areas/Configs/Views/Location/Delete.cshtml b/HHWMS.Web/Areas/Configs/Views/Location/Delete.cshtml index 51086ca..1cd7b61 100644 --- a/HHWMS.Web/Areas/Configs/Views/Location/Delete.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Location/Delete.cshtml @@ -4,7 +4,7 @@ @Localizer["Sys.DeleteConfirm"] - + diff --git a/HHWMS.Web/Areas/Configs/Views/Location/Details.cshtml b/HHWMS.Web/Areas/Configs/Views/Location/Details.cshtml index d699504..eab464f 100644 --- a/HHWMS.Web/Areas/Configs/Views/Location/Details.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Location/Details.cshtml @@ -3,7 +3,7 @@ - + diff --git a/HHWMS.Web/Areas/Configs/Views/Location/Edit.cshtml b/HHWMS.Web/Areas/Configs/Views/Location/Edit.cshtml index c0fc8d1..ef8b408 100644 --- a/HHWMS.Web/Areas/Configs/Views/Location/Edit.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Location/Edit.cshtml @@ -3,7 +3,7 @@ - + diff --git a/HHWMS.Web/Areas/Configs/Views/LocationMonitor/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/LocationMonitor/Index.cshtml new file mode 100644 index 0000000..8c0ae94 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/LocationMonitor/Index.cshtml @@ -0,0 +1,266 @@ +@model HHWMS.Web.LocationMonitor2DVM +@inject IStringLocalizer Localizer; +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+
+
+ + + + + diff --git a/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs b/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs index 48b085d..15aa9c2 100644 --- a/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs +++ b/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs @@ -1,13 +1,10 @@ -using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using System; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Mvc; using WalkingTec.Mvvm.Core.Extensions; using HHWMS.Web; -using HHWMS.Web.Models; -using System.Collections.Generic; -using Newtonsoft.Json; namespace HHWMS.Web.Controllers { @@ -15,11 +12,13 @@ namespace HHWMS.Web.Controllers [ActionDescription("库存管理")] public partial class InventoryController : BaseController { - private readonly IUnitWork _unitwork; - public InventoryController(IUnitWork unitwork) + private readonly IUnitWork _unitWork; + + public InventoryController(IUnitWork unitWork) { - _unitwork = unitwork; + _unitWork = unitWork; } + #region Search [ActionDescription("Sys.Search")] public ActionResult Index() diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryBatchVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryBatchVM.cs index 96a0e23..4cd2402 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryBatchVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryBatchVM.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 InventoryListVM(); LinkedVM = new Inventory_BatchEdit(); } + } - /// + /// /// Class to define batch edit fields /// public class Inventory_BatchEdit : BaseVM { + protected override void InitVM() { } + } + } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryImportVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryImportVM.cs index a0225f5..61f97d5 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryImportVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryImportVM.cs @@ -1,80 +1,72 @@ +using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using HHWMS.Web.Models; +using System.Linq; +using System.Threading.Tasks; using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models; + namespace HHWMS.Web { public partial class InventoryTemplateVM : BaseTemplateVM { - [Display(Name = "Task.ZoneCode")] - public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty(x => x.ZoneCode); - + public ExcelPropety Zone_Excel = ExcelPropety.CreateProperty(x => x.ZoneId); [Display(Name = "Task.ContainerCode")] public ExcelPropety ContainerCode_Excel = ExcelPropety.CreateProperty(x => x.ContainerCode); - [Display(Name = "Container.LocationCode")] public ExcelPropety LocationCode_Excel = ExcelPropety.CreateProperty(x => x.LocationCode); - [Display(Name = "Inventory.MaterialCode")] public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty(x => x.MaterialCode); - [Display(Name = "Inventory.MaterialType")] public ExcelPropety MaterialType_Excel = ExcelPropety.CreateProperty(x => x.MaterialType); - [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.ManufactureDate")] public ExcelPropety ManufactureDate_Excel = ExcelPropety.CreateProperty(x => x.ManufactureDate); - [Display(Name = "Inventory.ExpirationDate")] public ExcelPropety ExpirationDate_Excel = ExcelPropety.CreateProperty(x => x.ExpirationDate); - [Display(Name = "Inventory.CompanyCode")] public ExcelPropety CompanyCode_Excel = ExcelPropety.CreateProperty(x => x.CompanyCode); - [Display(Name = "Inventory.SupplierCode")] public ExcelPropety SupplierCode_Excel = ExcelPropety.CreateProperty(x => x.SupplierCode); - [Display(Name = "Inventory.TaskQty")] public ExcelPropety TaskQty_Excel = ExcelPropety.CreateProperty(x => x.TaskQty); - [Display(Name = "Inventory.Qty")] public ExcelPropety Qty_Excel = ExcelPropety.CreateProperty(x => x.Qty); - [Display(Name = "Inventory.SourceCode")] public ExcelPropety SourceCode_Excel = ExcelPropety.CreateProperty(x => x.SourceCode); - [Display(Name = "Inventory.ReceiptCode")] public ExcelPropety ReceiptCode_Excel = ExcelPropety.CreateProperty(x => x.ReceiptCode); - [Display(Name = "Inventory.ReceiptDetailId")] public ExcelPropety ReceiptDetailId_Excel = ExcelPropety.CreateProperty(x => x.ReceiptDetailId); - [Display(Name = "Inventory.Status")] public ExcelPropety Status_Excel = ExcelPropety.CreateProperty(x => x.Status); - [Display(Name = "Inventory.TaskStatus")] public ExcelPropety TaskStatus_Excel = ExcelPropety.CreateProperty(x => x.TaskStatus); + [Display(Name = "Inventory.Flag")] + public ExcelPropety Flag_Excel = ExcelPropety.CreateProperty(x => x.Flag); - protected override void InitVM() + protected override void InitVM() { + Zone_Excel.DataType = ColumnDataType.ComboBox; + Zone_Excel.ListItems = DC.Set().GetSelectListItems(Wtm, y => y.Name); } + } public class InventoryImportVM : BaseImportVM { + } + } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index 4f7a0e0..9a6f970 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -1,30 +1,23 @@ +using System; using System.Collections.Generic; using System.Linq; -using HHWMS.Web.Models; +using System.Threading.Tasks; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; +using Microsoft.EntityFrameworkCore; +using System.ComponentModel.DataAnnotations; +using HHWMS.Web.Models; + namespace HHWMS.Web { public partial class InventoryListVM : BasePagedListVM { - public List ZoneCodes { get; set; } - public List InventoryTaskStatus { get; set; } - - protected override void InitVM() - { - var vm = Wtm.CreateVM(); - ZoneCodes = vm.ZoneCodes; - InventoryTaskStatus = vm.InventoryTaskStatus; - } protected override List InitGridAction() { - if (SearcherMode != ListVMSearchModeEnum.MasterDetail) - { - return new List + return new List { this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"inventory", dialogWidth: 800), - this.MakeAction("Inventory","ReturnToMes",Localizer["Inventory.ReturnToMes"],Localizer["Inventory.ReturnToMes"],GridActionParameterTypesEnum.SingleId,"inventory"), this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "inventory", dialogWidth: 800), this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "inventory", dialogWidth: 800), this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "inventory", dialogWidth: 800), @@ -33,97 +26,54 @@ 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 - { - this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "inventory", dialogWidth: 800), - }; - } } + protected override IEnumerable> InitGridHeader() { - InitVM(); - if (SearcherMode != ListVMSearchModeEnum.MasterDetail) - { - return new List>{ - 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.ContainerCode).SetHide(), + return new List>{ + this.MakeGridHeader(x => x.Name_view), + 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.MaterialSpec).SetHide(), 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.TaskQty).SetHide(), + 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).SetHide(), + this.MakeGridHeader(x => x.TaskQty), this.MakeGridHeader(x => x.Qty), - //this.MakeGridHeader(x => x.SourceCode), - //this.MakeGridHeader(x => x.ReceiptCode), - //this.MakeGridHeader(x => x.ReceiptDetailId), - //this.MakeGridHeader(x => x.Status), - this.MakeGridHeader(x => x.TaskStatus) - .SetFormat((a, b) => - { - var data = InventoryTaskStatus.FirstOrDefault(x => x.Value.ToString() == a.TaskStatus); - return data?.Text ?? a.TaskStatus; - }), + this.MakeGridHeader(x => x.SourceCode).SetHide(), + this.MakeGridHeader(x => x.ReceiptCode).SetHide(), + this.MakeGridHeader(x => x.ReceiptDetailId).SetHide(), + this.MakeGridHeader(x => x.Status), + this.MakeGridHeader(x => x.TaskStatus), this.MakeGridHeaderAction(width: 200) }; - } - else - { - return new List>{ - //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.SupplierCode), - //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 GetSearchQuery() { var query = DC.Set() - .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) - .CheckContain(Searcher.MaterialSpec, x => x.MaterialSpec) - .CheckContain(Searcher.MaterialUnit, x => x.MaterialUnit) - .CheckContain(Searcher.Batch, x => x.Batch) - .CheckContain(Searcher.Lot, x => x.Lot) - .CheckContain(Searcher.SourceCode, x => x.SourceCode) - .CheckContain(Searcher.ReceiptCode, x => x.ReceiptCode) - .CheckContain(Searcher.Status, x => x.Status) + .CheckEqual(Searcher.ZoneId, x=>x.ZoneId) + .CheckContain(Searcher.ContainerCode, x=>x.ContainerCode) + .CheckContain(Searcher.MaterialCode, x=>x.MaterialCode) + .CheckContain(Searcher.MaterialType, x=>x.MaterialType) + .CheckContain(Searcher.MaterialName, x=>x.MaterialName) + .CheckContain(Searcher.Batch, x=>x.Batch) + .CheckContain(Searcher.ReceiptCode, x=>x.ReceiptCode) + .CheckContain(Searcher.Status, x=>x.Status) + .CheckEqual(Searcher.TaskStatus, x=>x.TaskStatus) + .DPWhere(Wtm,x => x.ZoneId) .Select(x => new Inventory_View { - ID = x.ID, - ZoneCode = x.ZoneCode, + ID = x.ID, + Name_view = x.Zone.Name, ContainerCode = x.ContainerCode, LocationCode = x.LocationCode, MaterialCode = x.MaterialCode, @@ -133,9 +83,9 @@ namespace HHWMS.Web MaterialUnit = x.MaterialUnit, Batch = x.Batch, Lot = x.Lot, - //ManufactureDate = x.ManufactureDate, - //ExpirationDate = x.ExpirationDate, - //CompanyCode = x.CompanyCode, + ManufactureDate = x.ManufactureDate, + ExpirationDate = x.ExpirationDate, + CompanyCode = x.CompanyCode, SupplierCode = x.SupplierCode, TaskQty = x.TaskQty, Qty = x.Qty, @@ -144,13 +94,17 @@ namespace HHWMS.Web ReceiptDetailId = x.ReceiptDetailId, Status = x.Status, TaskStatus = x.TaskStatus, + Flag = x.Flag, }) .OrderBy(x => x.ID); return query; } + } - public class Inventory_View : Inventory - { + public class Inventory_View : Inventory{ + [Display(Name = "Location.ZoneName")] + public String Name_view { get; set; } + } } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs index 364671b..b7b22ea 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs @@ -1,46 +1,40 @@ -using System; +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; +using HHWMS.Web.Models; namespace HHWMS.Web { public partial class InventorySearcher : BaseSearcher { - [Display(Name = "Task.ZoneCode")] - public String ZoneCode { get; set; } - [Display(Name = "Inventory.LocationCode")] - public String LocationCode { get; set; } - [Display(Name = "Inventory.UniqueCode")] - public String UniqueCode { get; set; } + public List AllZones { get; set; } + [Display(Name = "Location.ZoneName")] + public int? ZoneId { get; set; } + [Display(Name = "Task.ContainerCode")] + public String ContainerCode { 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.SourceCode")] - public String SourceCode { get; set; } [Display(Name = "Inventory.ReceiptCode")] public String ReceiptCode { get; set; } [Display(Name = "Inventory.Status")] public String Status { get; set; } + [Display(Name = "Inventory.TaskStatus")] + public InventoryTaskStatusEnum? TaskStatus { get; set; } protected override void InitVM() { + AllZones = DC.Set().GetSelectListItems(Wtm, y => y.Name); } } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs index 28ef45e..a996d6a 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs @@ -1,39 +1,27 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System.ComponentModel.DataAnnotations; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; -using HHWMS.Web; using HHWMS.Web.Models; + namespace HHWMS.Web { public partial class InventoryVM : BaseCRUDVM { - public List ZoneCodes { get; set; } - public List InventoryTaskStatus { get; set; } + public List AllZones { get; set; } public InventoryVM() { + SetInclude(x => x.Zone); } protected override void InitVM() { - var CurrentCulture = Wtm.CurrentCulture; - var dictDatas = DC.Set().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(); + AllZones = DC.Set().GetSelectListItems(Wtm, y => y.Name); } public override void DoAdd() diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Create.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Create.cshtml index 410c485..e9f08fb 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Create.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Create.cshtml @@ -3,7 +3,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Delete.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Delete.cshtml index 411b453..a162a93 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Delete.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Delete.cshtml @@ -4,7 +4,7 @@ @Localizer["Sys.DeleteConfirm"] - + @@ -25,6 +25,7 @@ + diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Details.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Details.cshtml index ece7602..9316dc7 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Details.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Details.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.InventoryVM +@model HHWMS.Web.InventoryVM @inject IStringLocalizer Localizer; - + @@ -24,6 +24,7 @@ + diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Edit.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Edit.cshtml index ab869b7..a595bd5 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Edit.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Edit.cshtml @@ -3,7 +3,7 @@ - + @@ -24,6 +24,7 @@ + diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml index 91867e1..91ed46f 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml @@ -1,21 +1,17 @@ -@model HHWMS.Web.InventoryListVM +@model HHWMS.Web.InventoryListVM @inject IStringLocalizer Localizer; - - + + - - @* + - - - - - *@ + + diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs index b7be97e..71161fd 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs @@ -34,149 +34,7 @@ namespace HHWMS.Web Value = x.DictValue }).ToList(); } - - /// - /// 分解出库单 - /// - /// 处理结果 - public ResponseResult DecomposeShipment() - { - try - { - using var transaction = DC.BeginTransaction(); - try - { - var details = DC.Set() - .Where(x => x.HeaderId == Entity.ID && x.Status != ShipStatusEnum.分配完成) - .ToList(); - - if (!details.Any()) - { - return ResponseResult.Error("没有需要分配的出库单明细"); - } - - foreach (var detail in details) - { - var availableInventories = DC.Set() - .Where(x => x.MaterialCode == detail.MaterialCode - && x.TaskStatus == InventoryTaskStatus.无任务 - && x.Qty > x.TaskQty - ) - .OrderBy(x => x.CreateTime) - .ToList(); - - decimal remainingQty = (decimal)(detail.Qty - (detail.DividedQty ?? 0)); - decimal dividedQty = 0; - - foreach (var inventory in availableInventories) - { - if (remainingQty <= 0) break; - - var currentInventory = DC.Set() - .FirstOrDefault(x => x.ID == inventory.ID); - - if (currentInventory == null || currentInventory.UpdateVersion != inventory.UpdateVersion) - { - continue; - } - - decimal availableQty = (decimal)(currentInventory.Qty - (currentInventory.TaskQty ?? 0)); - if (availableQty <= 0) continue; - - decimal qtyToDivide = Math.Min(remainingQty, availableQty); - - // 更新库存分配数量 - currentInventory.TaskQty = (currentInventory.TaskQty ?? 0) + qtyToDivide; - currentInventory.Status = InventoryTaskStatus.任务中; - currentInventory.UpdateVersion++; - DC.UpdateEntity(currentInventory); - - remainingQty -= qtyToDivide; - dividedQty += qtyToDivide; - - /*var allocation = new InventoryAllocation - { - InventoryId = currentInventory.ID, - ShipmentDetailId = detail.ID, - DividedQty = qtyToDivide, - Status = ShipStatusEnum.分配完成.ToString() - }; - DC.AddEntity(allocation);*/ - } - - if (dividedQty > 0) - { - var currentDetail = DC.Set() - .FirstOrDefault(x => x.ID == detail.ID); - - if (currentDetail != null && currentDetail.UpdateVersion == detail.UpdateVersion) - { - currentDetail.DividedQty = (currentDetail.DividedQty ?? 0) + dividedQty; - currentDetail.Status = currentDetail.DividedQty >= currentDetail.Qty ? - ShipStatusEnum.分配完成 : - ShipStatusEnum.分配中; - currentDetail.UpdateVersion++; - DC.UpdateEntity(currentDetail); - } - } - } - - var currentHeader = DC.Set() - .FirstOrDefault(x => x.ID == Entity.ID); - - if (currentHeader != null && currentHeader.UpdateVersion == Entity.UpdateVersion) - { - var allDetails = DC.Set() - .Where(x => x.HeaderId == Entity.ID) - .ToList(); - - bool allDivided = allDetails.All(x => x.Status == ShipStatusEnum.分配完成); - - currentHeader.FirstStatus = allDivided ? - ShipStatusEnum.分配完成 : - ShipStatusEnum.分配中; - currentHeader.UpdateVersion++; - DC.UpdateEntity(currentHeader); - } - - DC.SaveChanges(); - transaction.Commit(); - - var unallocatedDetails = details.Where(x => x.Status != ShipStatusEnum.分配完成).ToList(); - if (unallocatedDetails.Any()) - { - var errorMsg = string.Join("\n", unallocatedDetails.Select(x => - $"物料{x.MaterialCode}缺少{x.Qty - (x.DividedQty ?? 0)}个")); - return ResponseResult.Error($"部分物料库存不足,请检查:\n{errorMsg}"); - } - - return ResponseResult.Success(new - { - message = "出库单分解完成", - headerId = Entity.ID, - status = Entity.FirstStatus, - allocatedDetails = details.Select(x => new - { - x.ID, - x.MaterialCode, - x.Qty, - DividedQty = x.DividedQty, - x.Status - }).ToList() - }); - } - catch (Exception ex) - { - transaction.Rollback(); - throw new Exception($"处理出库单时发生错误: {ex.Message}"); - } - } - catch (Exception ex) - { - return ResponseResult.Error($"分解出库单失败:{ex.Message}"); - } - } - + public override void DoAdd() { base.DoAdd(); @@ -191,151 +49,5 @@ namespace HHWMS.Web { base.DoDelete(); } - - /// - /// 获取分配库存对应的货架列表 - /// - /// 货架列表 - public ResponseResult> GetAllocatedLocations() - { - try - { - // 获取已分配的出库单明细 - var details = DC.Set() - .Where(x => x.HeaderId == Entity.ID - && (x.Status == ShipStatusEnum.分配完成 || x.Status == ShipStatusEnum.分配中)) - .ToList(); - - if (!details.Any()) - { - return ResponseResult>.Error("没有已分配的出库单明细"); - } - - // 获取明细对应的所有库存记录 - var allocatedInventories = DC.Set() - .Where(x => x.TaskStatus == InventoryTaskStatus.任务中 - && details.Select(d => d.MaterialCode).Contains(x.MaterialCode)) - .ToList(); - - // 获取去重后的货架编码列表 - var locations = allocatedInventories - .Where(x => !string.IsNullOrEmpty(x.LocationCode)) - .Select(x => x.LocationCode) - .Distinct() - .OrderBy(x => x) - .ToList(); - - if (!locations.Any()) - { - return ResponseResult>.Error("未找到相关库存的货架信息"); - } - - // 返回货架列表,并包含统计信息 - return ResponseResult>.Success(locations); - } - catch (Exception ex) - { - return ResponseResult>.Error($"获取货架列表失败:{ex.Message}"); - } - } - - /// - /// 获取分配库存的详细信息 - /// - /// 库存详细信息 - public ResponseResult> GetAllocatedInventoryDetails() - { - try - { - // 获取已分配的出库单明细 - var details = DC.Set() - .Where(x => x.HeaderId == Entity.ID - && (x.Status == ShipStatusEnum.分配完成 || x.Status == ShipStatusEnum.分配中)) - .ToList(); - - if (!details.Any()) - { - return ResponseResult>.Error("没有已分配的出库单明细"); - } - - // 获取明细对应的所有库存记录,并按货架分组 - var inventoryGroups = DC.Set() - .Where(x => x.TaskStatus == InventoryTaskStatus.任务中 - && details.Select(d => d.MaterialCode).Contains(x.MaterialCode)) - .GroupBy(x => x.LocationCode) - .Select(g => new InventoryLocationInfo - { - LocationCode = g.Key, - Inventories = g.Select(inv => new InventoryInfo - { - MaterialCode = inv.MaterialCode, - MaterialName = inv.MaterialName, - Qty = (decimal)inv.Qty, - TaskQty = inv.TaskQty ?? 0, - BatchCode = inv.Batch - }).ToList() - }) - .OrderBy(x => x.LocationCode) - .ToList(); - - if (!inventoryGroups.Any()) - { - return ResponseResult>.Error("未找到相关库存信息"); - } - - return ResponseResult>.Success(inventoryGroups); - } - catch (Exception ex) - { - return ResponseResult>.Error($"获取库存详细信息失败:{ex.Message}"); - } - } - - /// - /// 库存位置信息 - /// - public class InventoryLocationInfo - { - /// - /// 货架编码 - /// - public string LocationCode { get; set; } - - /// - /// 该货架上的库存列表 - /// - public List Inventories { get; set; } - } - - /// - /// 库存信息 - /// - public class InventoryInfo - { - /// - /// 物料编码 - /// - public string MaterialCode { get; set; } - - /// - /// 物料名称 - /// - public string MaterialName { get; set; } - - /// - /// 总数量 - /// - public decimal Qty { get; set; } - - /// - /// 任务数量 - /// - public decimal TaskQty { get; set; } - - /// - /// 批次号 - /// - public string BatchCode { get; set; } - } } } diff --git a/HHWMS.Web/Models/Configs/Location.cs b/HHWMS.Web/Models/Configs/Location.cs index 7023187..3d7e2c6 100644 --- a/HHWMS.Web/Models/Configs/Location.cs +++ b/HHWMS.Web/Models/Configs/Location.cs @@ -12,9 +12,9 @@ public class Location : BasePoco [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public new int ID { get; set; } - public LocationZone LocationZone { get; set; } + public LocationZone Zone { get; set; } [Display(Name = "Location.ZoneCode", Description = "库位编码")] - public int LocationZoneId { get; set; } + public int ZoneId { get; set; } [Display(Name = "Location.Code", Description = "库位编码")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] @@ -28,7 +28,7 @@ public class Location : BasePoco [Display(Name = "Location.RoadWay", Description = "巷道")] [Required(ErrorMessage = "Validate.{0}required")] - public short? RoadWay { get; set; } + public short RoadWay { get; set; } [Display(Name = "Location.Row", Description = "行")] public short Row { get; set; } diff --git a/HHWMS.Web/Models/Inventory/Inventory.cs b/HHWMS.Web/Models/Inventory/Inventory.cs index 549edb8..f543c64 100644 --- a/HHWMS.Web/Models/Inventory/Inventory.cs +++ b/HHWMS.Web/Models/Inventory/Inventory.cs @@ -13,9 +13,9 @@ namespace HHWMS.Web.Models [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public new int ID { get; set; } - [Display(Name = "Task.ZoneCode", Description = "库区")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string ZoneCode { get; set; } + [Display(Name = "Location.ZoneCode", Description = "库区")] + public int ZoneId{ get; set; } + public LocationZone Zone { get; set; } [Display(Name = "Task.ContainerCode", Description = "容器编码")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] @@ -90,8 +90,7 @@ namespace HHWMS.Web.Models public string Status { get; set; } [Display(Name = "Inventory.TaskStatus", Description = "任务状态")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string TaskStatus { get; set; } + public InventoryTaskStatusEnum TaskStatus { get; set; } [Display(Name = "Inventory.Flag", Description = "格数")] public int Flag { get; set; } @@ -99,3 +98,11 @@ namespace HHWMS.Web.Models public int UpdateVersion { get; set; } } } + +public enum InventoryTaskStatusEnum : short +{ + [Display(Name = "InventoryTaskStatusEnum.Idle")] + Idle = 0, + [Display(Name = "InventoryTaskStatusEnum.Locked")] + Locked = 1, +} \ No newline at end of file diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index 7a3b67b..c280f3b 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1443,4 +1443,10 @@ 库区 + + 无任务 + + + 任务中 + diff --git a/HHWMS.Web/wwwroot/images/container/Empty.png b/HHWMS.Web/wwwroot/images/container/Empty.png new file mode 100644 index 0000000000000000000000000000000000000000..db1e5c4338a33033c61d9fdf2fc02b3906c7a1fb GIT binary patch literal 3705 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 O1|DfWc~GZe8~J~?)&}+f literal 0 HcmV?d00001 diff --git a/HHWMS.Web/wwwroot/images/container/EmptyContainer.png b/HHWMS.Web/wwwroot/images/container/EmptyContainer.png new file mode 100644 index 0000000000000000000000000000000000000000..6292c169d0266117f266abce89a22525bade0424 GIT binary patch literal 3446 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 Y05&iMv<={cRR91007*qoM6N<$f-!)U9{>OV literal 0 HcmV?d00001 diff --git a/HHWMS.Web/wwwroot/images/container/Full.png b/HHWMS.Web/wwwroot/images/container/Full.png new file mode 100644 index 0000000000000000000000000000000000000000..81cc78224b5364fb9617e39173197ff9c2c74b22 GIT binary patch literal 3962 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 ioS2w+*wfR4e+B?WRdVf(@q~c@0000 + + \ No newline at end of file diff --git a/HHWMS.Web/wwwroot/images/container/locked.svg b/HHWMS.Web/wwwroot/images/container/locked.svg new file mode 100644 index 0000000..baa9172 --- /dev/null +++ b/HHWMS.Web/wwwroot/images/container/locked.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/HHWMS.Web/wwwroot/images/container/occupied.svg b/HHWMS.Web/wwwroot/images/container/occupied.svg new file mode 100644 index 0000000..c20fc4d --- /dev/null +++ b/HHWMS.Web/wwwroot/images/container/occupied.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/HHWMS.Web/wwwroot/images/container/半盘禁用.png b/HHWMS.Web/wwwroot/images/container/半盘禁用.png new file mode 100644 index 0000000000000000000000000000000000000000..cc7e7a13282afffaa2559d0504ebfcf871e34fc2 GIT binary patch literal 6181 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 M07*qoM6N<$f^g!ZO#lD@ literal 0 HcmV?d00001 diff --git a/HHWMS.Web/wwwroot/images/container/整盘锁定.png b/HHWMS.Web/wwwroot/images/container/整盘锁定.png new file mode 100644 index 0000000000000000000000000000000000000000..5de1dc63b55887d0d7c57b3892e6866db7c72af5 GIT binary patch literal 4886 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 IM6N<$g0jF}Q~&?~ literal 0 HcmV?d00001 diff --git a/HHWMS.Web/wwwroot/images/container/空柜禁用.png b/HHWMS.Web/wwwroot/images/container/空柜禁用.png new file mode 100644 index 0000000000000000000000000000000000000000..f2c501908ea5c7df5b2c53cf28ab904fe096a2ad GIT binary patch literal 5510 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 literal 0 HcmV?d00001 diff --git a/HHWMS.Web/wwwroot/images/container/空盘禁用.png b/HHWMS.Web/wwwroot/images/container/空盘禁用.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf57da48dbf75a0061996b9e671460ef5c9e786 GIT binary patch literal 5176 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 literal 0 HcmV?d00001