From 5191309180c03a098f59f0a48c7571f6a971f98f Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 15 Nov 2023 16:15:49 +0800 Subject: [PATCH 1/2] swagger --- .../Controllers/mes/md/MdProductDefineController.cs | 7 ------- .../Controllers/mes/pro/ProWorkplanController.cs | 1 - 2 files changed, 8 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs index 97abbfcf..c66eff13 100644 --- a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs @@ -168,8 +168,6 @@ namespace ZR.Admin.WebApi.Controllers.mes.md [HttpPost("importExcel")] public IActionResult ImportExcel() { - - IFormFileCollection files = Request.Form.Files; foreach (IFormFile file in files) { @@ -193,11 +191,6 @@ namespace ZR.Admin.WebApi.Controllers.mes.md return null; } - public IActionResult importTemplate() - { - return null; - - } } } diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs index 6934e942..b8ae4dd7 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs @@ -173,7 +173,6 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro public IActionResult UpdateWorkorder([FromBody] ProWorkorder proWorkorder) { // TODO 判断更新的数量是否超过计划数 - int data = 0; if (proWorkorder != null) { From 9a4de72e62722e3da026bcc9694db178c6af1858 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 15 Nov 2023 16:25:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?swagger=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Extensions/SwaggerExtension.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs b/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs index a4c12f92..c083f40e 100644 --- a/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs +++ b/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs @@ -94,6 +94,8 @@ namespace ZR.Admin.WebApi.Extensions new List() } }); + + c.ResolveConflictingActions(apiDescriptions => apiDescriptions.First()); }); } }