diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index c125329..7dbc6bb 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -1,7 +1,9 @@ using System.Collections.Generic; +using System.Linq; using AutoMapper; using HHWMS.Web.Models; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using WalkingTec.Mvvm.Core; namespace HHWMS.Web @@ -32,15 +34,46 @@ namespace HHWMS.Web [HttpPost] public IActionResult RequestIn(WcsRequest request) { - var inv = new List(); - for (int i = 0; i < 10; i++) - inv.Add(new Inventory - { - ContainerCode = "test" + i - }); + //var inv = new List(); + //for (int i = 0; i < 10; i++) + // inv.Add(new Inventory + // { + // ContainerCode = "test" + i + // }); //_unitwork.BatchAdd(inv); - _unitwork.DeleteById(1441); + //_unitwork.DeleteById(1441); //_unitwork.BatchUpdate(x => x.ID > 1030, x=>new Inventory { Batch = "test"}); + + // 测试 删除数据 保存到历史表 主子表数据 + /*var receipt = _unitwork.Find(x => x.ID == 3) + .FirstOrDefault(); + + var details = _unitwork.Find(x => x.HeaderId == 3) + .ToArray(); + var his = _mapper.Map(receipt); + var his2 = _mapper.Map>(details); + _unitwork.Add(his); + _unitwork.BatchAdd(his2);*/ + + /*var receipt = _unitwork.Find(x => x.ID == 3) + .FirstOrDefault(); + + var details = _unitwork.Find(x => x.HeaderId == 3) + .ToArray(); + var his = _mapper.Map(receipt); + var his2 = _mapper.Map>(details); + _unitwork.Add(his); + _unitwork.BatchAdd(his2);*/ + + var receipt = _unitwork.Find(x => 1==1) + .FirstOrDefault(); + + var details = _unitwork.Find(x => x.HeaderId == receipt.ID) + .ToArray(); + var his = _mapper.Map(receipt); + var his2 = _mapper.Map>(details); + _unitwork.Add(his); + _unitwork.BatchAdd(his2); return ApiResult(); } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index 226060f..4f7a0e0 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -55,7 +55,6 @@ namespace HHWMS.Web 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).SetHide(), this.MakeGridHeader(x => x.LocationCode), this.MakeGridHeader(x => x.MaterialCode), @@ -88,7 +87,6 @@ namespace HHWMS.Web { 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), @@ -111,7 +109,6 @@ 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) @@ -127,7 +124,6 @@ namespace HHWMS.Web { ID = x.ID, ZoneCode = x.ZoneCode, - UniqueCode = x.UniqueCode, ContainerCode = x.ContainerCode, LocationCode = x.LocationCode, MaterialCode = x.MaterialCode, diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index f719caa..6dd37c9 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -89,7 +89,7 @@ namespace HHWMS.Web.Controllers public ActionResult Create2(int id) { var vm = Wtm.CreateVM(passInit: true); - vm.Entity.ReceiptHeaderId = id; + vm.Entity.HeaderId = id; vm.Entity.ReceiptHeader = new ReceiptHeader(); //vm.Entity.ReceiptHeader.Code = vm.DC.Set().Find(id).Code; return PartialView(vm); diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs index 892fe88..c96545a 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs @@ -234,47 +234,5 @@ namespace HHWMS.Web.Controllers } #endregion - #region 点数 - [ActionDescription("ReceiptHeader.Count")] - public ActionResult Count(string id) - { - var vm = Wtm.CreateVM(id); - return PartialView(vm); - } - - /// - /// 查所有新建的明细,已开始收货明细不允许点数 - /// - /// - /// - public ActionResult SelectReceiptDetailsByCode(int id) - { - var data = _unitwork.Find(x => x.ID == id) - .Include(x => x.ReceiptDetails).ToList(); - return JsonMore(data.FirstOrDefault().ReceiptDetails.Where(x => x.Status == ReceiptStatusEnum.新建)); - } - - /// - /// 修改明细的数量 - /// - /// - /// - /// - /// - public ActionResult CountCommit(string code, string uniqueCode, int qty) - { - var receiptDetail = _unitwork.FindSingle(x => x.UniqueCode.Equals(uniqueCode)); - if (receiptDetail != null) - { - receiptDetail.Qty = qty; - receiptDetail.UpdateTime = DateTime.Now; - receiptDetail.UpdateBy = Wtm.LoginUserInfo.ITCode; - _unitwork.Update(receiptDetail); - return JsonMore(null); - } - return JsonMore(null, 500, $"未找到唯一码{uniqueCode}的单据!"); - } - #endregion - } } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryImportVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryImportVM.cs index 9938924..05ed911 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryImportVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryImportVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -12,7 +12,7 @@ namespace HHWMS.Web { public partial class ReceiptDetailHistoryTemplateVM : BaseTemplateVM { - public ExcelPropety ReceiptHeaderHistory_Excel = ExcelPropety.CreateProperty(x => x.ReceiptHeaderHistoryId); + public ExcelPropety ReceiptHeaderHistory_Excel = ExcelPropety.CreateProperty(x => x.HeaderId); [Display(Name = "Task.ZoneCode")] public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty(x => x.ZoneCode); [Display(Name = "Inventory.MaterialCode")] diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs index dfac10c..e16e8ae 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs @@ -56,7 +56,7 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() - .CheckEqual(Searcher.ReceiptHeaderHistoryId, x=>x.ReceiptHeaderHistoryId) + .CheckEqual(Searcher.HeaderId, x=>x.HeaderId) .CheckContain(Searcher.ZoneCode, x=>x.ZoneCode) .CheckContain(Searcher.MaterialCode, x=>x.MaterialCode) .CheckContain(Searcher.MaterialType, x=>x.MaterialType) @@ -71,7 +71,7 @@ namespace HHWMS.Web .Select(x => new ReceiptDetailHistory_View { ID = x.ID, - Code_view = x.ReceiptHeaderHistory.Code, + HeaderId = x.HeaderId, ZoneCode = x.ZoneCode, MaterialCode = x.MaterialCode, MaterialType = x.MaterialType, diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistorySearcher.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistorySearcher.cs index 60abcc9..667a277 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistorySearcher.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistorySearcher.cs @@ -14,7 +14,7 @@ namespace HHWMS.Web { public List AllReceiptHeaderHistorys { get; set; } [Display(Name = "Inventory.ReceiptCode")] - public int? ReceiptHeaderHistoryId { get; set; } + public int? HeaderId { get; set; } [Display(Name = "Task.ZoneCode")] public String ZoneCode { get; set; } [Display(Name = "Inventory.MaterialCode")] diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryVM.cs index 4a2a5cb..ccded2d 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -16,7 +16,6 @@ namespace HHWMS.Web public ReceiptDetailHistoryVM() { - SetInclude(x => x.ReceiptHeaderHistory); } protected override void InitVM() diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailImportVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailImportVM.cs index 03e630c..5bd9306 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailImportVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailImportVM.cs @@ -7,7 +7,7 @@ namespace HHWMS.Web { public partial class ReceiptDetailTemplateVM : BaseTemplateVM { - public ExcelPropety ReceiptHeader_Excel = ExcelPropety.CreateProperty(x => x.ReceiptHeaderId); + public ExcelPropety ReceiptHeader_Excel = ExcelPropety.CreateProperty(x => x.HeaderId); [Display(Name = "Task.ZoneCode")] public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty(x => x.ZoneCode); diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs index 21b9955..e196665 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM.cs @@ -52,9 +52,8 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() - .CheckEqual(Searcher.ReceiptHeaderId, x => x.ReceiptHeaderId) + .CheckEqual(Searcher.HeaderId, x => x.HeaderId) .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) @@ -69,7 +68,6 @@ 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 11e0fe0..14ab660 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs @@ -32,7 +32,6 @@ namespace HHWMS.Web var result = new List>{ //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), @@ -60,13 +59,12 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() - .Where(x => x.ReceiptHeaderId == Searcher.ReceiptHeaderId) + .Where(x => x.HeaderId == Searcher.HeaderId) .Select(x => new ReceiptDetail_View { 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 416066f..b231e7c 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailSearcher.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailSearcher.cs @@ -11,14 +11,11 @@ namespace HHWMS.Web { public List AllReceiptHeaders { get; set; } [Display(Name = "Inventory.ReceiptCode")] - public int? ReceiptHeaderId { get; set; } + public int? HeaderId { get; set; } [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/ReceiptHeaderVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs index 7abbea1..55d95e5 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs @@ -16,7 +16,7 @@ namespace HHWMS.Web protected override void InitVM() { Details.CopyContext(this); - Details.Searcher.ReceiptHeaderId = Entity.ID; + Details.Searcher.HeaderId = Entity.ID; var CurrentCulture = Wtm.CurrentCulture; var dictDatas = DC.Set().ToList(); diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create.cshtml index c51228d..e36b3ab 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ReceiptDetailVM +@model HHWMS.Web.ReceiptDetailVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create2.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create2.cshtml index f259985..799eba5 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create2.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create2.cshtml @@ -20,7 +20,7 @@ - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml index 65bdc81..ef9b1a6 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml @@ -6,7 +6,7 @@ - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Edit.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Edit.cshtml index 7fcea50..80b8dd1 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Edit.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Edit.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ReceiptDetailVM +@model HHWMS.Web.ReceiptDetailVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Index.cshtml index 0c6d28f..b36f28a 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Index.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ReceiptDetailListVM +@model HHWMS.Web.ReceiptDetailListVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Create.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Create.cshtml index ced5236..996f7ee 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Create.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Create.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ReceiptDetailHistoryVM +@model HHWMS.Web.ReceiptDetailHistoryVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Delete.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Delete.cshtml index 89f537f..028663e 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Delete.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Delete.cshtml @@ -1,10 +1,10 @@ -@model HHWMS.Web.ReceiptDetailHistoryVM +@model HHWMS.Web.ReceiptDetailHistoryVM @inject IStringLocalizer Localizer; @Localizer["Sys.DeleteConfirm"] - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Details.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Details.cshtml index f3a56ac..5f60cfb 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Details.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Details.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ReceiptDetailHistoryVM +@model HHWMS.Web.ReceiptDetailHistoryVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Edit.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Edit.cshtml index 622579a..7b7cfc1 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Edit.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Edit.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ReceiptDetailHistoryVM +@model HHWMS.Web.ReceiptDetailHistoryVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Index.cshtml index 27a19fd..5f050d0 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetailHistory/Index.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ReceiptDetailHistoryListVM +@model HHWMS.Web.ReceiptDetailHistoryListVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml index 307b68c..0d82de4 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml @@ -17,7 +17,7 @@ var headerId = 0; function details(id) { headerId = id; - layui.table.reload('ReceiptDetail', { where: { "Searcher.ReceiptHeaderId": id } }); + layui.table.reload('ReceiptDetail', { where: { "Searcher.HeaderId": id } }); } function CreateDetail() { diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs index d5f8cdd..c54fd20 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs @@ -66,32 +66,6 @@ namespace HHWMS.Web.Controllers } else { - if (string.IsNullOrEmpty(vm.Entity.UniqueCode)) - { - return FFResult().Alert($"唯一码不能为空!"); - } - var header = _unitwork.FindSingle(x => x.ID == vm.Entity.ShipmentHeaderId); - if (header != null && header.FirstStatus != ShipStatusEnum.新建) - { - return FFResult().Alert($"非新建状态的出库单,无法新建明细!"); - } - var inv = _unitwork.FindSingle(x => x.UniqueCode == vm.Entity.UniqueCode - && x.TaskStatus != InventoryTaskStatus.任务中); - if(inv == null) - { - return FFResult().Alert($"{vm.Entity.UniqueCode}不存在或已有任务,检查后重新添加!"); - } - if(_unitwork.IsExit(x => x.UniqueCode == vm.Entity.UniqueCode)) - { - return FFResult().Alert($"{vm.Entity.UniqueCode}已在出库单内,请勿重复添加!"); - } - vm.Entity.MaterialCode = inv.MaterialCode; - vm.Entity.MaterialName = inv.MaterialName; - vm.Entity.MaterialSpec = inv.MaterialSpec; - vm.Entity.MaterialUnit = inv.MaterialUnit; - vm.Entity.MaterialType = inv.MaterialType; - vm.Entity.Batch = inv.Batch; - vm.Entity.Qty = inv.Qty; vm.Entity.Status = ShipStatusEnum.新建; vm.DoAdd(); if (!ModelState.IsValid) diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs index a905d3d..73e3474 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs @@ -231,82 +231,7 @@ namespace HHWMS.Web.Controllers return vm.GetExportData(); } #endregion - - /// - /// 库位分析 - /// - /// - /// - [ActionDescription("ShipmentHeader.Analyse")] - public ActionResult Analyse(string id) - { - var vm = Wtm.CreateVM(id); - return PartialView(vm); - } - - /// - /// 返回分析数据 - /// - /// - /// - [ActionDescription("ShipmentHeader.Analyse")] - [HttpPost] - public ActionResult AnalyseData(int id) - { - var data = _unitwork.Find(x => x.ID == id) - .Include(x => x.ShipmentDetails).ToList(); - var details = data.FirstOrDefault().ShipmentDetails.Where(x => x.Status < ShipStatusEnum.分配完成); - foreach (var item in details) - { - var invQty = _unitwork.FindSingle(x => - x.UniqueCode.Equals(item.UniqueCode) - && x.TaskStatus == InventoryTaskStatus.无任务); - item.InventoryStatus = invQty != null ? "满足" : "不足"; - } - return JsonMore(details); - } - - [ActionDescription("ShipmentHeader.ShelfInv")] - public ActionResult ShelfInv(string id) - { - var vm = Wtm.CreateVM(id); - return PartialView(vm); - } - - /// - /// 货架库存 - /// - /// - /// - [ActionDescription("ShipmentHeader.ShelfInv")] - public ActionResult ShelfInvData(int id) - { - var data = _unitwork.Find(x => x.ID == id) - .Include(x => x.ShipmentDetails) - .FirstOrDefault(); - var details = data.ShipmentDetails.Where(x => x.Status < ShipStatusEnum.分配完成) - .Select(x => x.UniqueCode) - .ToList(); - - var invList = _unitwork.Find(x => x.ZoneCode.Equals(ZoneCodeEnum.货架库) - && x.TaskStatus.Equals(InventoryTaskStatus.无任务) - && details.Contains(x.UniqueCode)) - .ToList(); - //var details = data.ShipmentDetails.Where(x => invList.Contains(x.UniqueCode)); - return JsonMore(invList); - } - - /// - /// 获取库存数据 - /// - /// - /// - [HttpPost] - public ActionResult GetInvData(string uniqueCode) - { - var data = _unitwork.Find(x => x.UniqueCode == uniqueCode).ToList(); - return JsonMore(data); - } + /// /// 启动出库 diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryImportVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryImportVM.cs index 89d5e19..eff0b3e 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryImportVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryImportVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -12,7 +12,7 @@ namespace HHWMS.Web { public partial class ShipmentDetailHistoryTemplateVM : BaseTemplateVM { - public ExcelPropety ShipmentHeaderHistory_Excel = ExcelPropety.CreateProperty(x => x.ShipmentHeaderHistoryId); + public ExcelPropety ShipmentHeaderHistory_Excel = ExcelPropety.CreateProperty(x => x.HeaderId); [Display(Name = "Task.ZoneCode")] public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty(x => x.ZoneCode); [Display(Name = "Inventory.MaterialCode")] diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs index 0676e18..3274036 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -32,7 +32,7 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { return new List>{ - this.MakeGridHeader(x => x.Code_view), + this.MakeGridHeader(x => x.HeaderId), this.MakeGridHeader(x => x.ZoneCode), this.MakeGridHeader(x => x.MaterialCode), this.MakeGridHeader(x => x.MaterialType), @@ -57,7 +57,7 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() - .CheckEqual(Searcher.ShipmentHeaderHistoryId, x=>x.ShipmentHeaderHistoryId) + .CheckEqual(Searcher.ShipmentHeaderHistoryId, x=>x.HeaderId) .CheckContain(Searcher.ZoneCode, x=>x.ZoneCode) .CheckContain(Searcher.MaterialCode, x=>x.MaterialCode) .CheckContain(Searcher.MaterialType, x=>x.MaterialType) @@ -72,7 +72,7 @@ namespace HHWMS.Web .Select(x => new ShipmentDetailHistory_View { ID = x.ID, - Code_view = x.ShipmentHeaderHistory.Code, + HeaderId = x.HeaderId, ZoneCode = x.ZoneCode, MaterialCode = x.MaterialCode, MaterialType = x.MaterialType, @@ -98,8 +98,6 @@ namespace HHWMS.Web } public class ShipmentDetailHistory_View : ShipmentDetailHistory{ - [Display(Name = "Inventory.ShipCode")] - public String Code_view { get; set; } } } diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryVM.cs index e6ace9e..ae9fe48 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -16,7 +16,6 @@ namespace HHWMS.Web public ShipmentDetailHistoryVM() { - SetInclude(x => x.ShipmentHeaderHistory); } protected override void InitVM() diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailImportVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailImportVM.cs index 24575e2..4b7eb17 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailImportVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailImportVM.cs @@ -7,7 +7,7 @@ namespace HHWMS.Web { public partial class ShipmentDetailTemplateVM : BaseTemplateVM { - public ExcelPropety ShipmentHeader_Excel = ExcelPropety.CreateProperty(x => x.ShipmentHeaderId); + public ExcelPropety ShipmentHeader_Excel = ExcelPropety.CreateProperty(x => x.HeaderId); [Display(Name = "Task.ZoneCode")] public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty(x => x.ZoneCode); diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs index 08c1040..3d25241 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs @@ -41,7 +41,6 @@ namespace HHWMS.Web if (SearcherMode == ListVMSearchModeEnum.MasterDetail) { return new List>{ - this.MakeGridHeader(x => x.UniqueCode).SetWidth(220), this.MakeGridHeader(x => x.MaterialCode), this.MakeGridHeader(x => x.Batch), this.MakeGridHeader(x => x.Qty), @@ -51,7 +50,6 @@ namespace HHWMS.Web else if (SearcherMode == ListVMSearchModeEnum.Custom1) { return new List>{ - this.MakeGridHeader(x => x.UniqueCode).SetWidth(220), this.MakeGridHeader(x => x.MaterialCode), this.MakeGridHeader(x => x.Batch), this.MakeGridHeader(x => x.Qty), @@ -87,31 +85,24 @@ namespace HHWMS.Web InitVM(); if (SearcherMode == ListVMSearchModeEnum.Custom1) { var tt = DC.Set() - .CheckEqual(Searcher.ShipmentHeaderId, x => x.ShipmentHeaderId) + .CheckEqual(Searcher.HeaderId, x => x.HeaderId) .Select(x => new ShipmentDetail_View { ID = x.ID, - UniqueCode = x.UniqueCode, MaterialCode = x.MaterialCode, Batch = x.Batch, Qty = x.Qty, InventoryStatus = x.InventoryStatus, Status = x.Status }).ToList(); - foreach(var item in tt.Where(x => x.Status < ShipStatusEnum.分配完成)) - { - var invQty = _unitWork.Find(x => x.UniqueCode.Equals(item.UniqueCode)) - .Sum(x => x.Qty); - item.InventoryStatus = invQty >= (item.Qty - item.DividedQty) ? "true" : "false"; - } + return (IOrderedQueryable)tt.OrderBy(x => x.ID); } else { var query = DC.Set() - .CheckEqual(Searcher.ShipmentHeaderId, x => x.ShipmentHeaderId) + .CheckEqual(Searcher.HeaderId, x => x.HeaderId) .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) @@ -125,7 +116,6 @@ namespace HHWMS.Web { ID = x.ID, Code_view = x.ShipmentHeader.Code, - UniqueCode = x.UniqueCode, ZoneCode = x.ZoneCode, MaterialCode = x.MaterialCode, MaterialType = x.MaterialType, diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailSearcher.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailSearcher.cs index 8be5ea3..d6e6d66 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailSearcher.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailSearcher.cs @@ -12,7 +12,7 @@ namespace HHWMS.Web public List AllShipmentHeaders { get; set; } [Display(Name = "Inventory.ShipCode")] - public int? ShipmentHeaderId { get; set; } + public int? HeaderId { get; set; } [Display(Name = "Task.ZoneCode")] public String ZoneCode { get; set; } diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs index aa054d2..43c7c81 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs @@ -21,7 +21,7 @@ namespace HHWMS.Web protected override void InitVM() { Details.CopyContext(this); - Details.Searcher.ShipmentHeaderId = Entity.ID; + Details.Searcher.HeaderId = Entity.ID; var CurrentCulture = Wtm.CurrentCulture; var dictDatas = DC.Set().ToList(); diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Create.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Create.cshtml index bf6535d..585bbe8 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Create.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Create.cshtml @@ -3,8 +3,7 @@ - - + @* diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Edit.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Edit.cshtml index 27ed61b..201fa16 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Edit.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Edit.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ShipmentDetailVM +@model HHWMS.Web.ShipmentDetailVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml index b037f2f..963fd19 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml @@ -3,7 +3,7 @@ - + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Create.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Create.cshtml index 33dc7e1..9f90916 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Create.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Create.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ShipmentDetailHistoryVM +@model HHWMS.Web.ShipmentDetailHistoryVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Delete.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Delete.cshtml index 617ae63..888c01b 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Delete.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Delete.cshtml @@ -1,10 +1,10 @@ -@model HHWMS.Web.ShipmentDetailHistoryVM +@model HHWMS.Web.ShipmentDetailHistoryVM @inject IStringLocalizer Localizer; @Localizer["Sys.DeleteConfirm"] - + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Details.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Details.cshtml index 45f811f..f11716e 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Details.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Details.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ShipmentDetailHistoryVM +@model HHWMS.Web.ShipmentDetailHistoryVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Edit.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Edit.cshtml index 4a9ee99..3688c7e 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Edit.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetailHistory/Edit.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.ShipmentDetailHistoryVM +@model HHWMS.Web.ShipmentDetailHistoryVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs deleted file mode 100644 index 441911e..0000000 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; -using HHWMS.Web.Models; -using Microsoft.EntityFrameworkCore; -using Newtonsoft.Json; -using Quartz; -using WalkingTec.Mvvm.Core; -using WalkingTec.Mvvm.Core.Support.Quartz; - -namespace HHWMS.Web -{ - //[QuartzRepeat(10,10, true, 30)] - [PersistJobDataAfterExecution] - [DisallowConcurrentExecution] - public class SendWcsJob : WtmJob - { - public override Task Execute(IJobExecutionContext context) - { - try - { - var _unitwork = new UnitWork(Wtm); - - #region 更新时间 - - var job = _unitwork.FindSingle(x => x.JobName == context.JobDetail.Key.Name); - if (job != null) - { - job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.FireTimeUtc.DateTime, TimeZoneInfo.Local); - // 只执行一次 没有下次执行时间 - if (context.NextFireTimeUtc != null) - { - job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local); - } - _unitwork.Update(job); - } - Wtm.DoLog("任务下发", ActionLogTypesEnum.Job, "SendWcsJob"); - #endregion 更新时间 - } - catch { } - return Task.CompletedTask; - } - } -} diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs deleted file mode 100644 index ac60ed6..0000000 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Threading.Tasks; -using HHWMS.Web.Models; -using Quartz; -using WalkingTec.Mvvm.Core; -using WalkingTec.Mvvm.Core.Support.Quartz; - -namespace HHWMS.Web -{ - //[QuartzRepeat(10,10, true, 30)] - //出库单据分解,为每个出库物料创建出库明细,状态为新建,通过唯一码绑定任务与库存 - [PersistJobDataAfterExecution] - [DisallowConcurrentExecution] - public class SendWmsJob : WtmJob - { - public override Task Execute(IJobExecutionContext context) - { - try - { - var _unitwork = new UnitWork(Wtm); - - #region 更新时间 - - var job = _unitwork.FindSingle(x => x.JobName == context.JobDetail.Key.Name); - if (job != null) - { - job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.FireTimeUtc.DateTime, TimeZoneInfo.Local); - // 只执行一次 没有下次执行时间 - if (context.NextFireTimeUtc != null) - { - job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local); - } - _unitwork.Update(job); - } - Wtm.DoLog("出库分解", ActionLogTypesEnum.Job, "SendWmsJob"); - - #endregion 更新时间 - } - catch { } - return Task.CompletedTask; - } - } -} diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs index aadb2b9..41fb7e8 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs @@ -42,7 +42,9 @@ namespace HHWMS.Web } #endregion } - catch { } + catch(Exception ex) { + Wtm.DoLog("测试", ActionLogTypesEnum.Job, "TestJob", request:"error", result:ex.Message); + } return Task.CompletedTask; } } diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryImportVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryImportVM.cs index 1119bbd..7788208 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryImportVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryImportVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -12,7 +12,7 @@ namespace HHWMS.Web { public partial class TaskDetailHistoryTemplateVM : BaseTemplateVM { - public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty(x => x.TaskHeaderId); + public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty(x => x.HeaderId); [Display(Name = "Inventory.ReceiptCode")] public ExcelPropety OrderCode_Excel = ExcelPropety.CreateProperty(x => x.OrderCode); [Display(Name = "Inventory.ReceiptDetailId")] diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryListVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryListVM.cs index ae04956..73f7769 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryListVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryListVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -32,7 +32,7 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { return new List>{ - this.MakeGridHeader(x => x.TaskNo_view), + this.MakeGridHeader(x => x.HeaderId), this.MakeGridHeader(x => x.OrderCode), this.MakeGridHeader(x => x.OrderDetailId), this.MakeGridHeader(x => x.MaterialCode), @@ -52,7 +52,7 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() - .CheckEqual(Searcher.TaskHeaderId, x=>x.TaskHeaderId) + .CheckEqual(Searcher.TaskHeaderId, x=>x.HeaderId) .CheckContain(Searcher.MaterialCode, x=>x.MaterialCode) .CheckContain(Searcher.MaterialName, x=>x.MaterialName) .CheckContain(Searcher.MaterialSpec, x=>x.MaterialSpec) @@ -63,7 +63,7 @@ namespace HHWMS.Web .Select(x => new TaskDetailHistory_View { ID = x.ID, - TaskNo_view = x.TaskHeader.TaskNo, + HeaderId = x.HeaderId, OrderCode = x.OrderCode, OrderDetailId = x.OrderDetailId, MaterialCode = x.MaterialCode, @@ -84,8 +84,6 @@ namespace HHWMS.Web } public class TaskDetailHistory_View : TaskDetailHistory{ - [Display(Name = "Task.TaskNo")] - public String TaskNo_view { get; set; } } } diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryVM.cs index b819f7f..0e24f9c 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailHistoryVMs/TaskDetailHistoryVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -16,7 +16,6 @@ namespace HHWMS.Web public TaskDetailHistoryVM() { - SetInclude(x => x.TaskHeader); } protected override void InitVM() diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailImportVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailImportVM.cs index 5e0c36d..d8ad5ed 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailImportVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailImportVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -12,13 +12,11 @@ namespace HHWMS.Web { public partial class TaskDetailTemplateVM : BaseTemplateVM { - public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty(x => x.TaskHeaderId); + public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty(x => x.HeaderId); [Display(Name = "Inventory.ReceiptCode")] public ExcelPropety OrderCode_Excel = ExcelPropety.CreateProperty(x => x.OrderCode); [Display(Name = "Inventory.ReceiptDetailId")] public ExcelPropety OrderDetailId_Excel = ExcelPropety.CreateProperty(x => x.OrderDetailId); - [Display(Name = "Inventory.UniqueCode")] - public ExcelPropety UniqueCode_Excel = ExcelPropety.CreateProperty(x => x.UniqueCode); [Display(Name = "Inventory.MaterialCode")] public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty(x => x.MaterialCode); [Display(Name = "Inventory.MaterialName")] diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs index 1ce8984..4ede4ab 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM.cs @@ -35,7 +35,6 @@ namespace HHWMS.Web 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(), @@ -55,7 +54,6 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() - .CheckContain(Searcher.UniqueCode, x=>x.UniqueCode) .CheckContain(Searcher.MaterialCode, x=>x.MaterialCode) .CheckContain(Searcher.FromLocation, x=>x.FromLocation) .CheckContain(Searcher.ToLocation, x=>x.ToLocation) @@ -65,7 +63,6 @@ namespace HHWMS.Web TaskNo_view = x.TaskHeader.TaskNo, OrderCode = x.OrderCode, OrderDetailId = x.OrderDetailId, - UniqueCode = x.UniqueCode, MaterialCode = x.MaterialCode, MaterialName = x.MaterialName, MaterialSpec = x.MaterialSpec, diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs index b522e3b..7aeef57 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs @@ -28,7 +28,6 @@ namespace HHWMS.Web 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(), @@ -47,14 +46,13 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() - .Where(x => x.TaskHeaderId == Searcher.TaskHeaderId) + .Where(x => x.HeaderId == Searcher.HeaderId) .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, diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailSearcher.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailSearcher.cs index c931c15..34b115d 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailSearcher.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailSearcher.cs @@ -16,7 +16,7 @@ namespace HHWMS.Web public String UniqueCode { get; set; } [Display(Name = "Task.TaskNo")] - public int? TaskHeaderId { get; set; } + public int? HeaderId { get; set; } [Display(Name = "Inventory.MaterialCode")] public String MaterialCode { get; set; } diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Create.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Create.cshtml index 3b44c91..44e1999 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Create.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Create.cshtml @@ -1,12 +1,11 @@ -@model HHWMS.Web.TaskDetailVM +@model HHWMS.Web.TaskDetailVM @inject IStringLocalizer Localizer; - + - diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Delete.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Delete.cshtml index d13d91c..841a0f3 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Delete.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Delete.cshtml @@ -1,4 +1,4 @@ -@model HHWMS.Web.TaskDetailVM +@model HHWMS.Web.TaskDetailVM @inject IStringLocalizer Localizer; @@ -7,7 +7,6 @@ - diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Details.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Details.cshtml index 9394bae..23fb730 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Details.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Details.cshtml @@ -1,4 +1,4 @@ -@model HHWMS.Web.TaskDetailVM +@model HHWMS.Web.TaskDetailVM @inject IStringLocalizer Localizer; @@ -6,7 +6,6 @@ - diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Edit.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Edit.cshtml index 6c3f46d..e7d19f9 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Edit.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetail/Edit.cshtml @@ -1,12 +1,11 @@ -@model HHWMS.Web.TaskDetailVM +@model HHWMS.Web.TaskDetailVM @inject IStringLocalizer Localizer; - + - diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Create.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Create.cshtml index feacc98..ec4ba74 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Create.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Create.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.TaskDetailHistoryVM +@model HHWMS.Web.TaskDetailHistoryVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Delete.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Delete.cshtml index febab5c..3f68222 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Delete.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Delete.cshtml @@ -1,10 +1,10 @@ -@model HHWMS.Web.TaskDetailHistoryVM +@model HHWMS.Web.TaskDetailHistoryVM @inject IStringLocalizer Localizer; @Localizer["Sys.DeleteConfirm"] - + diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Details.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Details.cshtml index 0b7a41f..0057524 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Details.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Details.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.TaskDetailHistoryVM +@model HHWMS.Web.TaskDetailHistoryVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Edit.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Edit.cshtml index 0556a2b..9c366fe 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Edit.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskDetailHistory/Edit.cshtml @@ -1,9 +1,9 @@ -@model HHWMS.Web.TaskDetailHistoryVM +@model HHWMS.Web.TaskDetailHistoryVM @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/_Admin/Controllers/InterfaceLogController.cs b/HHWMS.Web/Areas/_Admin/Controllers/InterfaceLogController.cs new file mode 100644 index 0000000..f5abd0d --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Controllers/InterfaceLogController.cs @@ -0,0 +1,79 @@ +// WTM默认页面 Wtm buidin page +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using HHWMS.Web; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; + +namespace WalkingTec.Mvvm.Mvc.Admin.Controllers +{ + [Area("_Admin")] + [ActionDescription("MenuKey.InterfaceLog")] + public class InterfaceLogController : BaseController + { + [ActionDescription("Sys.Search")] + public IActionResult Index() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [ActionDescription("Sys.Search")] + [HttpPost] + public string Search(InterfaceLogSearcher searcher) + { + var vm = Wtm.CreateVM(passInit:true); + if (ModelState.IsValid) + { + vm.Searcher = searcher; + return vm.GetJson(false); + } + else + { + return vm.GetError(); + } + } + + + [HttpGet] + [ActionDescription("Sys.Details")] + public IActionResult Details(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + [ActionDescription("Sys.Export")] + [HttpPost] + public IActionResult ExportExcel(InterfaceLogListVM vm) + { + return vm.GetExportData(); + } + + [HttpPost] + [ActionDescription("Sys.BatchDelete")] + public ActionResult BatchDelete(string[] IDs) + { + var vm = Wtm.CreateVM(Ids: IDs); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.BatchDelete")] + public ActionResult DoBatchDelete(InterfaceLogBatchVM vm, IFormCollection nouse) + { + if (!ModelState.IsValid || !vm.DoBatchDelete()) + { + return PartialView("BatchDelete", vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchDeleteSuccess", vm.Ids.Length]); + } + } + + } +} diff --git a/HHWMS.Web/Areas/_Admin/Controllers/JobLogController.cs b/HHWMS.Web/Areas/_Admin/Controllers/JobLogController.cs new file mode 100644 index 0000000..63d5144 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Controllers/JobLogController.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using HHWMS.Web; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; + +namespace WalkingTec.Mvvm.Mvc.Admin.Controllers +{ + [Area("_Admin")] + [ActionDescription("MenuKey.JobLog")] + public class JobLogController : BaseController + { + [ActionDescription("Sys.Search")] + public IActionResult Index() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [ActionDescription("Sys.Search")] + [HttpPost] + public string Search(JobLogSearcher searcher) + { + var vm = Wtm.CreateVM(passInit:true); + if (ModelState.IsValid) + { + vm.Searcher = searcher; + return vm.GetJson(false); + } + else + { + return vm.GetError(); + } + } + + + [HttpGet] + [ActionDescription("Sys.Details")] + public IActionResult Details(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + [ActionDescription("Sys.Export")] + [HttpPost] + public IActionResult ExportExcel(JobLogListVM vm) + { + return vm.GetExportData(); + } + + [HttpPost] + [ActionDescription("Sys.BatchDelete")] + public ActionResult BatchDelete(string[] IDs) + { + var vm = Wtm.CreateVM(Ids: IDs); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.BatchDelete")] + public ActionResult DoBatchDelete(JobLogBatchVM vm, IFormCollection nouse) + { + if (!ModelState.IsValid || !vm.DoBatchDelete()) + { + return PartialView("BatchDelete", vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchDeleteSuccess", vm.Ids.Length]); + } + } + + } +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs new file mode 100644 index 0000000..e17c78a --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs @@ -0,0 +1,35 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class InterfaceLogBatchVM : BaseBatchVM + { + public InterfaceLogBatchVM() + { + ListVM = new InterfaceLogListVM(); + LinkedVM = new InterfaceLog_BatchEdit(); + } + + } + + /// + /// Class to define batch edit fields + /// + public class InterfaceLog_BatchEdit : BaseVM + { + + protected override void InitVM() + { + } + + } + +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogImportVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogImportVM.cs new file mode 100644 index 0000000..3b615bc --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogImportVM.cs @@ -0,0 +1,27 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class InterfaceLogTemplateVM : BaseTemplateVM + { + + protected override void InitVM() + { + } + + } + + public class InterfaceLogImportVM : BaseImportVM + { + + } + +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogListVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogListVM.cs new file mode 100644 index 0000000..2662b55 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogListVM.cs @@ -0,0 +1,88 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class InterfaceLogListVM : BasePagedListVM + { + protected override List InitGridAction() + { + return new List + { + this.MakeStandardAction("InterfaceLog", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"_Admin", dialogWidth: 800), + this.MakeStandardAction("InterfaceLog", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("InterfaceLog", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("InterfaceLog", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("InterfaceLog", GridActionStandardTypesEnum.BatchEdit, Localizer["Sys.BatchEdit"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("InterfaceLog", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("InterfaceLog", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("InterfaceLog", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "_Admin"), + }; + } + + + protected override IEnumerable> InitGridHeader() + { + return new List>{ + this.MakeGridHeader(x => x.ModuleName), + this.MakeGridHeader(x => x.ActionName), + this.MakeGridHeader(x => x.ITCode), + this.MakeGridHeader(x => x.ActionUrl), + this.MakeGridHeader(x => x.ActionTime), + this.MakeGridHeader(x => x.Duration), + this.MakeGridHeader(x => x.Remark), + this.MakeGridHeader(x => x.IP), + this.MakeGridHeader(x => x.LogType), + this.MakeGridHeader(x => x.TenantCode), + this.MakeGridHeader(x => x.Request), + this.MakeGridHeader(x => x.Result), + this.MakeGridHeaderAction(width: 200) + }; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .CheckContain(Searcher.ModuleName, x=>x.ModuleName) + .CheckContain(Searcher.ActionName, x=>x.ActionName) + .CheckContain(Searcher.ITCode, x=>x.ITCode) + .CheckContain(Searcher.ActionUrl, x=>x.ActionUrl) + .CheckBetween(Searcher.ActionTime?.GetStartTime(), Searcher.ActionTime?.GetEndTime(), x => x.ActionTime, includeMax: false) + .CheckContain(Searcher.IP, x=>x.IP) + .CheckEqual(Searcher.LogType, x=>x.LogType) + .CheckContain(Searcher.Request, x=>x.Request) + .CheckContain(Searcher.Result, x=>x.Result) + .Select(x => new InterfaceLog_View + { + ID = x.ID, + ModuleName = x.ModuleName, + ActionName = x.ActionName, + ITCode = x.ITCode, + ActionUrl = x.ActionUrl, + ActionTime = x.ActionTime, + Duration = x.Duration, + Remark = x.Remark, + IP = x.IP, + LogType = x.LogType, + TenantCode = x.TenantCode, + Request = x.Request, + Result = x.Result, + }) + .OrderBy(x => x.ID); + return query; + } + + } + + public class InterfaceLog_View : InterfaceLog{ + + } +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogSearcher.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogSearcher.cs new file mode 100644 index 0000000..7c0cfa0 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogSearcher.cs @@ -0,0 +1,39 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class InterfaceLogSearcher : BaseSearcher + { + [Display(Name = "_Admin.Module")] + public String ModuleName { get; set; } + [Display(Name = "_Admin.Action")] + public String ActionName { get; set; } + [Display(Name = "_Admin.Account")] + public String ITCode { get; set; } + [Display(Name = "Url")] + public String ActionUrl { get; set; } + [Display(Name = "_Admin.ActionTime")] + public DateRange ActionTime { get; set; } + [Display(Name = "IP")] + public String IP { get; set; } + [Display(Name = "_Admin.LogType")] + public ActionLogTypesEnum? LogType { get; set; } + [Display(Name = "_Admin.Request")] + public String Request { get; set; } + [Display(Name = "_Admin.Response")] + public String Result { get; set; } + + protected override void InitVM() + { + } + + } +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogVM.cs new file mode 100644 index 0000000..efa7a1c --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogVM.cs @@ -0,0 +1,39 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class InterfaceLogVM : BaseCRUDVM + { + + public InterfaceLogVM() + { + } + + protected override void InitVM() + { + } + + public override void DoAdd() + { + base.DoAdd(); + } + + public override void DoEdit(bool updateAllFields = false) + { + base.DoEdit(updateAllFields); + } + + public override void DoDelete() + { + base.DoDelete(); + } + } +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogBatchVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogBatchVM.cs new file mode 100644 index 0000000..5f92a14 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogBatchVM.cs @@ -0,0 +1,35 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class JobLogBatchVM : BaseBatchVM + { + public JobLogBatchVM() + { + ListVM = new JobLogListVM(); + LinkedVM = new JobLog_BatchEdit(); + } + + } + + /// + /// Class to define batch edit fields + /// + public class JobLog_BatchEdit : BaseVM + { + + protected override void InitVM() + { + } + + } + +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogImportVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogImportVM.cs new file mode 100644 index 0000000..4a938ff --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogImportVM.cs @@ -0,0 +1,27 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class JobLogTemplateVM : BaseTemplateVM + { + + protected override void InitVM() + { + } + + } + + public class JobLogImportVM : BaseImportVM + { + + } + +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogListVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogListVM.cs new file mode 100644 index 0000000..84886c6 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogListVM.cs @@ -0,0 +1,84 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class JobLogListVM : BasePagedListVM + { + protected override List InitGridAction() + { + return new List + { + this.MakeStandardAction("JobLog", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"_Admin", dialogWidth: 800), + this.MakeStandardAction("JobLog", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("JobLog", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("JobLog", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("JobLog", GridActionStandardTypesEnum.BatchEdit, Localizer["Sys.BatchEdit"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("JobLog", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("JobLog", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "_Admin", dialogWidth: 800), + this.MakeStandardAction("JobLog", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "_Admin"), + }; + } + + + protected override IEnumerable> InitGridHeader() + { + return new List>{ + this.MakeGridHeader(x => x.ModuleName), + this.MakeGridHeader(x => x.ActionName), + this.MakeGridHeader(x => x.ITCode), + this.MakeGridHeader(x => x.ActionUrl), + this.MakeGridHeader(x => x.ActionTime), + this.MakeGridHeader(x => x.Duration), + this.MakeGridHeader(x => x.Remark), + this.MakeGridHeader(x => x.IP), + this.MakeGridHeader(x => x.LogType), + this.MakeGridHeader(x => x.TenantCode), + this.MakeGridHeader(x => x.Request), + this.MakeGridHeader(x => x.Result), + this.MakeGridHeaderAction(width: 200) + }; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .CheckContain(Searcher.ModuleName, x=>x.ModuleName) + .CheckContain(Searcher.ActionName, x=>x.ActionName) + .CheckContain(Searcher.ITCode, x=>x.ITCode) + .CheckContain(Searcher.ActionUrl, x=>x.ActionUrl) + .CheckBetween(Searcher.ActionTime?.GetStartTime(), Searcher.ActionTime?.GetEndTime(), x => x.ActionTime, includeMax: false) + .Select(x => new JobLog_View + { + ID = x.ID, + ModuleName = x.ModuleName, + ActionName = x.ActionName, + ITCode = x.ITCode, + ActionUrl = x.ActionUrl, + ActionTime = x.ActionTime, + Duration = x.Duration, + Remark = x.Remark, + IP = x.IP, + LogType = x.LogType, + TenantCode = x.TenantCode, + Request = x.Request, + Result = x.Result, + }) + .OrderBy(x => x.ID); + return query; + } + + } + + public class JobLog_View : JobLog{ + + } +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogSearcher.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogSearcher.cs new file mode 100644 index 0000000..b423961 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogSearcher.cs @@ -0,0 +1,31 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class JobLogSearcher : BaseSearcher + { + [Display(Name = "_Admin.Module")] + public String ModuleName { get; set; } + [Display(Name = "_Admin.Action")] + public String ActionName { get; set; } + [Display(Name = "_Admin.Account")] + public String ITCode { get; set; } + [Display(Name = "Url")] + public String ActionUrl { get; set; } + [Display(Name = "_Admin.ActionTime")] + public DateRange ActionTime { get; set; } + + protected override void InitVM() + { + } + + } +} diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogVM.cs new file mode 100644 index 0000000..b5115f8 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogVM.cs @@ -0,0 +1,39 @@ +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 WalkingTec.Mvvm.Core; + + +namespace HHWMS.Web +{ + public partial class JobLogVM : BaseCRUDVM + { + + public JobLogVM() + { + } + + protected override void InitVM() + { + } + + public override void DoAdd() + { + base.DoAdd(); + } + + public override void DoEdit(bool updateAllFields = false) + { + base.DoEdit(updateAllFields); + } + + public override void DoDelete() + { + base.DoDelete(); + } + } +} diff --git a/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/BatchDelete.cshtml b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/BatchDelete.cshtml new file mode 100644 index 0000000..0962e37 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/BatchDelete.cshtml @@ -0,0 +1,12 @@ +@model HHWMS.Web.InterfaceLogBatchVM +@inject IStringLocalizer Localizer; + + + @Localizer["Sys.BatchDeleteConfirm"] + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/BatchEdit.cshtml b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/BatchEdit.cshtml new file mode 100644 index 0000000..4461169 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/BatchEdit.cshtml @@ -0,0 +1,14 @@ +@model HHWMS.Web.InterfaceLogBatchVM +@inject IStringLocalizer Localizer; + + +
@Localizer["Sys.BatchEditConfirm"]
+ + + + + + + + +
diff --git a/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Create.cshtml b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Create.cshtml new file mode 100644 index 0000000..0461ccf --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Create.cshtml @@ -0,0 +1,11 @@ +@model HHWMS.Web.InterfaceLogVM +@inject IStringLocalizer Localizer; + + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Delete.cshtml b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Delete.cshtml new file mode 100644 index 0000000..e9a8762 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Delete.cshtml @@ -0,0 +1,13 @@ +@model HHWMS.Web.InterfaceLogVM +@inject IStringLocalizer Localizer; + + + @Localizer["Sys.DeleteConfirm"] + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Details.cshtml b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Details.cshtml new file mode 100644 index 0000000..63298f8 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Details.cshtml @@ -0,0 +1,10 @@ +@model HHWMS.Web.InterfaceLogVM +@inject IStringLocalizer Localizer; + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Edit.cshtml b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Edit.cshtml new file mode 100644 index 0000000..393d690 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Edit.cshtml @@ -0,0 +1,12 @@ +@model HHWMS.Web.InterfaceLogVM +@inject IStringLocalizer Localizer; + + + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Import.cshtml b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Import.cshtml new file mode 100644 index 0000000..9178281 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Import.cshtml @@ -0,0 +1,14 @@ +@model HHWMS.Web.InterfaceLogImportVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Index.cshtml b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Index.cshtml new file mode 100644 index 0000000..1ea9bb6 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/InterfaceLog/Index.cshtml @@ -0,0 +1,17 @@ +@model HHWMS.Web.InterfaceLogListVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/JobLog/BatchDelete.cshtml b/HHWMS.Web/Areas/_Admin/Views/JobLog/BatchDelete.cshtml new file mode 100644 index 0000000..7817438 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/JobLog/BatchDelete.cshtml @@ -0,0 +1,12 @@ +@model HHWMS.Web.JobLogBatchVM +@inject IStringLocalizer Localizer; + + + @Localizer["Sys.BatchDeleteConfirm"] + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/JobLog/BatchEdit.cshtml b/HHWMS.Web/Areas/_Admin/Views/JobLog/BatchEdit.cshtml new file mode 100644 index 0000000..93850b2 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/JobLog/BatchEdit.cshtml @@ -0,0 +1,14 @@ +@model HHWMS.Web.JobLogBatchVM +@inject IStringLocalizer Localizer; + + +
@Localizer["Sys.BatchEditConfirm"]
+ + + + + + + + +
diff --git a/HHWMS.Web/Areas/_Admin/Views/JobLog/Create.cshtml b/HHWMS.Web/Areas/_Admin/Views/JobLog/Create.cshtml new file mode 100644 index 0000000..f39cc38 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/JobLog/Create.cshtml @@ -0,0 +1,11 @@ +@model HHWMS.Web.JobLogVM +@inject IStringLocalizer Localizer; + + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/JobLog/Delete.cshtml b/HHWMS.Web/Areas/_Admin/Views/JobLog/Delete.cshtml new file mode 100644 index 0000000..2b1e0d1 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/JobLog/Delete.cshtml @@ -0,0 +1,13 @@ +@model HHWMS.Web.JobLogVM +@inject IStringLocalizer Localizer; + + + @Localizer["Sys.DeleteConfirm"] + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/JobLog/Details.cshtml b/HHWMS.Web/Areas/_Admin/Views/JobLog/Details.cshtml new file mode 100644 index 0000000..ab49fe6 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/JobLog/Details.cshtml @@ -0,0 +1,10 @@ +@model HHWMS.Web.JobLogVM +@inject IStringLocalizer Localizer; + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/JobLog/Edit.cshtml b/HHWMS.Web/Areas/_Admin/Views/JobLog/Edit.cshtml new file mode 100644 index 0000000..116aa24 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/JobLog/Edit.cshtml @@ -0,0 +1,12 @@ +@model HHWMS.Web.JobLogVM +@inject IStringLocalizer Localizer; + + + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/JobLog/Import.cshtml b/HHWMS.Web/Areas/_Admin/Views/JobLog/Import.cshtml new file mode 100644 index 0000000..23d6b8a --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/JobLog/Import.cshtml @@ -0,0 +1,14 @@ +@model HHWMS.Web.JobLogImportVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/_Admin/Views/JobLog/Index.cshtml b/HHWMS.Web/Areas/_Admin/Views/JobLog/Index.cshtml new file mode 100644 index 0000000..dcc6a20 --- /dev/null +++ b/HHWMS.Web/Areas/_Admin/Views/JobLog/Index.cshtml @@ -0,0 +1,13 @@ +@model HHWMS.Web.JobLogListVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + diff --git a/HHWMS.Web/DataContext.cs b/HHWMS.Web/DataContext.cs index a5376a2..fb0faa2 100644 --- a/HHWMS.Web/DataContext.cs +++ b/HHWMS.Web/DataContext.cs @@ -96,6 +96,21 @@ namespace HHWMS.Web { base.OnModelCreating(modelBuilder); + modelBuilder.Entity() + .HasMany(e => e.ReceiptDetails) + .WithOne(e => e.ReceiptHeader) + .HasForeignKey("HeaderId"); + + modelBuilder.Entity() + .HasMany(e => e.ShipmentDetails) + .WithOne(e => e.ShipmentHeader) + .HasForeignKey("HeaderId"); + + modelBuilder.Entity() + .HasMany(e => e.TaskDetails) + .WithOne(e => e.TaskHeader) + .HasForeignKey("HeaderId"); + // ef生成表 添加字段注释,只有本项目的表才添加,需要在DisplayAttribute,添加Description var ddd = modelBuilder.Model.GetEntityTypes(); ddd = ddd.Where(x => x.ClrType.FullName.Contains("HHWMS.Web")).ToList(); diff --git a/HHWMS.Web/HHWMS.Web.csproj b/HHWMS.Web/HHWMS.Web.csproj index 7f0d27b..5f08f3f 100644 --- a/HHWMS.Web/HHWMS.Web.csproj +++ b/HHWMS.Web/HHWMS.Web.csproj @@ -34,6 +34,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -51,9 +71,9 @@ - - - + + + diff --git a/HHWMS.Web/Models/Inventory/Inventory.cs b/HHWMS.Web/Models/Inventory/Inventory.cs index f6db50b..792bba1 100644 --- a/HHWMS.Web/Models/Inventory/Inventory.cs +++ b/HHWMS.Web/Models/Inventory/Inventory.cs @@ -25,10 +25,6 @@ namespace HHWMS.Web.Models [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string LocationCode { get; set; } - [Display(Name = "Inventory.UniqueCode", Description = "唯一编码")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string UniqueCode { get; set; } - [Display(Name = "Inventory.MaterialCode", Description = "物料编码")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string MaterialCode { get; set; } @@ -87,7 +83,6 @@ namespace HHWMS.Web.Models public string ReceiptCode { get; set; } [Display(Name = "Inventory.ReceiptDetailId", Description = "明细ID")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public int? ReceiptDetailId { get; set; } [Display(Name = "Inventory.Status", Description = "物料状态")] diff --git a/HHWMS.Web/Models/Receipt/ReceiptDetail.cs b/HHWMS.Web/Models/Receipt/ReceiptDetail.cs index e3c2a0d..65b9889 100644 --- a/HHWMS.Web/Models/Receipt/ReceiptDetail.cs +++ b/HHWMS.Web/Models/Receipt/ReceiptDetail.cs @@ -14,7 +14,7 @@ namespace HHWMS.Web.Models public new int ID { get; set; } [Display(Name = "Inventory.ReceiptCode")] - public int ReceiptHeaderId { get; set; } + public int HeaderId { get; set; } public ReceiptHeader ReceiptHeader { get; set; } @@ -26,10 +26,6 @@ namespace HHWMS.Web.Models [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string MaterialCode { get; set; } - [Display(Name = "Inventory.UniqueCode", Description = "唯一编码")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string UniqueCode { get; set; } - [Display(Name = "Inventory.MaterialType", Description = "物料类型")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string MaterialType { get; set; } diff --git a/HHWMS.Web/Models/Receipt/ReceiptDetailHistory.cs b/HHWMS.Web/Models/Receipt/ReceiptDetailHistory.cs index 831c93b..4f0c44b 100644 --- a/HHWMS.Web/Models/Receipt/ReceiptDetailHistory.cs +++ b/HHWMS.Web/Models/Receipt/ReceiptDetailHistory.cs @@ -10,12 +10,11 @@ namespace HHWMS.Web.Models public class ReceiptDetailHistory : BasePoco { [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public new int ID { get; set; } [Display(Name = "Inventory.ReceiptCode")] - public int ReceiptHeaderHistoryId { get; set; } - - public ReceiptHeaderHistory ReceiptHeaderHistory { get; set; } + public int HeaderId { get; set; } [Display(Name = "Task.ZoneCode", Description = "库区")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] @@ -25,10 +24,6 @@ namespace HHWMS.Web.Models [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string MaterialCode { get; set; } - [Display(Name = "Inventory.UniqueCode", Description = "唯一编码")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string UniqueCode { get; set; } - [Display(Name = "Inventory.MaterialType", Description = "物料类型")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string MaterialType { get; set; } diff --git a/HHWMS.Web/Models/Receipt/ReceiptHeaderHistory.cs b/HHWMS.Web/Models/Receipt/ReceiptHeaderHistory.cs index 4893486..3b5184b 100644 --- a/HHWMS.Web/Models/Receipt/ReceiptHeaderHistory.cs +++ b/HHWMS.Web/Models/Receipt/ReceiptHeaderHistory.cs @@ -53,6 +53,5 @@ namespace HHWMS.Web.Models [Display(Name = "_Admin.Remark", Description = "备注")] public string Remark { get; set; } - public ICollection ReceiptDetailsHistories { get; set; } } } diff --git a/HHWMS.Web/Models/Shipment/ShipmentDetail.cs b/HHWMS.Web/Models/Shipment/ShipmentDetail.cs index 4b3be54..2b61c8e 100644 --- a/HHWMS.Web/Models/Shipment/ShipmentDetail.cs +++ b/HHWMS.Web/Models/Shipment/ShipmentDetail.cs @@ -14,7 +14,7 @@ namespace HHWMS.Web.Models public new int ID { get; set; } [Display(Name = "Ship.ShipmentCode")] - public int ShipmentHeaderId { get; set; } + public int HeaderId { get; set; } public ShipmentHeader ShipmentHeader { get; set; } @@ -26,11 +26,6 @@ namespace HHWMS.Web.Models [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string MaterialCode { get; set; } - [Required] - [Display(Name = "Inventory.UniqueCode", Description = "唯一编码")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string UniqueCode { get; set; } - [Display(Name = "Inventory.MaterialType", Description = "物料类型")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string MaterialType { get; set; } diff --git a/HHWMS.Web/Models/Shipment/ShipmentDetailHistory.cs b/HHWMS.Web/Models/Shipment/ShipmentDetailHistory.cs index dacefd8..e93e970 100644 --- a/HHWMS.Web/Models/Shipment/ShipmentDetailHistory.cs +++ b/HHWMS.Web/Models/Shipment/ShipmentDetailHistory.cs @@ -10,12 +10,11 @@ namespace HHWMS.Web.Models public class ShipmentDetailHistory : BasePoco { [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public new int ID { get; set; } [Display(Name = "Ship.ShipmentCode")] - public int ShipmentHeaderHistoryId { get; set; } - - public ShipmentHeaderHistory ShipmentHeaderHistory { get; set; } + public int HeaderId { get; set; } [Display(Name = "Task.ZoneCode", Description = "库区")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] @@ -25,10 +24,6 @@ namespace HHWMS.Web.Models [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string MaterialCode { get; set; } - [Display(Name = "Inventory.UniqueCode", Description = "唯一编码")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string UniqueCode { get; set; } - [Display(Name = "Inventory.MaterialType", Description = "物料类型")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string MaterialType { get; set; } diff --git a/HHWMS.Web/Models/Shipment/ShipmentHeaderHistory.cs b/HHWMS.Web/Models/Shipment/ShipmentHeaderHistory.cs index 3bdb34c..3f6893d 100644 --- a/HHWMS.Web/Models/Shipment/ShipmentHeaderHistory.cs +++ b/HHWMS.Web/Models/Shipment/ShipmentHeaderHistory.cs @@ -49,6 +49,5 @@ namespace HHWMS.Web.Models [Display(Name = "_Admin.Remark", Description = "备注")] public string Remark { get; set; } - public ICollection ShipmentDetailHistories { get; set; } } } diff --git a/HHWMS.Web/Models/Task/TaskDetail.cs b/HHWMS.Web/Models/Task/TaskDetail.cs index d68a259..54bfaff 100644 --- a/HHWMS.Web/Models/Task/TaskDetail.cs +++ b/HHWMS.Web/Models/Task/TaskDetail.cs @@ -13,7 +13,7 @@ namespace HHWMS.Web.Models public new int ID { get; set; } [Display(Name = "Task.TaskNo", Description = "任务号")] - public int TaskHeaderId { get; set; } + public int HeaderId { get; set; } public TaskHeader TaskHeader { get; set; } @@ -23,10 +23,6 @@ namespace HHWMS.Web.Models [Display(Name = "Inventory.ReceiptDetailId", Description = "明细ID")] public int? OrderDetailId { get; set; } - - [Display(Name = "Inventory.UniqueCode", Description = "唯一码")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string UniqueCode { get; set; } [Display(Name = "Inventory.MaterialCode", Description = "物料编码")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] diff --git a/HHWMS.Web/Models/Task/TaskDetailHistory.cs b/HHWMS.Web/Models/Task/TaskDetailHistory.cs index 0a6e389..4f828ec 100644 --- a/HHWMS.Web/Models/Task/TaskDetailHistory.cs +++ b/HHWMS.Web/Models/Task/TaskDetailHistory.cs @@ -8,12 +8,12 @@ namespace HHWMS.Web.Models [Table("TaskDetailHistory")] public class TaskDetailHistory : BasePoco { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public new int ID { get; set; } [Display(Name = "Task.TaskNo", Description = "任务号")] - public int TaskHeaderId { get; set; } - - public TaskHeaderHistory TaskHeader { get; set; } + public int HeaderId { get; set; } [Display(Name = "Inventory.ReceiptCode", Description = "单据编号")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] @@ -56,6 +56,14 @@ namespace HHWMS.Web.Models [Display(Name = "TaskDetail.InventoryId", Description = "库存Id")] public int? InventoryId { get; set; } + [Display(Name = "Task.FromLocation", Description = "起始仓位")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string FromLocation { get; set; } + + [Display(Name = "Task.ToLocation", Description = "目标仓位")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string ToLocation { get; set; } + [Display(Name = "TaskDetail.Status", Description = "状态")] public TaskStatusEnum? Status { get; set; } } diff --git a/HHWMS.Web/Models/Task/TaskHeaderHistory.cs b/HHWMS.Web/Models/Task/TaskHeaderHistory.cs index 0170ebf..ad32e73 100644 --- a/HHWMS.Web/Models/Task/TaskHeaderHistory.cs +++ b/HHWMS.Web/Models/Task/TaskHeaderHistory.cs @@ -51,6 +51,5 @@ namespace HHWMS.Web.Models [Display(Name = "Task.ErrorMsg", Description = "错误信息")] public string ErrorMsg { get; set; } - public ICollection TaskDetails { get; set; } } } diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index 446eaf2..4ade8f3 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -259,7 +259,7 @@ 验证码不正确 - 日志 + 操作日志 内置Api @@ -1395,4 +1395,16 @@ 测试数据 + + 请求 + + + 响应 + + + 任务日志 + + + 接口日志 + diff --git a/HHWMS.Web/Support/Profiles/MapToHisProfile.cs b/HHWMS.Web/Support/Profiles/MapToHisProfile.cs index 3d7aae0..ca2f78b 100644 --- a/HHWMS.Web/Support/Profiles/MapToHisProfile.cs +++ b/HHWMS.Web/Support/Profiles/MapToHisProfile.cs @@ -7,15 +7,12 @@ namespace HHWMS.Web.Support.Profiles { public MapToHisProfile() { - CreateMap(); + CreateMap(); - //.ForMember( - // destinationMember => destinationMember.ReceiptHeaderHistoryId, - // src => src.MapFrom(x => x.ReceiptHeaderId)) - //.ForMember( - // destinationMember => destinationMember.ReceiptHeaderHistory, - // src => src.MapFrom(x => x.ReceiptHeader)) - + + CreateMap(); + + CreateMap(); CreateMap(); diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index a933946..30322fa 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -24,12 +24,12 @@ "Connections": [ //{ // "Key": "default", - // "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", + // "Value": "Server=127.0.0.1;Port=3306;Database=WMS;Uid=root;Password=abc123*;Character Set=utf8mb4;", // "DBType": "mysql" //}, { "Key": "default", - "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True", + "Value": "Data Source=.;Initial Catalog=WMS;User=sa;Password=abc123*;Persist Security Info=True", "DbContext": "DataContext", "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle }