diff --git a/HHWMS.Web/Areas/Configs/ViewModels/ContainerVMs/ContainerListVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/ContainerVMs/ContainerListVM.cs index 8d4572a..5c657cc 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/ContainerVMs/ContainerListVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/ContainerVMs/ContainerListVM.cs @@ -31,6 +31,8 @@ namespace HHWMS.Web this.MakeStandardAction("Container", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "configs", dialogWidth: 800), this.MakeStandardAction("Container", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "configs"), this.MakeAction("Container","AddContainer",Localizer["Container.AddContainer"],Localizer["Container.AddContainer"],GridActionParameterTypesEnum.NoId,"configs"), + this.MakeAction("Container","Print",Localizer["Sys.Print"],"",GridActionParameterTypesEnum.MultiIds,"configs") + .SetShowDialog(false).SetOnClickScript("print"), }; } diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationListVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationListVM.cs index 107de55..5901846 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationListVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationListVM.cs @@ -37,7 +37,7 @@ namespace HHWMS.Web return new List>{ this.MakeGridHeader(x => x.Name_view), this.MakeGridHeader(x => x.Code), - this.MakeGridHeader(x => x.Type), + this.MakeGridHeader(x => x.Type).SetHide(), this.MakeGridHeader(x => x.Status), this.MakeGridHeader(x => x.ContainerCode), this.MakeGridHeader(x => x.RoadWay), diff --git a/HHWMS.Web/Areas/Configs/Views/Container/AddContainer.cshtml b/HHWMS.Web/Areas/Configs/Views/Container/AddContainer.cshtml index cb369c4..54bfef9 100644 --- a/HHWMS.Web/Areas/Configs/Views/Container/AddContainer.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Container/AddContainer.cshtml @@ -3,11 +3,11 @@ - - - - - + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml index d7c5e47..7b78f04 100644 --- a/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml @@ -2,15 +2,62 @@ @inject IStringLocalizer Localizer; - - - - - - - - - - + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index 9a6f970..f22fa02 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -36,10 +36,10 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.ContainerCode), this.MakeGridHeader(x => x.LocationCode), this.MakeGridHeader(x => x.MaterialCode), - this.MakeGridHeader(x => x.MaterialType), + this.MakeGridHeader(x => x.MaterialType).SetHide(), this.MakeGridHeader(x => x.MaterialName), - this.MakeGridHeader(x => x.MaterialSpec).SetHide(), - this.MakeGridHeader(x => x.MaterialUnit), + this.MakeGridHeader(x => x.MaterialSpec), + this.MakeGridHeader(x => x.MaterialUnit).SetHide(), this.MakeGridHeader(x => x.Batch), this.MakeGridHeader(x => x.Lot).SetHide(), this.MakeGridHeader(x => x.ManufactureDate).SetHide(), diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index c0c8ab3..a4f8987 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -1,11 +1,12 @@ using Microsoft.AspNetCore.Mvc; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Mvc; +using System.Collections.Generic; namespace HHWMS.Web.Controllers { [Area("receipt")] - [ActionDescription("盘料操作")] + [ActionDescription("入库操作")] public partial class ReceiptInController : BaseController { private readonly IUnitWork _unitWork; @@ -24,5 +25,78 @@ namespace HHWMS.Web.Controllers } #endregion Index + + #region API Methods + + [HttpPost] + public IActionResult GetOperators() + { + // TODO: 从数据库获取操作员列表 + var operators = new List + { + new { value = "1", label = "张三" }, + new { value = "2", label = "李四" } + }; + return Json(new { Code = 200, Data = operators }); + } + + [HttpPost] + public IActionResult GetProcesses() + { + // TODO: 从数据库获取工序列表 + var processes = new List + { + new { value = "1", label = "工序1" }, + new { value = "2", label = "工序2" } + }; + return Json(new { Code = 200, Data = processes }); + } + + [HttpPost] + public IActionResult GetOperatorInfo() + { + // TODO: 获取当前登录用户信息 + return Json(new { Code = 200, Data = "当前操作员:张三" }); + } + + [HttpPost] + public IActionResult GetOrdersByMaterial(string materialCode) + { + // TODO: 根据物料码查询相关生产订单 + var orders = new List + { + new { value = "1", label = "生产订单1" }, + new { value = "2", label = "生产订单2" } + }; + return Json(new { Code = 200, Data = orders }); + } + + [HttpPost] + public IActionResult SubmitReceipt([FromBody] ReceiptInModel model) + { + try + { + // TODO: 实现入库逻辑 + return Json(new { Code = 200, Msg = "入库成功" }); + } + catch (System.Exception ex) + { + return Json(new { Code = 500, Msg = ex.Message }); + } + } + + #endregion API Methods } -} + + public class ReceiptInModel + { + public string PalletCode { get; set; } + public string MaterialCode { get; set; } + public string OrderId { get; set; } + public string OperatorId { get; set; } + public string ProcessId { get; set; } + public int Quantity { get; set; } + public bool IsQualified { get; set; } + public string OperatorInfo { get; set; } + } +} \ No newline at end of file diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs index 8fccf2a..432f7d3 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs @@ -22,8 +22,6 @@ namespace HHWMS.Web return new List { this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"receipt", dialogWidth: 800), - this.MakeAction("ReceiptHeader","Count",Localizer["ReceiptHeader.Count"],Localizer["ReceiptHeader.Count"],GridActionParameterTypesEnum.SingleId,"receipt") - .SetShowInRow().SetHideOnToolBar().SetButtonClass("layui-btn-Warm").SetSize(1200,500), this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "receipt", dialogWidth: 800), this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "receipt", dialogWidth: 800), this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "receipt", dialogWidth: 800), diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 490d2d1..0ba23ca 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -1,342 +1,297 @@ - - - - - - - +
+ + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 绑定入库 - 重置 - @* 启动入库 *@ - - - - - + + + + {{ item.label }} + + + + + + + + {{ item.label }} + + + + + + + + + + + + + + + + {{ item.label }} + + + + + + + + + + + 上架入库 + 重置 + + + + + + +
+ + app.use(ArcoVue); + app.mount('#plapp'); + \ No newline at end of file diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs index 034bfeb..e8c7fdf 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs @@ -19,14 +19,7 @@ namespace HHWMS.Web return new List { this.MakeAction("ShipmentHeader","StartOut",Localizer["ShipmentHeader.StartOut"],"",GridActionParameterTypesEnum.SingleId,"shipment"), - this.MakeAction("ShipmentHeader","Analyse",Localizer["ShipmentHeader.Analyse"],Localizer["ShipmentHeader.Analyse"],GridActionParameterTypesEnum.SingleId,"shipment") - .SetShowInRow().SetHideOnToolBar().SetButtonClass("layui-btn-Warm").SetMax(), - this.MakeAction("ShipmentHeader","PickRoute",Localizer["ShipmentHeader.PickRoute"],Localizer["ShipmentHeader.PickRoute"],GridActionParameterTypesEnum.SingleId,"shipment") - .SetShowInRow().SetHideOnToolBar().SetButtonClass("layui-btn-Warm").SetMax(), - this.MakeAction("ShipmentHeader","ShelfInv",Localizer["ShipmentHeader.ShelfInv"],Localizer["ShipmentHeader.ShelfInv"],GridActionParameterTypesEnum.SingleId,"shipment") - .SetShowInRow().SetHideOnToolBar().SetButtonClass("layui-btn-Warm").SetSize(1200,800), - this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"shipment", dialogWidth: 800), this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "shipment", dialogWidth: 800), this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "shipment", dialogWidth: 800), diff --git a/HHWMS.Web/Views/Shared/_Layout.cshtml b/HHWMS.Web/Views/Shared/_Layout.cshtml index f346d14..1e8710a 100644 --- a/HHWMS.Web/Views/Shared/_Layout.cshtml +++ b/HHWMS.Web/Views/Shared/_Layout.cshtml @@ -47,6 +47,7 @@ +