diff --git a/HHWMS.Web/Areas/Configs/Controllers/Print2Controller.cs b/HHWMS.Web/Areas/Configs/Controllers/Print2Controller.cs new file mode 100644 index 0000000..9eb8b11 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Controllers/Print2Controller.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using HHWMS.Web.Models; +using ICSharpCode.SharpZipLib.Core; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using WalkingTec.Mvvm.Mvc; + +namespace HHWMS.Web.Controllers +{ + [Area("configs")] + [ActionDescription("无单打印")] + public partial class Print2Controller : BaseController + { + private readonly IUnitWork _unitwork; + + public Print2Controller(IUnitWork unitwork) + { + _unitwork = unitwork; + } + + #region Search + + [ActionDescription("Sys.Search")] + public ActionResult Index() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + #endregion Search + + [HttpPost] + [ActionDescription("Sys.Create")] + [FixConnection(CsName = "hangyong")] + public ActionResult Create(ReceiptDetail2VM vm) + { + if (string.IsNullOrEmpty(vm.Entity.MaterialCode)) + { + return FFResult().Alert("物料必选!"); + } + + if (string.IsNullOrEmpty(vm.Entity.Batch)) + { + return FFResult().Alert("批次信息不能为空!"); + } + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; + var dc = Wtm.CreateDC(cskey: "hangyong"); + Wtm.DC = dc; + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + var _unit = new UnitWork(Wtm); + var header = new ReceiptHeader2 + { + WarehouseId = int.Parse(warehouseId), + Code = _unitwork.GetSerialNumber("SDR"), + Type = "SDR", + FirstStatus = 0, + LastStatus = 0, + TotalLines = 1, + TotalQty = 0, + }; + _unit.Add(header); + + vm.Entity.WarehouseId = header.WarehouseId; + vm.Entity.ReceiptId = header.ID; + vm.Entity.ReceiptCode = header?.Code; + vm.Entity.Status = 0; + var mater = dc.Set() + .FirstOrDefault(x => x.ID == int.Parse(vm.Entity.MaterialCode)); + vm.Entity.MaterialCode = mater?.Code; + vm.Entity.Lot = mater?.Specification; + vm.Entity.Unit = mater?.MasterUnit; + vm.DoAdd(); + if (!ModelState.IsValid) + { + vm.DoReInit(); + return PartialView(vm); + } + else + { + return FFResult().Message("Ok!"); + } + } + } + } +} diff --git a/HHWMS.Web/Areas/Configs/Views/Print2/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Print2/Index.cshtml new file mode 100644 index 0000000..052cb5c --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/Print2/Index.cshtml @@ -0,0 +1,75 @@ +@model HHWMS.Web.ReceiptDetail2VM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + + + + + + + + @* *@ + + @* *@ + + + diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs index 45b17e3..fb78e8f 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs @@ -99,7 +99,7 @@ namespace HHWMS.Web.Controllers } } - [ActionDescription("Sys.Create")] + [ActionDescription("Sys.Create2")] public ActionResult Create2() { var vm = Wtm.CreateVM(); @@ -107,7 +107,7 @@ namespace HHWMS.Web.Controllers } [HttpPost] - [ActionDescription("Sys.Create")] + [ActionDescription("Sys.Create2")] [FixConnection(CsName = "hangyong")] public ActionResult Create2(ReceiptDetail2VM vm) { diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs b/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs index 65244e2..88ba569 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs @@ -36,6 +36,7 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.Type), this.MakeGridHeader(x => x.Name).SetWidth(150), this.MakeGridHeader(x => x.MasterUnit), + this.MakeGridHeader(x => x.Specification).SetHide(), this.MakeGridHeader(x => x.ClassA).SetHide(), this.MakeGridHeaderAction(width: 200) }; diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2Searcher.cs b/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2Searcher.cs index 0b3f6b8..f3bfccb 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2Searcher.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2Searcher.cs @@ -29,6 +29,7 @@ namespace HHWMS.Web public String ClassA { get; set; } public String ClassB { get; set; } public String ClassC { get; set; } + [Display(Name = "Inventory.MaterialSpec")] public String Specification { get; set; } public String Brand { get; set; } public String Size { get; set; } diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml index 30a3efe..3ba25f4 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml @@ -7,7 +7,7 @@ - + diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Create2.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Create2.cshtml index 292eda1..82b346d 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Create2.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Create2.cshtml @@ -7,7 +7,7 @@ - +