From 2459d4664a87fe05841e3f8ebeb7514568ec368d Mon Sep 17 00:00:00 2001 From: zgf Date: Mon, 28 Aug 2023 23:30:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventoryVMs/InventoryListVM.cs | 40 ++++++++++--------- .../InventoryVMs/InventorySearcher.cs | 2 + .../Inventory/Views/Inventory/Index.cshtml | 7 ++-- .../Controllers/ReceiptDetailController.cs | 18 +++++++-- .../Controllers/ReceiptHeaderController.cs | 2 + .../ReceiptDetailVMs/ReceiptDetailListVM.cs | 2 + .../ReceiptDetailVMs/ReceiptDetailListVM2.cs | 17 ++++---- .../ReceiptDetailVMs/ReceiptDetailSearcher.cs | 3 ++ .../ReceiptHeaderVMs/ReceiptHeaderListVM.cs | 12 +++--- .../Views/ReceiptDetail/CreateDetails.cshtml | 3 +- .../Receipt/Views/ReceiptHeader/Create.cshtml | 8 ++-- .../Views/ReceiptHeader/Details.cshtml | 8 ++-- .../Receipt/Views/ReceiptHeader/Index.cshtml | 6 +-- .../Controllers/TaskDetailController.cs | 40 ++++++++++++++++++- .../Controllers/TaskHeaderController.cs | 39 +++++++++++++++++- .../TaskHeaderVMs/TaskHeaderListVM.cs | 1 + HHWMS.Web/Resources/Program.zh.resx | 3 ++ 17 files changed, 159 insertions(+), 52 deletions(-) diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index 8352662..7a65a83 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -35,10 +35,11 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { - if (SearcherMode == ListVMSearchModeEnum.MasterDetail) + if (SearcherMode != ListVMSearchModeEnum.MasterDetail) { return new List>{ this.MakeGridHeader(x => x.ZoneCode), + this.MakeGridHeader(x => x.UniqueCode).SetWidth(230), this.MakeGridHeader(x => x.ContainerCode), this.MakeGridHeader(x => x.LocationCode), this.MakeGridHeader(x => x.MaterialCode), @@ -47,17 +48,17 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.MaterialSpec), 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.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), 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.SourceCode), + //this.MakeGridHeader(x => x.ReceiptCode), + //this.MakeGridHeader(x => x.ReceiptDetailId), + //this.MakeGridHeader(x => x.Status), this.MakeGridHeader(x => x.TaskStatus), this.MakeGridHeaderAction(width: 200) }; @@ -65,16 +66,17 @@ namespace HHWMS.Web else { return new List>{ - this.MakeGridHeader(x => x.ZoneCode), - this.MakeGridHeader(x => x.ContainerCode), - this.MakeGridHeader(x => x.LocationCode), + //this.MakeGridHeader(x => x.ZoneCode), + this.MakeGridHeader(x => x.UniqueCode).SetWidth(230), + //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.CompanyCode), + this.MakeGridHeader(x => x.SupplierCode), this.MakeGridHeader(x => x.TaskQty), this.MakeGridHeader(x => x.Qty), this.MakeGridHeader(x => x.Status), @@ -88,6 +90,7 @@ namespace HHWMS.Web { var query = DC.Set() .CheckContain(Searcher.ZoneCode, x => x.ZoneCode) + .CheckContain(Searcher.UniqueCode, x => x.UniqueCode) .CheckContain(Searcher.LocationCode, x => x.LocationCode) .CheckContain(Searcher.MaterialCode, x => x.MaterialCode) .CheckContain(Searcher.MaterialType, x => x.MaterialType) @@ -103,6 +106,7 @@ namespace HHWMS.Web { ID = x.ID, ZoneCode = x.ZoneCode, + UniqueCode = x.UniqueCode, ContainerCode = x.ContainerCode, LocationCode = x.LocationCode, MaterialCode = x.MaterialCode, @@ -111,10 +115,10 @@ namespace HHWMS.Web MaterialSpec = x.MaterialSpec, MaterialUnit = x.MaterialUnit, Batch = x.Batch, - Lot = x.Lot, - ManufactureDate = x.ManufactureDate, - ExpirationDate = x.ExpirationDate, - CompanyCode = x.CompanyCode, + //Lot = x.Lot, + //ManufactureDate = x.ManufactureDate, + //ExpirationDate = x.ExpirationDate, + //CompanyCode = x.CompanyCode, SupplierCode = x.SupplierCode, TaskQty = x.TaskQty, Qty = x.Qty, diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs index a126026..364671b 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventorySearcher.cs @@ -16,6 +16,8 @@ namespace HHWMS.Web public String ZoneCode { get; set; } [Display(Name = "Inventory.LocationCode")] public String LocationCode { get; set; } + [Display(Name = "Inventory.UniqueCode")] + public String UniqueCode { get; set; } [Display(Name = "Inventory.MaterialCode")] public String MaterialCode { get; set; } [Display(Name = "Inventory.MaterialType")] diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml index 5e68769..936585a 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml @@ -1,10 +1,11 @@ -@model HHWMS.Web.InventoryListVM +@model HHWMS.Web.InventoryListVM @inject IStringLocalizer Localizer; - + +@* @@ -13,7 +14,7 @@ - + *@ diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index a9b99f3..25ab6a3 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -130,13 +130,25 @@ namespace HHWMS.Web.Controllers [ActionDescription("Sys.Create")] public ActionResult CreateDetails(ReceiptDetailVM vm) { - var materialCodeList = vm.Entity.MaterialCode.Split("\n"); + var plList = vm.Entity.MaterialCode.Split("\n"); + var slList = vm.Entity.Lot.Split("\n"); var detailList = new List(); - foreach(var item in materialCodeList) + foreach(var item in plList) { detailList.Add(new ReceiptDetail { - MaterialCode = item, + UniqueCode = item, + MaterialType = "PL", + ReceiptHeaderId = vm.Entity.ReceiptHeaderId + }); + } + + foreach (var item in slList) + { + detailList.Add(new ReceiptDetail + { + UniqueCode = item, + MaterialType = "SL", ReceiptHeaderId = vm.Entity.ReceiptHeaderId }); } diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs index dea58c5..963e0bd 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs @@ -49,6 +49,8 @@ namespace HHWMS.Web.Controllers public ActionResult Create() { var vm = Wtm.CreateVM(); + vm.Entity.Code = _unitwork.GetSerialNumber("R"); + vm.Entity.AppointmentTime = DateTime.Now; return PartialView(vm); } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs index aea9d8b..21b9955 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs @@ -54,6 +54,7 @@ namespace HHWMS.Web var query = DC.Set() .CheckEqual(Searcher.ReceiptHeaderId, x => x.ReceiptHeaderId) .CheckContain(Searcher.ZoneCode, x => x.ZoneCode) + .CheckContain(Searcher.UniqueCode, x => x.UniqueCode) .CheckContain(Searcher.MaterialCode, x => x.MaterialCode) .CheckContain(Searcher.MaterialType, x => x.MaterialType) .CheckContain(Searcher.MaterialName, x => x.MaterialName) @@ -68,6 +69,7 @@ namespace HHWMS.Web ID = x.ID, Code_view = x.ReceiptHeader.Code, ZoneCode = x.ZoneCode, + UniqueCode = x.UniqueCode, MaterialCode = x.MaterialCode, MaterialType = x.MaterialType, MaterialName = x.MaterialName, diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs index c517244..508659d 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs @@ -13,7 +13,6 @@ namespace HHWMS.Web { return new List { - //this.MakeStandardAction("ReceiptDetail", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"receipt", dialogWidth: 800), this.MakeAction("ReceiptDetail","Create2",Localizer["Sys.Create"],Localizer["Sys.Create"],GridActionParameterTypesEnum.NoId,"receipt").SetOnClickScript("CreateDetail"), this.MakeAction("ReceiptDetail","CreateDetail",Localizer["Sys.CreateDetails"],Localizer["Sys.CreateDetails"],GridActionParameterTypesEnum.NoId,"receipt").SetOnClickScript("CreateDetails"), @@ -31,22 +30,23 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { var result = new List>{ - this.MakeGridHeader(x => x.Code_view), - this.MakeGridHeader(x => x.ZoneCode), + //this.MakeGridHeader(x => x.Code_view), + //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.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.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.CompletedQty), this.MakeGridHeader(x => x.Qty), - this.MakeGridHeader(x => x.InventoryStatus), + //this.MakeGridHeader(x => x.InventoryStatus), this.MakeGridHeader(x => x.Status) }; @@ -66,6 +66,7 @@ namespace HHWMS.Web ID = x.ID, Code_view = x.ReceiptHeader.Code, ZoneCode = x.ZoneCode, + UniqueCode = x.UniqueCode, MaterialCode = x.MaterialCode, MaterialType = x.MaterialType, MaterialName = x.MaterialName, diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailSearcher.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailSearcher.cs index 99fa2b4..416066f 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailSearcher.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailSearcher.cs @@ -16,6 +16,9 @@ namespace HHWMS.Web [Display(Name = "Task.ZoneCode")] public String ZoneCode { get; set; } + [Display(Name = "Inventory.UniqueCode")] + public String UniqueCode { get; set; } + [Display(Name = "Inventory.MaterialCode")] public String MaterialCode { get; set; } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs index 5121719..5baed7d 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs @@ -32,19 +32,19 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { return new List>{ - this.MakeGridHeader(x => x.SourceCode), + //this.MakeGridHeader(x => x.SourceCode), this.MakeGridHeader(x => x.Code).SetFormat((a,b) => { string rv = UIService.MakeScriptButton(ButtonTypesEnum.Link,a.Code,$"details('{a.ID}')"); return rv; }), this.MakeGridHeader(x => x.BillType), - this.MakeGridHeader(x => x.CompanyCode), - this.MakeGridHeader(x => x.SupplierCode), - this.MakeGridHeader(x => x.TotalQty), - this.MakeGridHeader(x => x.TotalLines), + //this.MakeGridHeader(x => x.CompanyCode), + //this.MakeGridHeader(x => x.SupplierCode), + //this.MakeGridHeader(x => x.TotalQty), + //this.MakeGridHeader(x => x.TotalLines), this.MakeGridHeader(x => x.FirstStatus), - this.MakeGridHeader(x => x.LastStatus), + //this.MakeGridHeader(x => x.LastStatus), this.MakeGridHeader(x => x.AppointmentTime), this.MakeGridHeader(x => x.Remark), this.MakeGridHeaderAction(width: 200) diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml index b9b674d..65bdc81 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml @@ -3,7 +3,8 @@ - + + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml index 17bfe50..326f04e 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml @@ -1,17 +1,17 @@ -@model HHWMS.Web.ReceiptHeaderVM +@model HHWMS.Web.ReceiptHeaderVM @inject IStringLocalizer Localizer; - +@* *@ - +@* - + *@ diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Details.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Details.cshtml index f3df793..9cf026b 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Details.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Details.cshtml @@ -3,17 +3,17 @@ - +@* *@ - +@* - + *@ - +@* *@ diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml index ebf7bbd..3262bfd 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/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 d6bb10f..895be16 100644 --- a/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailController.cs +++ b/HHWMS.Web/Areas/TaskManage/Controllers/TaskDetailController.cs @@ -1,10 +1,11 @@ -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; namespace HHWMS.Web.Controllers { @@ -224,5 +225,42 @@ namespace HHWMS.Web.Controllers } #endregion + #region 任务取消 + [ActionDescription("TaskHeader.Cancel")] + public ActionResult Cancel(string id) + { + var task = _unitwork.FindById(int.Parse(id)); + // 判断任务 是否能取消 + if (task.Status < TaskStatusEnum.已下发) + { + return FFResult().Alert($"此任务未下发,无需取消!"); + } + if (task != null) + { + var taskInfo = new TaskInfo + { + TaskId = $"{task.TaskHeader.TaskNo}-{task.FromLocation}", + TaskType = 99, + }; + var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data; + try + { + if ((bool)res?.Success) + { + // 删除任务,处理数据 + } + else + { + return FFResult().Alert($"操作失败,{res.Msg}"); + } + } + catch (Exception ex) + { + return FFResult().Alert($"操作失败,{ex.Message}"); + } + } + return FFResult().Message("任务取消成功").RefreshGrid(); + } + #endregion 任务取消 } } diff --git a/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderController.cs b/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderController.cs index c5c7ee6..b794a43 100644 --- a/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderController.cs +++ b/HHWMS.Web/Areas/TaskManage/Controllers/TaskHeaderController.cs @@ -324,7 +324,44 @@ namespace HHWMS.Web.Controllers }*/ return FFResult().RefreshGrid(); } - #endregion 任务下发 + + #region 任务取消 + [ActionDescription("TaskHeader.Cancel")] + public ActionResult Cancel(string id) + { + var task = _unitwork.FindById(int.Parse(id)); + + if (task != null) { + if(task.Status < TaskStatusEnum.已下发) + { + return FFResult().Alert($"此任务未下发,无需取消!"); + } + // 判断任务 是否能取消 + if (task.TaskType.Equals(TaskTypeEnum.盘料入库) || task.TaskType.Equals(TaskTypeEnum.盘料出库)) + { + return FFResult().Alert($"{task.TaskType}类型任务需要从子任务取消!"); + } + var taskInfo = new TaskInfo + { + TaskId = task.TaskNo, + TaskType = 99, + }; + var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data; + try + { + if ((bool)res?.Success) + { + // 删除任务,处理数据 + } + } + catch (Exception ex) + { + return FFResult().Alert($"操作失败,{ex.Message}"); + } + } + return FFResult().Message("任务取消成功").RefreshGrid(); + } + #endregion 任务取消 } } diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs index 3156d2c..4a6d040 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs @@ -24,6 +24,7 @@ namespace HHWMS.Web { return new List { + this.MakeAction("TaskHeader","Cancel",Localizer["TaskHeader.Cancel"],Localizer["TaskHeader.Cancel"],GridActionParameterTypesEnum.SingleId,"taskManage"), this.MakeStandardAction("TaskHeader", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"taskManage", dialogWidth: 800), this.MakeStandardAction("TaskHeader", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "taskManage", dialogWidth: 800), this.MakeStandardAction("TaskHeader", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "taskManage", dialogWidth: 800), diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index ff4ea95..eab540c 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1008,6 +1008,9 @@ 执行 + + 取消 + 状态