From d1781f73261e2ae8241a06f9b7047d287ab951bb Mon Sep 17 00:00:00 2001 From: zgf Date: Wed, 21 Feb 2024 13:33:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=8A=A0=E9=99=90=E5=88=B6=EF=BC=8C=E6=89=93=E5=8D=B0=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=89=93=E5=8D=B0=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=AB=E6=8F=8F=E6=B8=85=E7=A9=BA=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml | 1 + .../Areas/Receipt/Controllers/ReceiptHeaderController.cs | 5 +++++ HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml | 2 +- HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Edit.cshtml | 6 +++--- 4 files changed, 10 insertions(+), 4 deletions(-) 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; - - + +