diff --git a/HHWMS.Web/Areas/Configs/Views/Location/Details.cshtml b/HHWMS.Web/Areas/Configs/Views/Location/Details.cshtml index a11e20c..5c72f80 100644 --- a/HHWMS.Web/Areas/Configs/Views/Location/Details.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Location/Details.cshtml @@ -4,7 +4,7 @@ - +@* @@ -16,7 +16,7 @@ - + *@ diff --git a/HHWMS.Web/Areas/Configs/Views/Location/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Location/Index.cshtml index 71c1780..0e60586 100644 --- a/HHWMS.Web/Areas/Configs/Views/Location/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Location/Index.cshtml @@ -5,14 +5,14 @@ - +@* - + *@ @**@ diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index 7a65a83..43c1f68 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -8,6 +8,15 @@ 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) @@ -35,10 +44,16 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { + InitVM(); if (SearcherMode != ListVMSearchModeEnum.MasterDetail) { return new List>{ - this.MakeGridHeader(x => x.ZoneCode), + 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.UniqueCode).SetWidth(230), this.MakeGridHeader(x => x.ContainerCode), this.MakeGridHeader(x => x.LocationCode), @@ -59,7 +74,12 @@ namespace HHWMS.Web //this.MakeGridHeader(x => x.ReceiptCode), //this.MakeGridHeader(x => x.ReceiptDetailId), //this.MakeGridHeader(x => x.Status), - this.MakeGridHeader(x => x.TaskStatus), + this.MakeGridHeader(x => x.TaskStatus) + .SetFormat((a, b) => + { + var data = InventoryTaskStatus.FirstOrDefault(x => x.Value.ToString() == a.TaskStatus); + return data?.Text ?? a.TaskStatus; + }), this.MakeGridHeaderAction(width: 200) }; } @@ -71,17 +91,17 @@ 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.MaterialName), - this.MakeGridHeader(x => x.MaterialSpec), - this.MakeGridHeader(x => x.MaterialUnit), + //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.SupplierCode), + //this.MakeGridHeader(x => x.TaskQty), this.MakeGridHeader(x => x.Qty), - this.MakeGridHeader(x => x.Status), + //this.MakeGridHeader(x => x.Status), this.MakeGridHeader(x => x.TaskStatus), - this.MakeGridHeaderAction(width: 50) + //this.MakeGridHeaderAction(width: 50) }; } } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs index df64b8f..28ef45e 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs @@ -12,6 +12,8 @@ namespace HHWMS.Web { public partial class InventoryVM : BaseCRUDVM { + public List ZoneCodes { get; set; } + public List InventoryTaskStatus { get; set; } public InventoryVM() { @@ -19,6 +21,19 @@ namespace HHWMS.Web 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(); } public override void DoAdd() diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Details.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Details.cshtml index 0cd0adb..ece7602 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Details.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Details.cshtml @@ -1,4 +1,4 @@ -@model HHWMS.Web.InventoryVM +@model HHWMS.Web.InventoryVM @inject IStringLocalizer Localizer; diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml index 936585a..b9a8f4c 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml @@ -3,7 +3,7 @@ - + @* diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs index 90ec4ec..9ed9c5d 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs @@ -241,9 +241,9 @@ namespace HHWMS.Web.Controllers /// /// /// - public ActionResult SelectReceiptDetailsByCode(string code) + public ActionResult SelectReceiptDetailsByCode(int id) { - var data = _unitwork.Find(x => x.Code == code) + var data = _unitwork.Find(x => x.ID == id) .Include(x => x.ReceiptDetails).ToList(); return JsonMore(data.FirstOrDefault().ReceiptDetails.Where(x => x.Status == ReceiptStatusEnum.新建)); } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs index 508659d..a7687f1 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs @@ -34,16 +34,16 @@ namespace HHWMS.Web //this.MakeGridHeader(x => x.ZoneCode), this.MakeGridHeader(x => x.UniqueCode).SetWidth(230), this.MakeGridHeader(x => x.MaterialCode), - this.MakeGridHeader(x => x.MaterialType), - this.MakeGridHeader(x => x.MaterialName), - this.MakeGridHeader(x => x.MaterialSpec), - this.MakeGridHeader(x => x.MaterialUnit), + //this.MakeGridHeader(x => x.MaterialType), + //this.MakeGridHeader(x => x.MaterialName), + //this.MakeGridHeader(x => x.MaterialSpec), + //this.MakeGridHeader(x => x.MaterialUnit), this.MakeGridHeader(x => x.Batch), - this.MakeGridHeader(x => x.Lot).SetHide(), + //this.MakeGridHeader(x => x.Lot).SetHide(), //this.MakeGridHeader(x => x.ManufactureDate), //this.MakeGridHeader(x => x.ExpirationDate), //this.MakeGridHeader(x => x.CompanyCode), - this.MakeGridHeader(x => x.SupplierCode), + //this.MakeGridHeader(x => x.SupplierCode), this.MakeGridHeader(x => x.CompletedQty), this.MakeGridHeader(x => x.Qty), //this.MakeGridHeader(x => x.InventoryStatus), diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs index 2398afa..86476d0 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs @@ -8,11 +8,14 @@ namespace HHWMS.Web { public partial class ReceiptHeaderListVM : BasePagedListVM { - public ReceiptDetailListVM2 Details { get; set; } = new ReceiptDetailListVM2(); + public ReceiptDetailListVM2 ReceiptDetails { get; set; } = new ReceiptDetailListVM2(); + public List ReceiptTypes { get; set; } protected override void InitVM() { - Details.CopyContext(this); + ReceiptDetails.CopyContext(this); + var vm = Wtm.CreateVM(); + ReceiptTypes = vm.ReceiptTypes; } protected override List InitGridAction() { @@ -34,6 +37,7 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { + InitVM(); return new List>{ //this.MakeGridHeader(x => x.SourceCode), this.MakeGridHeader(x => x.Code).SetFormat((a,b) => @@ -41,7 +45,12 @@ namespace HHWMS.Web string rv = UIService.MakeScriptButton(ButtonTypesEnum.Link,a.Code,$"details('{a.ID}')"); return rv; }), - this.MakeGridHeader(x => x.BillType), + this.MakeGridHeader(x => x.BillType) + .SetFormat((a, b) => + { + var data = ReceiptTypes.FirstOrDefault(x => x.Value.ToString() == a.BillType); + return data?.Text ?? a.BillType; + }), //this.MakeGridHeader(x => x.CompanyCode), //this.MakeGridHeader(x => x.SupplierCode), //this.MakeGridHeader(x => x.TotalQty), diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs index 1d26e7e..b265b2f 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs @@ -9,6 +9,7 @@ namespace HHWMS.Web public partial class ReceiptHeaderVM : BaseCRUDVM { public ReceiptDetailListVM2 Details = new ReceiptDetailListVM2(); + public List ReceiptTypes { get; set; } public ReceiptHeaderVM() { } @@ -17,6 +18,14 @@ namespace HHWMS.Web { Details.CopyContext(this); Details.Searcher.ReceiptHeaderId = Entity.ID; + + var CurrentCulture = Wtm.CurrentCulture; + var dictDatas = DC.Set().ToList(); + ReceiptTypes = dictDatas.Where(x => x.DictType == "ReceiptType").Select(x => new ComboSelectListItem + { + Text = CurrentCulture == "zh" ? x.DictLabel : x.DictLabelUs, + Value = x.DictValue + }).ToList(); } public override void DoAdd() diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml index c5bd60c..b6442e4 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml @@ -41,7 +41,7 @@ diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Details.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Details.cshtml index 54fec18..ad69afc 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Details.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Details.cshtml @@ -1,19 +1,21 @@ -@model HHWMS.Web.ShipmentHeaderVM +@model HHWMS.Web.ShipmentHeaderVM @inject IStringLocalizer Localizer; - +@* *@ - +@* - + *@ + + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Index.cshtml index fc225f5..9b87401 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Index.cshtml @@ -3,11 +3,11 @@ - +@* *@ - + - +@* *@ diff --git a/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailController.cs b/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailController.cs index 895be16..fc3152f 100644 --- a/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailController.cs +++ b/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailController.cs @@ -6,6 +6,8 @@ using WalkingTec.Mvvm.Mvc; using WalkingTec.Mvvm.Core.Extensions; using HHWMS.Web; using HHWMS.Web.Models; +using Microsoft.EntityFrameworkCore; +using System.Linq; namespace HHWMS.Web.Controllers { @@ -44,6 +46,15 @@ namespace HHWMS.Web.Controllers } } + [ActionDescription("Sys.Search")] + [HttpPost] + public string Search2(TaskDetailListVM2 vm) + { + vm.Searcher.Page = vm.FC.GetValue("Page"); + vm.Searcher.Limit = vm.FC.GetValue("Limit"); + return vm.GetJson(false); + } + #endregion #region Create @@ -160,7 +171,7 @@ namespace HHWMS.Web.Controllers { if (!ModelState.IsValid || !vm.DoBatchEdit()) { - return PartialView("BatchEdit",vm); + return PartialView("BatchEdit", vm); } else { @@ -184,7 +195,7 @@ namespace HHWMS.Web.Controllers { if (!ModelState.IsValid || !vm.DoBatchDelete()) { - return PartialView("BatchDelete",vm); + return PartialView("BatchDelete", vm); } else { @@ -194,7 +205,7 @@ namespace HHWMS.Web.Controllers #endregion #region Import - [ActionDescription("Sys.Import")] + [ActionDescription("Sys.Import")] public ActionResult Import() { var vm = Wtm.CreateVM(); @@ -229,22 +240,30 @@ namespace HHWMS.Web.Controllers [ActionDescription("TaskHeader.Cancel")] public ActionResult Cancel(string id) { - var task = _unitwork.FindById(int.Parse(id)); - // 判断任务 是否能取消 - if (task.Status < TaskStatusEnum.已下发) - { - return FFResult().Alert($"此任务未下发,无需取消!"); - } + var task = _unitwork.Find(x => x.ID == int.Parse(id)) + .Include(x => x.TaskHeader).FirstOrDefault(); + if (task != null) { + // 判断任务 是否能取消 + if (task.Status < TaskStatusEnum.已下发) + { + return FFResult().Alert($"此任务未下发,无需取消!"); + } + else if (task.Status == TaskStatusEnum.完成) + { + return FFResult().Alert($"此任务已完成,无需取消!"); + } + var taskInfo = new TaskInfo { TaskId = $"{task.TaskHeader.TaskNo}-{task.FromLocation}", TaskType = 99, }; - var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data; try { + var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data; + if ((bool)res?.Success) { // 删除任务,处理数据 diff --git a/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderController.cs b/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderController.cs index b794a43..85578c8 100644 --- a/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderController.cs +++ b/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderController.cs @@ -309,9 +309,9 @@ namespace HHWMS.Web.Controllers taskInfo.EndPos = end; } - /* var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data; try { + var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data; if ((bool)res?.Success) { // 删除已回传MES的任务 @@ -321,7 +321,7 @@ namespace HHWMS.Web.Controllers catch (Exception ex) { return FFResult().Alert($"操作失败,{ex.Message}"); - }*/ + } return FFResult().RefreshGrid(); } #endregion 任务下发 @@ -331,9 +331,10 @@ namespace HHWMS.Web.Controllers public ActionResult Cancel(string id) { var task = _unitwork.FindById(int.Parse(id)); - - if (task != null) { - if(task.Status < TaskStatusEnum.已下发) + + if (task != null) + { + if (task.Status > TaskStatusEnum.已下发) { return FFResult().Alert($"此任务未下发,无需取消!"); } @@ -347,9 +348,9 @@ namespace HHWMS.Web.Controllers TaskId = task.TaskNo, TaskType = 99, }; - var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data; try { + var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data; if ((bool)res?.Success) { // 删除任务,处理数据 diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs new file mode 100644 index 0000000..dbc699d --- /dev/null +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; +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 TaskDetailListVM2 : BasePagedListVM + { + protected override List InitGridAction() + { + return new List + { + this.MakeAction("TaskDetail","Cancel",Localizer["TaskHeader.Cancel"],Localizer["TaskHeader.Cancel"],GridActionParameterTypesEnum.SingleId,"taskManage"), + }; + } + + + protected override IEnumerable> InitGridHeader() + { + return new List>{ + this.MakeGridHeader(x => x.TaskNo_view), + this.MakeGridHeader(x => x.OrderCode).SetHide(), + this.MakeGridHeader(x => x.OrderDetailId).SetHide(), + this.MakeGridHeader(x => x.UniqueCode), + this.MakeGridHeader(x => x.MaterialCode), + this.MakeGridHeader(x => x.MaterialName).SetHide(), + this.MakeGridHeader(x => x.MaterialSpec).SetHide(), + this.MakeGridHeader(x => x.MaterialUnit).SetHide(), + this.MakeGridHeader(x => x.Batch).SetHide(), + this.MakeGridHeader(x => x.Lot).SetHide(), + this.MakeGridHeader(x => x.ContainerCode), + this.MakeGridHeader(x => x.Qty), + this.MakeGridHeader(x => x.InventoryId).SetHide(), + this.MakeGridHeader(x => x.FromLocation), + this.MakeGridHeader(x => x.ToLocation), + this.MakeGridHeader(x => x.Status), + this.MakeGridHeaderAction(width: 200) + }; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .Where(x => x.TaskHeaderId == Searcher.TaskHeaderId) + .Select(x => new TaskDetail_View + { + ID = x.ID, + TaskNo_view = $"{x.TaskHeader.TaskNo}-{x.FromLocation}", + OrderCode = x.OrderCode, + OrderDetailId = x.OrderDetailId, + UniqueCode = x.UniqueCode, + MaterialCode = x.MaterialCode, + MaterialName = x.MaterialName, + MaterialSpec = x.MaterialSpec, + MaterialUnit = x.MaterialUnit, + Batch = x.Batch, + Lot = x.Lot, + ContainerCode = x.ContainerCode, + Qty = x.Qty, + InventoryId = x.InventoryId, + FromLocation = x.FromLocation, + ToLocation = x.ToLocation, + Status = x.Status, + }) + .OrderBy(x => x.ID); + return query; + } + } +} diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailSearcher.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailSearcher.cs index ed98198..c931c15 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailSearcher.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailSearcher.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -14,6 +14,10 @@ namespace HHWMS.Web { [Display(Name = "Inventory.UniqueCode")] public String UniqueCode { get; set; } + + [Display(Name = "Task.TaskNo")] + public int? TaskHeaderId { get; set; } + [Display(Name = "Inventory.MaterialCode")] public String MaterialCode { get; set; } [Display(Name = "Task.FromLocation")] diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs index 4a6d040..b96fdae 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs @@ -13,11 +13,14 @@ namespace HHWMS.Web public partial class TaskHeaderListVM : BasePagedListVM { public List ZoneCodes { get; set; } + public TaskDetailListVM2 TaskDetails { get; set; } = new TaskDetailListVM2(); protected override void InitVM() { var vm = Wtm.CreateVM(); ZoneCodes = vm.ZoneCodes; + + TaskDetails.CopyContext(this); } protected override List InitGridAction() @@ -49,7 +52,12 @@ namespace HHWMS.Web var data = ZoneCodes.FirstOrDefault(x => x.Value.ToString() == a.ZoneCode); return data?.Text ?? a.ZoneCode; }), - this.MakeGridHeader(x => x.TaskNo), + this.MakeGridHeader(x => x.TaskNo) + .SetFormat((a,b) => + { + string rv = UIService.MakeScriptButton(ButtonTypesEnum.Link,a.TaskNo,$"details('{a.ID}')"); + return rv; + }), this.MakeGridHeader(x => x.TaskType), this.MakeGridHeader(x => x.FromLocation), this.MakeGridHeader(x => x.ToLocation), @@ -89,7 +97,7 @@ namespace HHWMS.Web Status = x.Status, ErrorMsg = x.ErrorMsg, }) - .OrderBy(x => x.ID); + .OrderByDescending(x => x.ID); return query; } diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskHeader/Index.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskHeader/Index.cshtml index 7528fb4..72f5a61 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskHeader/Index.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskHeader/Index.cshtml @@ -1,7 +1,7 @@ @model HHWMS.Web.TaskHeaderListVM @inject IStringLocalizer Localizer; - + @@ -13,4 +13,13 @@ - + + + + diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index d650e36..58adbe6 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1365,4 +1365,10 @@ 点数 + + 库位分析 + + + 启动出库 + \ No newline at end of file diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 88f4be8..7d3b449 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -36,10 +36,10 @@ ], "CookiePre": "HHWMS", //cookie前缀 "IsQuickDebug": true, //是否启用debug模式 - "EnableTenant": false, //是否启动多租户 + "EnableTenant": false, //是否启动多租户 "SyncDb": true, //是否自动同步数据库 "EncryptKey": "", //加密密钥 - "PageMode": "Tab", //页面显示模式,Single或者Tab + "PageMode": "Single", //页面显示模式,Single或者Tab "TabMode": "Simple", //Tab页显示方式,Default或者Simple "IsFilePublic": true, "ErrorHandler": "/_Framework/Error",