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 0000000..db1e5c4 Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/Empty.png differ diff --git a/HHWMS.Web/wwwroot/images/container/EmptyContainer.png b/HHWMS.Web/wwwroot/images/container/EmptyContainer.png new file mode 100644 index 0000000..6292c16 Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/EmptyContainer.png differ diff --git a/HHWMS.Web/wwwroot/images/container/Full.png b/HHWMS.Web/wwwroot/images/container/Full.png new file mode 100644 index 0000000..81cc782 Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/Full.png differ diff --git a/HHWMS.Web/wwwroot/images/container/Some.png b/HHWMS.Web/wwwroot/images/container/Some.png new file mode 100644 index 0000000..24a71eb Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/Some.png differ diff --git a/HHWMS.Web/wwwroot/images/container/empty.svg b/HHWMS.Web/wwwroot/images/container/empty.svg new file mode 100644 index 0000000..6d9261e --- /dev/null +++ b/HHWMS.Web/wwwroot/images/container/empty.svg @@ -0,0 +1,3 @@ + + + \ 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 0000000..cc7e7a1 Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/半盘禁用.png differ diff --git a/HHWMS.Web/wwwroot/images/container/半盘锁定.png b/HHWMS.Web/wwwroot/images/container/半盘锁定.png new file mode 100644 index 0000000..f194f89 Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/半盘锁定.png differ diff --git a/HHWMS.Web/wwwroot/images/container/整盘禁用.png b/HHWMS.Web/wwwroot/images/container/整盘禁用.png new file mode 100644 index 0000000..405af2e Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/整盘禁用.png differ diff --git a/HHWMS.Web/wwwroot/images/container/整盘锁定.png b/HHWMS.Web/wwwroot/images/container/整盘锁定.png new file mode 100644 index 0000000..5de1dc6 Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/整盘锁定.png differ diff --git a/HHWMS.Web/wwwroot/images/container/空柜禁用.png b/HHWMS.Web/wwwroot/images/container/空柜禁用.png new file mode 100644 index 0000000..f2c5019 Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/空柜禁用.png differ diff --git a/HHWMS.Web/wwwroot/images/container/空柜锁定.png b/HHWMS.Web/wwwroot/images/container/空柜锁定.png new file mode 100644 index 0000000..e4acf03 Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/空柜锁定.png differ diff --git a/HHWMS.Web/wwwroot/images/container/空盘禁用.png b/HHWMS.Web/wwwroot/images/container/空盘禁用.png new file mode 100644 index 0000000..cbf57da Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/空盘禁用.png differ diff --git a/HHWMS.Web/wwwroot/images/container/空盘锁定.png b/HHWMS.Web/wwwroot/images/container/空盘锁定.png new file mode 100644 index 0000000..0723711 Binary files /dev/null and b/HHWMS.Web/wwwroot/images/container/空盘锁定.png differ