From f4505ff18ddc34e7cc89165b1fae6cbd1337e1e9 Mon Sep 17 00:00:00 2001 From: zgf Date: Wed, 16 Aug 2023 09:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E4=B8=BB=E5=AD=90=E8=A1=A8=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=89=A9=E6=96=99=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Configs/Controllers/LocationController.cs | 1 + .../Configs/Controllers/MaterialController.cs | 228 ++++++++++++++++++ .../ViewModels/MaterialVMs/MaterialBatchVM.cs | 35 +++ .../MaterialVMs/MaterialImportVM.cs | 53 ++++ .../ViewModels/MaterialVMs/MaterialListVM.cs | 84 +++++++ .../MaterialVMs/MaterialSearcher.cs | 27 +++ .../ViewModels/MaterialVMs/MaterialVM.cs | 39 +++ .../Configs/Views/Material/BatchDelete.cshtml | 12 + .../Configs/Views/Material/BatchEdit.cshtml | 14 ++ .../Configs/Views/Material/Create.cshtml | 24 ++ .../Configs/Views/Material/Delete.cshtml | 26 ++ .../Configs/Views/Material/Details.cshtml | 23 ++ .../Areas/Configs/Views/Material/Edit.cshtml | 25 ++ .../Configs/Views/Material/Import.cshtml | 14 ++ .../Areas/Configs/Views/Material/Index.cshtml | 11 + .../InventoryVMs/InventoryListVM.cs | 2 +- .../Controllers/ReceiptDetailController.cs | 72 ++++++ .../Controllers/ReceiptHeaderController.cs | 3 +- .../ReceiptDetailVMs/ReceiptDetailListVM2.cs | 89 +++++++ .../ReceiptHeaderVMs/ReceiptHeaderListVM.cs | 12 +- .../ReceiptHeaderVMs/ReceiptHeaderVM.cs | 4 + .../Views/ReceiptDetail/Create2.cshtml | 28 +++ .../Views/ReceiptDetail/CreateDetails.cshtml | 13 + .../Views/ReceiptHeader/Details.cshtml | 4 +- .../Receipt/Views/ReceiptHeader/Index.cshtml | 35 ++- .../Controllers/SysDictDataController.cs | 2 + .../System/Views/SysDictType/Index.cshtml | 2 +- HHWMS.Web/DataContext.cs | 1 + HHWMS.Web/Models/Configs/Material.cs | 67 +++++ HHWMS.Web/Resources/Program.zh.resx | 6 + .../Grid/GridHeaderExtension.cs | 2 +- 31 files changed, 949 insertions(+), 9 deletions(-) create mode 100644 HHWMS.Web/Areas/Configs/Controllers/MaterialController.cs create mode 100644 HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialBatchVM.cs create mode 100644 HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialImportVM.cs create mode 100644 HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialListVM.cs create mode 100644 HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialSearcher.cs create mode 100644 HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialVM.cs create mode 100644 HHWMS.Web/Areas/Configs/Views/Material/BatchDelete.cshtml create mode 100644 HHWMS.Web/Areas/Configs/Views/Material/BatchEdit.cshtml create mode 100644 HHWMS.Web/Areas/Configs/Views/Material/Create.cshtml create mode 100644 HHWMS.Web/Areas/Configs/Views/Material/Delete.cshtml create mode 100644 HHWMS.Web/Areas/Configs/Views/Material/Details.cshtml create mode 100644 HHWMS.Web/Areas/Configs/Views/Material/Edit.cshtml create mode 100644 HHWMS.Web/Areas/Configs/Views/Material/Import.cshtml create mode 100644 HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml create mode 100644 HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs create mode 100644 HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create2.cshtml create mode 100644 HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml create mode 100644 HHWMS.Web/Models/Configs/Material.cs diff --git a/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs b/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs index d28cc36..bc9863b 100644 --- a/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs +++ b/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs @@ -140,6 +140,7 @@ namespace HHWMS.Web.Controllers public ActionResult Details(string id) { var vm = Wtm.CreateVM(id); + vm.Inventorys.SearcherMode = ListVMSearchModeEnum.MasterDetail; return PartialView(vm); } #endregion diff --git a/HHWMS.Web/Areas/Configs/Controllers/MaterialController.cs b/HHWMS.Web/Areas/Configs/Controllers/MaterialController.cs new file mode 100644 index 0000000..3ebda4e --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Controllers/MaterialController.cs @@ -0,0 +1,228 @@ +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; + +namespace HHWMS.Web.Controllers +{ + [Area("configs")] + [ActionDescription("物料管理")] + public partial class MaterialController : BaseController + { + private readonly IUnitWork _unitwork; + + public MaterialController(IUnitWork unitwork) + { + _unitwork = unitwork; + } + + #region Search + [ActionDescription("Sys.Search")] + public ActionResult Index() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [ActionDescription("Sys.Search")] + [HttpPost] + public string Search(MaterialSearcher searcher) + { + var vm = Wtm.CreateVM(passInit: true); + if (ModelState.IsValid) + { + vm.Searcher = searcher; + return vm.GetJson(false); + } + else + { + return vm.GetError(); + } + } + + #endregion + + #region Create + [ActionDescription("Sys.Create")] + public ActionResult Create() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.Create")] + public ActionResult Create(MaterialVM vm) + { + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + vm.DoAdd(); + if (!ModelState.IsValid) + { + vm.DoReInit(); + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid(); + } + } + } + #endregion + + #region Edit + [ActionDescription("Sys.Edit")] + public ActionResult Edit(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + [ActionDescription("Sys.Edit")] + [HttpPost] + [ValidateFormItemOnly] + public ActionResult Edit(MaterialVM vm) + { + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + vm.DoEdit(); + if (!ModelState.IsValid) + { + vm.DoReInit(); + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID); + } + } + } + #endregion + + #region Delete + [ActionDescription("Sys.Delete")] + public ActionResult Delete(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + [ActionDescription("Sys.Delete")] + [HttpPost] + public ActionResult Delete(string id, IFormCollection nouse) + { + var vm = Wtm.CreateVM(id); + vm.DoDelete(); + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid(); + } + } + #endregion + + #region Details + [ActionDescription("Sys.Details")] + public ActionResult Details(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + #endregion + + #region BatchEdit + [HttpPost] + [ActionDescription("Sys.BatchEdit")] + public ActionResult BatchEdit(string[] IDs) + { + var vm = Wtm.CreateVM(Ids: IDs); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.BatchEdit")] + public ActionResult DoBatchEdit(MaterialBatchVM vm, IFormCollection nouse) + { + if (!ModelState.IsValid || !vm.DoBatchEdit()) + { + return PartialView("BatchEdit",vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchEditSuccess", vm.Ids.Length]); + } + } + #endregion + + #region BatchDelete + [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(MaterialBatchVM vm, IFormCollection nouse) + { + if (!ModelState.IsValid || !vm.DoBatchDelete()) + { + return PartialView("BatchDelete",vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchDeleteSuccess", vm.Ids.Length]); + } + } + #endregion + + #region Import + [ActionDescription("Sys.Import")] + public ActionResult Import() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.Import")] + public ActionResult Import(MaterialImportVM vm, IFormCollection nouse) + { + if (vm.ErrorListVM.EntityList.Count > 0 || !vm.BatchSaveData()) + { + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.ImportSuccess", vm.EntityList.Count.ToString()]); + } + } + #endregion + + #region Export + [ActionDescription("Sys.Export")] + [HttpPost] + public IActionResult ExportExcel(MaterialListVM vm) + { + return vm.GetExportData(); + } + #endregion + + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialBatchVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialBatchVM.cs new file mode 100644 index 0000000..dddd7ba --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialBatchVM.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 HHWMS.Web.Models; + + +namespace HHWMS.Web +{ + public partial class MaterialBatchVM : BaseBatchVM + { + public MaterialBatchVM() + { + ListVM = new MaterialListVM(); + LinkedVM = new Material_BatchEdit(); + } + + } + + /// + /// Class to define batch edit fields + /// + public class Material_BatchEdit : BaseVM + { + + protected override void InitVM() + { + } + + } + +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialImportVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialImportVM.cs new file mode 100644 index 0000000..70a13a2 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialImportVM.cs @@ -0,0 +1,53 @@ +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 HHWMS.Web.Models; + + +namespace HHWMS.Web +{ + public partial class MaterialTemplateVM : BaseTemplateVM + { + [Display(Name = "Inventory.UniqueCode")] + public ExcelPropety UniqueCode_Excel = ExcelPropety.CreateProperty(x => x.UniqueCode); + [Display(Name = "Inventory.QRCode")] + public ExcelPropety QRCode_Excel = ExcelPropety.CreateProperty(x => x.QRCode); + [Display(Name = "Inventory.SourceCode")] + public ExcelPropety SourceCode_Excel = ExcelPropety.CreateProperty(x => x.SourceCode); + [Display(Name = "Inventory.MaterialCode")] + public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty(x => x.MaterialCode); + [Display(Name = "Inventory.MaterialType")] + public ExcelPropety MaterialType_Excel = ExcelPropety.CreateProperty(x => x.MaterialType); + [Display(Name = "Inventory.MaterialName")] + public ExcelPropety MaterialName_Excel = ExcelPropety.CreateProperty(x => x.MaterialName); + [Display(Name = "Inventory.MaterialSpec")] + public ExcelPropety MaterialSpec_Excel = ExcelPropety.CreateProperty(x => x.MaterialSpec); + [Display(Name = "Inventory.MaterialUnit")] + public ExcelPropety MaterialUnit_Excel = ExcelPropety.CreateProperty(x => x.MaterialUnit); + [Display(Name = "Inventory.Batch")] + public ExcelPropety Batch_Excel = ExcelPropety.CreateProperty(x => x.Batch); + [Display(Name = "Inventory.Lot")] + public ExcelPropety Lot_Excel = ExcelPropety.CreateProperty(x => x.Lot); + [Display(Name = "Inventory.CompanyCode")] + public ExcelPropety CompanyCode_Excel = ExcelPropety.CreateProperty(x => x.CompanyCode); + [Display(Name = "Inventory.SupplierCode")] + public ExcelPropety SupplierCode_Excel = ExcelPropety.CreateProperty(x => x.SupplierCode); + [Display(Name = "Inventory.Qty")] + public ExcelPropety Qty_Excel = ExcelPropety.CreateProperty(x => x.Qty); + + protected override void InitVM() + { + } + + } + + public class MaterialImportVM : BaseImportVM + { + + } + +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialListVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialListVM.cs new file mode 100644 index 0000000..837becd --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialListVM.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 HHWMS.Web.Models; + + +namespace HHWMS.Web +{ + public partial class MaterialListVM : BasePagedListVM + { + protected override List InitGridAction() + { + return new List + { + this.MakeStandardAction("Material", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"configs", dialogWidth: 800), + this.MakeStandardAction("Material", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "configs", dialogWidth: 800), + this.MakeStandardAction("Material", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "configs", dialogWidth: 800), + this.MakeStandardAction("Material", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "configs", dialogWidth: 800), + this.MakeStandardAction("Material", GridActionStandardTypesEnum.BatchEdit, Localizer["Sys.BatchEdit"], "configs", dialogWidth: 800), + this.MakeStandardAction("Material", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "configs", dialogWidth: 800), + this.MakeStandardAction("Material", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "configs", dialogWidth: 800), + this.MakeStandardAction("Material", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "configs"), + }; + } + + + protected override IEnumerable> InitGridHeader() + { + return new List>{ + this.MakeGridHeader(x => x.UniqueCode).SetWidth(220), + this.MakeGridHeader(x => x.QRCode), + this.MakeGridHeader(x => x.SourceCode).SetHide(), + 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).SetWidth(80), + this.MakeGridHeader(x => x.Batch).SetWidth(150), + this.MakeGridHeader(x => x.Lot).SetHide(), + this.MakeGridHeader(x => x.CompanyCode).SetHide(), + this.MakeGridHeader(x => x.SupplierCode), + this.MakeGridHeader(x => x.Qty), + this.MakeGridHeaderAction(width: 200) + }; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .CheckContain(Searcher.UniqueCode, x=>x.UniqueCode) + .CheckContain(Searcher.QRCode, x=>x.QRCode) + .CheckContain(Searcher.MaterialCode, x=>x.MaterialCode) + .Select(x => new Material_View + { + ID = x.ID, + UniqueCode = x.UniqueCode, + QRCode = x.QRCode, + SourceCode = x.SourceCode, + MaterialCode = x.MaterialCode, + MaterialType = x.MaterialType, + MaterialName = x.MaterialName, + MaterialSpec = x.MaterialSpec, + MaterialUnit = x.MaterialUnit, + Batch = x.Batch, + Lot = x.Lot, + CompanyCode = x.CompanyCode, + SupplierCode = x.SupplierCode, + Qty = x.Qty, + }) + .OrderBy(x => x.ID); + return query; + } + + } + + public class Material_View : Material{ + + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialSearcher.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialSearcher.cs new file mode 100644 index 0000000..9f4326a --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialSearcher.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 HHWMS.Web.Models; + + +namespace HHWMS.Web +{ + public partial class MaterialSearcher : BaseSearcher + { + [Display(Name = "Inventory.UniqueCode")] + public String UniqueCode { get; set; } + [Display(Name = "Inventory.QRCode")] + public String QRCode { get; set; } + [Display(Name = "Inventory.MaterialCode")] + public String MaterialCode { get; set; } + + protected override void InitVM() + { + } + + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialVM.cs new file mode 100644 index 0000000..fcb310e --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialVM.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 HHWMS.Web.Models; + + +namespace HHWMS.Web +{ + public partial class MaterialVM : BaseCRUDVM + { + + public MaterialVM() + { + } + + 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/Configs/Views/Material/BatchDelete.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/BatchDelete.cshtml new file mode 100644 index 0000000..29f86a1 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/Material/BatchDelete.cshtml @@ -0,0 +1,12 @@ +@model HHWMS.Web.MaterialBatchVM +@inject IStringLocalizer Localizer; + + + @Localizer["Sys.BatchDeleteConfirm"] + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/Material/BatchEdit.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/BatchEdit.cshtml new file mode 100644 index 0000000..79ee659 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/Material/BatchEdit.cshtml @@ -0,0 +1,14 @@ +@model HHWMS.Web.MaterialBatchVM +@inject IStringLocalizer Localizer; + + +
@Localizer["Sys.BatchEditConfirm"]
+ + + + + + + + +
diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Create.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Create.cshtml new file mode 100644 index 0000000..d0b0e0b --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/Material/Create.cshtml @@ -0,0 +1,24 @@ +@model HHWMS.Web.MaterialVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Delete.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Delete.cshtml new file mode 100644 index 0000000..abeb034 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/Material/Delete.cshtml @@ -0,0 +1,26 @@ +@model HHWMS.Web.MaterialVM +@inject IStringLocalizer Localizer; + + + @Localizer["Sys.DeleteConfirm"] + + + + + + + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Details.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Details.cshtml new file mode 100644 index 0000000..4269bb3 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/Material/Details.cshtml @@ -0,0 +1,23 @@ +@model HHWMS.Web.MaterialVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Edit.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Edit.cshtml new file mode 100644 index 0000000..1727767 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/Material/Edit.cshtml @@ -0,0 +1,25 @@ +@model HHWMS.Web.MaterialVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Import.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Import.cshtml new file mode 100644 index 0000000..6c8fb18 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/Material/Import.cshtml @@ -0,0 +1,14 @@ +@model HHWMS.Web.MaterialImportVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml new file mode 100644 index 0000000..da33ae4 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml @@ -0,0 +1,11 @@ +@model HHWMS.Web.MaterialListVM +@inject IStringLocalizer Localizer; + + + + + + + + + diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index f5ac4d4..8352662 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -10,7 +10,7 @@ namespace HHWMS.Web { protected override List InitGridAction() { - if (SearcherMode == ListVMSearchModeEnum.MasterDetail) + if (SearcherMode != ListVMSearchModeEnum.MasterDetail) { return new List { diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index 78e92a6..a9b99f3 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -3,6 +3,8 @@ using Microsoft.AspNetCore.Mvc; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Mvc; using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models; +using System.Collections.Generic; namespace HHWMS.Web.Controllers { @@ -39,6 +41,15 @@ namespace HHWMS.Web.Controllers } } + [ActionDescription("Sys.Search")] + [HttpPost] + public string Search2(ReceiptDetailListVM2 vm) + { + vm.Searcher.Page = vm.FC.GetValue("Page"); + vm.Searcher.Limit = vm.FC.GetValue("Limit"); + return vm.GetJson(false); + } + #endregion #region Create @@ -71,6 +82,67 @@ namespace HHWMS.Web.Controllers } } } + + [ActionDescription("Sys.Create")] + public ActionResult Create2(int id) + { + var vm = Wtm.CreateVM(passInit: true); + vm.Entity.ReceiptHeaderId = id; + vm.Entity.ReceiptHeader = new ReceiptHeader(); + //vm.Entity.ReceiptHeader.Code = vm.DC.Set().Find(id).Code; + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.Create")] + public ActionResult Create2(ReceiptDetailVM vm) + { + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + vm.DoAdd(); + if (!ModelState.IsValid) + { + vm.DoReInit(); + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid(index: 1); + } + } + } + + [ActionDescription("Sys.Create")] + public ActionResult CreateDetails(int id) + { + var vm = Wtm.CreateVM(passInit: true); + vm.Entity.ReceiptHeaderId = id; + vm.Entity.ReceiptHeader = new ReceiptHeader(); + //vm.Entity.ReceiptHeader.Code = vm.DC.Set().Find(id).Code; + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.Create")] + public ActionResult CreateDetails(ReceiptDetailVM vm) + { + var materialCodeList = vm.Entity.MaterialCode.Split("\n"); + var detailList = new List(); + foreach(var item in materialCodeList) + { + detailList.Add(new ReceiptDetail + { + MaterialCode = item, + ReceiptHeaderId = vm.Entity.ReceiptHeaderId + }); + } + _unitwork.BatchAdd(detailList.ToArray()); + return FFResult().CloseDialog().RefreshGrid(index: 1); + } #endregion #region Edit diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs index 9458291..dd0ba4d 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using System; using WalkingTec.Mvvm.Core; @@ -138,6 +138,7 @@ namespace HHWMS.Web.Controllers public ActionResult Details(string id) { var vm = Wtm.CreateVM(id); + vm.Details.SearcherMode = ListVMSearchModeEnum.MasterDetail; return PartialView(vm); } #endregion diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs new file mode 100644 index 0000000..c517244 --- /dev/null +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs @@ -0,0 +1,89 @@ +using System.Collections.Generic; +using System.Linq; +using HHWMS.Web.Models; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web +{ + public partial class ReceiptDetailListVM2 : BasePagedListVM + { + protected override List InitGridAction() + { + if (SearcherMode != ListVMSearchModeEnum.MasterDetail) + { + 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"), + + this.MakeStandardAction("ReceiptDetail", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "receipt", dialogWidth: 800), + this.MakeStandardAction("ReceiptDetail", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "receipt", dialogWidth: 800), + this.MakeStandardAction("ReceiptDetail", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "receipt", dialogWidth: 800), + }; + } + else + { + return new List(); + } + } + + protected override IEnumerable> InitGridHeader() + { + var result = new List>{ + this.MakeGridHeader(x => x.Code_view), + this.MakeGridHeader(x => x.ZoneCode), + 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.SupplierCode), + this.MakeGridHeader(x => x.CompletedQty), + this.MakeGridHeader(x => x.Qty), + this.MakeGridHeader(x => x.InventoryStatus), + this.MakeGridHeader(x => x.Status) + }; + + if (SearcherMode != ListVMSearchModeEnum.MasterDetail) + { + result.Add(this.MakeGridHeaderAction(width: 200)); + } + return result; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .Where(x => x.ReceiptHeaderId == Searcher.ReceiptHeaderId) + .Select(x => new ReceiptDetail_View + { + ID = x.ID, + Code_view = x.ReceiptHeader.Code, + ZoneCode = x.ZoneCode, + MaterialCode = x.MaterialCode, + MaterialType = x.MaterialType, + MaterialName = x.MaterialName, + MaterialSpec = x.MaterialSpec, + MaterialUnit = x.MaterialUnit, + Batch = x.Batch, + Lot = x.Lot, + ManufactureDate = x.ManufactureDate, + ExpirationDate = x.ExpirationDate, + CompanyCode = x.CompanyCode, + SupplierCode = x.SupplierCode, + CompletedQty = x.CompletedQty, + Qty = x.Qty, + InventoryStatus = x.InventoryStatus, + Status = x.Status, + }) + .OrderBy(x => x.ID); + return query; + } + } +} diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs index f6e872b..5121719 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs @@ -8,6 +8,12 @@ namespace HHWMS.Web { public partial class ReceiptHeaderListVM : BasePagedListVM { + public ReceiptDetailListVM2 Details { get; set; } = new ReceiptDetailListVM2(); + + protected override void InitVM() + { + Details.CopyContext(this); + } protected override List InitGridAction() { return new List @@ -27,7 +33,11 @@ namespace HHWMS.Web { return new List>{ this.MakeGridHeader(x => x.SourceCode), - this.MakeGridHeader(x => x.Code), + 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), diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs index 3f6a3d8..1d26e7e 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.Linq; using HHWMS.Web.Models; using WalkingTec.Mvvm.Core; @@ -7,12 +8,15 @@ namespace HHWMS.Web { public partial class ReceiptHeaderVM : BaseCRUDVM { + public ReceiptDetailListVM2 Details = new ReceiptDetailListVM2(); public ReceiptHeaderVM() { } protected override void InitVM() { + Details.CopyContext(this); + Details.Searcher.ReceiptHeaderId = Entity.ID; } public override void DoAdd() diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create2.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create2.cshtml new file mode 100644 index 0000000..f259985 --- /dev/null +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/Create2.cshtml @@ -0,0 +1,28 @@ +@model HHWMS.Web.ReceiptDetailVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml new file mode 100644 index 0000000..b9b674d --- /dev/null +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptDetail/CreateDetails.cshtml @@ -0,0 +1,13 @@ +@model HHWMS.Web.ReceiptDetailVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Details.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Details.cshtml index 8d63eff..f3df793 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Details.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Details.cshtml @@ -1,4 +1,4 @@ -@model HHWMS.Web.ReceiptHeaderVM +@model HHWMS.Web.ReceiptHeaderVM @inject IStringLocalizer Localizer; @@ -15,6 +15,8 @@ + + diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml index c88155a..ebf7bbd 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml @@ -1,7 +1,7 @@ -@model HHWMS.Web.ReceiptHeaderListVM +@model HHWMS.Web.ReceiptHeaderListVM @inject IStringLocalizer Localizer; - + @@ -10,4 +10,33 @@ - + + + + diff --git a/HHWMS.Web/Areas/System/Controllers/SysDictDataController.cs b/HHWMS.Web/Areas/System/Controllers/SysDictDataController.cs index 1a41864..2f3c3b7 100644 --- a/HHWMS.Web/Areas/System/Controllers/SysDictDataController.cs +++ b/HHWMS.Web/Areas/System/Controllers/SysDictDataController.cs @@ -41,6 +41,8 @@ namespace HHWMS.Web.Controllers [HttpPost] public string Search2(SysDictDataListVM2 vm) { + vm.Searcher.Page = vm.FC.GetValue("Page"); + vm.Searcher.Limit = vm.FC.GetValue("Limit"); return vm.GetJson(false); } diff --git a/HHWMS.Web/Areas/System/Views/SysDictType/Index.cshtml b/HHWMS.Web/Areas/System/Views/SysDictType/Index.cshtml index d46b34e..c1d0c9f 100644 --- a/HHWMS.Web/Areas/System/Views/SysDictType/Index.cshtml +++ b/HHWMS.Web/Areas/System/Views/SysDictType/Index.cshtml @@ -22,7 +22,7 @@ DictType = val.DictType; } }); - layui.table.reload('detail', { where: { "Searcher.SysDictTypeId": id } }); + layui.table.reload('detail', { where: { "Searcher.SysDictTypeId": id , "page": false} }); } function CreateDictData() { diff --git a/HHWMS.Web/DataContext.cs b/HHWMS.Web/DataContext.cs index f44ae8c..3556f42 100644 --- a/HHWMS.Web/DataContext.cs +++ b/HHWMS.Web/DataContext.cs @@ -52,6 +52,7 @@ namespace HHWMS.Web public DbSet ShipmentHeaderHistories { get; set; } public DbSet ShipmentDetailHistories { get; set; } public DbSet ReportDesigns { get; set; } + public DbSet Materials { get; set; } public override async Task DataInit(object allModules, bool IsSpa) { var state = await base.DataInit(allModules, IsSpa); diff --git a/HHWMS.Web/Models/Configs/Material.cs b/HHWMS.Web/Models/Configs/Material.cs new file mode 100644 index 0000000..5ae81a3 --- /dev/null +++ b/HHWMS.Web/Models/Configs/Material.cs @@ -0,0 +1,67 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore.Metadata.Internal; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + [Table("Material")] + public class Material : BasePoco + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public new int ID { get; set; } + + [Display(Name = "Inventory.UniqueCode", Description = "唯一码")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string UniqueCode { get; set; } + + [Display(Name = "Inventory.QRCode", Description = "二维码")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string QRCode { get; set; } + + [Display(Name = "Inventory.SourceCode", Description = "上游单号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string SourceCode { get; set; } + + [Display(Name = "Inventory.MaterialCode", Description = "物料编码")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string MaterialCode { get; set; } + + [Display(Name = "Inventory.MaterialType", Description = "物料类型")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string MaterialType { get; set; } + + [Display(Name = "Inventory.MaterialName", Description = "物料名称")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string MaterialName { get; set; } + + [Display(Name = "Inventory.MaterialSpec", Description = "物料规格")] + public string MaterialSpec { get; set; } + + [Display(Name = "Inventory.MaterialUnit", Description = "单位")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string MaterialUnit { get; set; } + + [Display(Name = "Inventory.Batch", Description = "批次")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Batch { get; set; } + + [Display(Name = "Inventory.Lot", Description = "料号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Lot { get; set; } + + [Display(Name = "Inventory.CompanyCode", Description = "公司")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string CompanyCode { get; set; } + + [Display(Name = "Inventory.SupplierCode", Description = "供应商")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string SupplierCode { get; set; } + + [Display(Name = "Inventory.Qty", Description = "数量")] + [Column(TypeName = "decimal(12,4)")] + public decimal? Qty { get; set; } + } +} diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index 7687864..b1f0bb0 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -369,6 +369,9 @@ 新建 + + 批量新建 + 数据被使用,无法删除 @@ -1236,6 +1239,9 @@ 唯一码 + + 二维码 + 单据单号 diff --git a/src/WalkingTec.Mvvm.Core/Grid/GridHeaderExtension.cs b/src/WalkingTec.Mvvm.Core/Grid/GridHeaderExtension.cs index f82dcf2..4089a48 100644 --- a/src/WalkingTec.Mvvm.Core/Grid/GridHeaderExtension.cs +++ b/src/WalkingTec.Mvvm.Core/Grid/GridHeaderExtension.cs @@ -45,7 +45,7 @@ namespace WalkingTec.Mvvm.Core var propType = me.Type; if (propType == typeof(string)) { - alignType = GridColumnAlignEnum.Left; + alignType = GridColumnAlignEnum.Center; } }