diff --git a/HHWMS.Web/Areas/XWMS/Controllers/Material2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/Material2Controller.cs index 0df51b3..9eb09b0 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/Material2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/Material2Controller.cs @@ -5,6 +5,9 @@ using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Mvc; using WalkingTec.Mvvm.Core.Extensions; using HHWMS.Web; +using HHWMS.Web.Models; +using WalkingTec.Mvvm.Mvc.Admin.ViewModels.DataPrivilegeVMs; +using System.Linq; namespace HHWMS.Web.Controllers { @@ -227,5 +230,22 @@ namespace HHWMS.Web.Controllers } #endregion + [HttpPost] + public ActionResult GetMaterial(string code) + { + var dc2 = Wtm.CreateDC(cskey: "hangyong"); + var query = dc2.Set() + .CheckContain(code, x => x.Code) + .Select(x => new Material2_View + { + Code = x.Code, + Type = x.Type, + Name = x.Name, + Specification = x.Specification, + MasterUnit = x.MasterUnit + }) + .OrderBy(x => x.ID); + return JsonMore(query); + } } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs index 793809e..f6a1c9a 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs @@ -77,6 +77,11 @@ namespace HHWMS.Web.Controllers [FixConnection(CsName = "hangyong")] public ActionResult Create(ReceiptDetail2VM vm) { + if (string.IsNullOrEmpty(vm.Entity.MaterialCode)) + { + return FFResult().Alert("物料必选!"); + } + var dc = Wtm.CreateDC(cskey: "hangyong"); Wtm.DC = dc; if (!ModelState.IsValid) @@ -96,6 +101,7 @@ namespace HHWMS.Web.Controllers 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.Entity.Batch = vm.Entity.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); vm.DoAdd(); diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs index 8de6bee..45b17e3 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs @@ -94,7 +94,72 @@ namespace HHWMS.Web.Controllers } else { - return FFResult().CloseDialog().RefreshGrid(index:0); + return FFResult().CloseDialog().RefreshPage(); + } + } + } + + [ActionDescription("Sys.Create")] + public ActionResult Create2() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.Create")] + [FixConnection(CsName = "hangyong")] + public ActionResult Create2(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().CloseDialog().RefreshPage(); } } } diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs b/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs index 8b9c054..65244e2 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs @@ -36,7 +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.ClassA), + this.MakeGridHeader(x => x.ClassA).SetHide(), this.MakeGridHeaderAction(width: 200) }; } @@ -45,6 +45,7 @@ namespace HHWMS.Web { var dc2 = Wtm.CreateDC(cskey: "hangyong"); var query = dc2.Set() + .Where(x => x.WarehouseId == 6) .CheckContain(Searcher.Code, x => x.Code) .CheckContain(Searcher.Name, x => x.Name) .CheckContain(Searcher.Type, x => x.Type) diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2ListVM.cs b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2ListVM.cs index 33e78a7..5e0ee3a 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2ListVM.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptHeader2VMs/ReceiptHeader2ListVM.cs @@ -32,6 +32,8 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "xwms", dialogWidth: 800), this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "xwms", dialogWidth: 800), this.MakeStandardAction("ReceiptHeader2", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "xwms"), + this.MakeAction("ReceiptHeader2","Create2",Localizer["Sys.SDRCreate"],Localizer["Sys.SDRCreate"],GridActionParameterTypesEnum.NoId,"xwms") + , }; } @@ -111,7 +113,7 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs UserDef3 = x.UserDef3, Station = x.Station, }) - .OrderBy(x => x.ID); + .OrderByDescending(x => x.ID); return query; } diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Create2.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Create2.cshtml new file mode 100644 index 0000000..292eda1 --- /dev/null +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Create2.cshtml @@ -0,0 +1,35 @@ +@model HHWMS.Web.ReceiptDetail2VM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Models/XWMS/ShipmentDetail.cs b/HHWMS.Web/Models/XWMS/ShipmentDetail.cs index f9bac8e..9d31f75 100644 --- a/HHWMS.Web/Models/XWMS/ShipmentDetail.cs +++ b/HHWMS.Web/Models/XWMS/ShipmentDetail.cs @@ -48,18 +48,21 @@ namespace HHWMS.Web.Models /// 上游系统单号 /// [Column("sourceCode")] + [Display(Name = "ReceiptDetail2.SourceCode")] public string SourceCode { get; set; } /// /// 供应商编码 /// [Column("supplierCode")] + [Display(Name = "ReceiptDetail2.SupplierCode")] public string SupplierCode { get; set; } /// /// 供应商名称 /// [Column("supplierName")] + [Display(Name = "ReceiptDetail2.SupplierName")] public string SupplierName { get; set; } /// @@ -78,6 +81,7 @@ namespace HHWMS.Web.Models /// 上游系统行号 /// [Column("sourceLine")] + [Display(Name = "ReceiptDetail2.SourceLine")] public string SourceLine { get; set; } /// @@ -89,7 +93,8 @@ namespace HHWMS.Web.Models /// /// 出库单编码 /// - [Column("shipmentCode")] + [Column("shipmentCode")] + [Display(Name = "Inventory.ShipCode")] public string ShipmentCode { get; set; } /// @@ -102,24 +107,28 @@ namespace HHWMS.Web.Models /// 物料编码 /// [Column("materialCode")] + [Display(Name = "ReceiptDetail2.MaterialCode")] public string MaterialCode { get; set; } /// /// 物料名称 /// [Column("materialName")] + [Display(Name = "ReceiptDetail2.MaterialName")] public string MaterialName { get; set; } /// /// 批次 /// [Column("batch")] + [Display(Name = "ReceiptDetail2.Batch")] public string Batch { get; set; } /// /// 批号----规格 /// [Column("lot")] + [Display(Name = "ReceiptDetail2.Lot")] public string Lot { get; set; } /// @@ -156,12 +165,14 @@ namespace HHWMS.Web.Models /// 库存状态 /// [Column("inventoryStatus")] + [Display(Name = "ReceiptDetail2.InventoryStatus")] public string InventoryStatus { get; set; } /// /// 发货数量 /// [Column("qty")] + [Display(Name = "ReceiptDetail2.Qty")] public decimal? Qty { get; set; } /// @@ -174,18 +185,21 @@ namespace HHWMS.Web.Models /// 单位 /// [Column("unit")] + [Display(Name = "ReceiptDetail2.Unit")] public string Unit { get; set; } /// /// 物料单价 /// [Column("price")] + [Display(Name = "Bill.Price")] public decimal? Price { get; set; } /// /// 状态 /// [Column("status")] + [Display(Name = "ReceiptDetail2.Status")] public int? Status { get; set; } /// diff --git a/HHWMS.Web/Models/XWMS/ShipmentHeader.cs b/HHWMS.Web/Models/XWMS/ShipmentHeader.cs index cf04b6f..ac0235f 100644 --- a/HHWMS.Web/Models/XWMS/ShipmentHeader.cs +++ b/HHWMS.Web/Models/XWMS/ShipmentHeader.cs @@ -30,6 +30,7 @@ namespace HHWMS.Web.Models /// 出库单号 /// [Column("code")] + [Display(Name = "Inventory.ShipCode")] public string Code { get; set; } /// @@ -48,6 +49,7 @@ namespace HHWMS.Web.Models /// 上游系统单号 /// [Column("sourceCode")] + [Display(Name = "ReceiptDetail2.SourceCode")] public string SourceCode { get; set; } /// @@ -60,12 +62,14 @@ namespace HHWMS.Web.Models /// 出库单类型 /// [Column("type")] + [Display(Name = "ReceiptHeader2.Type")] public string Type { get; set; } /// /// 客户编码 /// [Column("shipTo")] + [Display(Name = "ReceiptDetail2.SupplierCode")] public string ShipTo { get; set; } /// @@ -84,12 +88,14 @@ namespace HHWMS.Web.Models /// 总数量 /// [Column("totalQty")] + [Display(Name = "ReceiptHeader2.TotalQty")] public decimal? TotalQty { get; set; } /// /// 总行数 /// [Column("totalLines")] + [Display(Name = "ReceiptHeader2.TotalLines")] public int? TotalLines { get; set; } /// @@ -108,6 +114,7 @@ namespace HHWMS.Web.Models /// 上传时间 /// [Column("uploadTime")] + [Display(Name = "ReceiptHeader2.UploadTime")] public System.DateTime? UploadTime { get; set; } /// @@ -120,18 +127,21 @@ namespace HHWMS.Web.Models /// 单据头状态 /// [Column("firstStatus")] + [Display(Name = "ReceiptHeader2.FirstStatus")] public int? FirstStatus { get; set; } /// /// 单据尾状态 /// [Column("lastStatus")] + [Display(Name = "ReceiptHeader2.LastStatus")] public int? LastStatus { get; set; } /// /// upload状态 /// [Column("uploadStatus")] + [Display(Name = "ReceiptHeader2.UploadStatus")] public int? UploadStatus { get; set; } /// @@ -168,6 +178,7 @@ namespace HHWMS.Web.Models /// 交易组 /// [Column("userDef4")] + [Display(Name = "ReceiptHeader2.UserDef5")] public string UserDef4 { get; set; } } } diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index 952c50b..6792690 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1491,4 +1491,10 @@ ERP对账 + + 手动入库 + + + 单价 +