diff --git a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml index e70349b..60ffa54 100644 --- a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml @@ -112,6 +112,7 @@ } if (_this.clear) { _this.gendCode = ""; + _this.invTable = []; _this.printData = []; } }, diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs index 66467a7..892fe88 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs @@ -52,6 +52,7 @@ namespace HHWMS.Web.Controllers { var vm = Wtm.CreateVM(); vm.Entity.Code = _unitwork.GetSerialNumber("R"); + vm.Entity.BillType = "In"; vm.Entity.AppointmentTime = DateTime.Now; return PartialView(vm); } @@ -66,6 +67,10 @@ namespace HHWMS.Web.Controllers } else { + if(_unitwork.IsExit(x => x.Code == vm.Entity.Code)) + { + return FFResult().Alert($"入库单号 {vm.Entity.Code} 重复!"); + } vm.Entity.FirstStatus = ReceiptStatusEnum.新建; vm.DoAdd(); if (!ModelState.IsValid) diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml index 68d344d..c0946e6 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml @@ -4,7 +4,7 @@ @* *@ - + @* diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Edit.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Edit.cshtml index 025c41b..aa6f6b1 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Edit.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Edit.cshtml @@ -1,11 +1,11 @@ -@model HHWMS.Web.ReceiptHeaderVM +@model HHWMS.Web.ReceiptHeaderVM @inject IStringLocalizer Localizer; - - + +