From 85a2ad05c3d6f65e8d9139d6a5ef18f90988e654 Mon Sep 17 00:00:00 2001 From: zgf Date: Fri, 18 Aug 2023 15:54:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=93=8D=E4=BD=9C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ReceiptInController.cs | 32 ++- .../ReceiptInVMs/ReceiptInListVM.cs | 20 +- .../ReceiptInVMs/ReceiptInSearcher.cs | 12 ++ .../Receipt/Views/ReceiptIn/Index.cshtml | 190 +++++++++--------- 4 files changed, 141 insertions(+), 113 deletions(-) diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index 13a2b3b..cfdd2e3 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -6,6 +6,8 @@ using WalkingTec.Mvvm.Mvc; using WalkingTec.Mvvm.Core.Extensions; using HHWMS.Web; using HHWMS.Web.Models; +using Microsoft.EntityFrameworkCore; +using System.Linq; namespace HHWMS.Web.Controllers { @@ -28,18 +30,26 @@ namespace HHWMS.Web.Controllers [ActionDescription("Sys.Search")] [HttpPost] - public string Search(ReceiptInSearcher searcher) + public string Search(ReceiptDetailListVM vm) { - var vm = Wtm.CreateVM(passInit: true); - if (ModelState.IsValid) - { - vm.Searcher = searcher; - return vm.GetJson(false); - } - else - { - return vm.GetError(); - } + vm.Searcher.Page = vm.FC.GetValue("Page"); + vm.Searcher.Limit = vm.FC.GetValue("Limit"); + vm.Searcher.ReceiptHeaderId = vm.FC.GetValue("Code"); + return vm.GetJson(false); + } + + [HttpPost] + public ActionResult SelectReceipt(string Code) + { + var data = _unitwork.Find(x => x.Code == Code).Include(x => x.ReceiptDetails).FirstOrDefault(); + var result = data.ReceiptDetails; + return JsonMore(result); + } + + [HttpPost] + public IActionResult Test(string Code, string code2, string code3, string code4) + { + return FFResult().Message("success"); } #endregion diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptInVMs/ReceiptInListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptInVMs/ReceiptInListVM.cs index 551e593..2bb5e47 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptInVMs/ReceiptInListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptInVMs/ReceiptInListVM.cs @@ -6,7 +6,7 @@ using WalkingTec.Mvvm.Core.Extensions; namespace HHWMS.Web { - public partial class ReceiptInListVM : BasePagedListVM + public partial class ReceiptInListVM : BasePagedListVM { public ReceiptDetailListVM2 Details { get; set; } = new ReceiptDetailListVM2(); public List Codes { get; set; } @@ -16,7 +16,7 @@ namespace HHWMS.Web Codes = DC.Set().Select(x => new ComboSelectListItem { Text = x.Code, - Value = x.Code + Value = x.ID }).ToList(); } protected override List InitGridAction() @@ -34,21 +34,21 @@ namespace HHWMS.Web };*/ } - protected override IEnumerable> InitGridHeader() + protected override IEnumerable> InitGridHeader() { - return new List>{ - this.MakeGridHeader(x => x.Code) + return new List>{ + this.MakeGridHeader(x => x.MaterialCode) }; } - public override IOrderedQueryable GetSearchQuery() + public override IOrderedQueryable GetSearchQuery() { - var query = DC.Set() - .CheckContain(Searcher.Code, x => x.Code) - .Select(x => new ReceiptHeader_View + var query = DC.Set() + .Where(x => x.ReceiptHeaderId.Equals(Searcher.ReceiptHeaderId)) + .Select(x => new ReceiptDetail_View { ID = x.ID, - Code = x.Code + MaterialCode = x.MaterialCode }) .OrderBy(x => x.ID); return query; diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptInVMs/ReceiptInSearcher.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptInVMs/ReceiptInSearcher.cs index 009c878..bf13797 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptInVMs/ReceiptInSearcher.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptInVMs/ReceiptInSearcher.cs @@ -7,12 +7,24 @@ namespace HHWMS.Web { public partial class ReceiptInSearcher : BaseSearcher { + [Display(Name = "Inventory.ReceiptCode")] + public int ReceiptHeaderId { get; set; } + [Display(Name = "Inventory.SourceCode")] public String SourceCode { get; set; } [Display(Name = "Inventory.ReceiptCode")] public String Code { get; set; } + [Display(Name = "Inventory.BoxCode")] + public String BoxCode { get; set; } + + [Display(Name = "Inventory.Size")] + public String Size { get; set; } + + [Display(Name = "Inventory.UniqueCode")] + public String UniqueCode { get; set; } + [Display(Name = "Inventory.BillType")] public String BillType { get; set; } diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 87c82a6..a85b9b2 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -3,109 +3,115 @@
-
+ +
-
+ + + + + +
-
-
+
+ +
- +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+