From cc777cd1286d1eee998938905c926581c4073247 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 5 Jul 2023 18:42:04 +0800
Subject: [PATCH] update

---
 .../Identity/Controllers/BBAC_DNController.cs               | 2 +-
 .../Identity/Controllers/BBAC_DN_DETAILController.cs        | 2 +-
 .../Identity/Controllers/BBAC_SAController.cs               | 2 +-
 .../Identity/Controllers/BBAC_SE_DETAILController.cs        | 3 ++-
 .../WTA.Application/Identity/Controllers/BJ_DNController.cs | 2 +-
 .../Identity/Controllers/BJ_DN_DETAILController.cs          | 2 +-
 .../WTA.Application/Identity/Controllers/BJ_SAController.cs | 2 +-
 .../Identity/Controllers/BJ_SE_DETAILController.cs          | 3 ++-
 .../Identity/Controllers/HBPO_DNController.cs               | 2 +-
 .../Identity/Controllers/HBPO_DN_DETAILController.cs        | 2 +-
 .../Identity/Controllers/HBPO_SAController.cs               | 2 +-
 .../Identity/Controllers/HBPO_SE_DETAILController.cs        | 3 ++-
 .../Identity/Controllers/INVOICEController.cs               | 2 +-
 .../Identity/Controllers/INVOICE_DETAILController.cs        | 3 ++-
 .../WTA.Application/Identity/Controllers/IN_DNController.cs | 2 +-
 .../Identity/Controllers/IN_DN_DETAILController.cs          | 2 +-
 .../WTA.Application/Identity/Controllers/IN_SAController.cs | 2 +-
 .../Identity/Controllers/IN_SE_DETAILController.cs          | 3 ++-
 .../Identity/Controllers/JIT_DNController.cs                | 2 +-
 .../Identity/Controllers/JIT_DN_DETAILController.cs         | 2 +-
 .../Identity/Controllers/JIT_SAController.cs                | 2 +-
 .../Identity/Controllers/JIT_SE_DETAILController.cs         | 3 ++-
 docs/demo/src/WTA.Shared/Controllers/GenericController.cs   | 6 ++++--
 docs/demo/src/WTA/wwwroot/components/list/index.js          | 2 +-
 24 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs
index 66af8b40..8aa828cf 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs
@@ -17,7 +17,7 @@ public class BBAC_DNController : GenericController<BBAC_DN, BBAC_DN, BBAC_DN, BB
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs
index 1ebf6149..2f4d8e6a 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class BBAC_DN_DETAILController : GenericController<BBAC_DN_DETAIL, BBAC_D
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs
index bc5f2edb..0dfbecaa 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs
@@ -23,7 +23,7 @@ public class BBAC_SAController : GenericController<BBAC_SA, BBAC_SA, BBAC_SA, BB
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs
index 9c2d7920..b5981897 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class BBAC_SE_DETAILController : GenericController<BBAC_SE_DETAIL, BBAC_S
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs
index bcd674bf..836c4b27 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs
@@ -17,7 +17,7 @@ public class BJ_DNController : GenericController<BJ_DN, BJ_DN, BJ_DN, BJ_DN, BJ_
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs
index dfbb1cbe..1b2b0682 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class BJ_DN_DETAILController : GenericController<BJ_DN_DETAIL, BJ_DN_DETA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs
index dd092665..3bff1fc9 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs
@@ -23,7 +23,7 @@ public class BJ_SAController : GenericController<BJ_SA, BJ_SA, BJ_SA, BJ_SA, BJ_
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs
index a5e54cfc..78125e13 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class BJ_SE_DETAILController : GenericController<BJ_SE_DETAIL, BJ_SE_DETA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs
index a93ccd32..99e994cd 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs
@@ -17,7 +17,7 @@ public class HBPO_DNController : GenericController<HBPO_DN, HBPO_DN, HBPO_DN, HB
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs
index dea3d42d..fcd0bb3f 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class HBPO_DN_DETAILController : GenericController<HBPO_DN_DETAIL, HBPO_D
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs
index d6c3357a..f5fbd24d 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs
@@ -29,7 +29,7 @@ public class HBPO_SAController : GenericController<HBPO_SA, HBPO_SA, HBPO_SA, HB
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs
index e850f715..d4751b25 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class HBPO_SE_DETAILController : GenericController<HBPO_SE_DETAIL, HBPO_S
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs
index 5d660946..a3d9447e 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs
@@ -17,7 +17,7 @@ public class INVOICEController : GenericController<INVOICE, INVOICE, INVOICE, IN
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs
index 56ebeccf..17da7bad 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -15,7 +16,7 @@ public class INVOICE_DETAILController : GenericController<INVOICE_DETAIL, INVOIC
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs
index 0566d982..71fbff76 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs
@@ -17,7 +17,7 @@ public class IN_DNController : GenericController<IN_DN, IN_DN, IN_DN, IN_DN, IN_
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs
index 52fecf43..a3d41746 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class IN_DN_DETAILController : GenericController<IN_DN_DETAIL, IN_DN_DETA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs
index 3ddce4b8..51370924 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs
@@ -23,7 +23,7 @@ public class IN_SAController : GenericController<IN_SA, IN_SA, IN_SA, IN_SA, IN_
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs
index 5794ea57..ea07ce67 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class IN_SE_DETAILController : GenericController<IN_SE_DETAIL, IN_SE_DETA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs
index c057eb0f..8378e470 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs
@@ -17,7 +17,7 @@ public class JIT_DNController : GenericController<JIT_DN, JIT_DN, JIT_DN, JIT_DN
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs
index 4c137205..9896474b 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class JIT_DN_DETAILController : GenericController<JIT_DN_DETAIL, JIT_DN_D
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs
index 7f33f14f..f83c72a1 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs
@@ -23,7 +23,7 @@ public class JIT_SAController : GenericController<JIT_SA, JIT_SA, JIT_SA, JIT_SA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs
index 1a19d77c..5eeae3d5 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class JIT_SE_DETAILController : GenericController<JIT_SE_DETAIL, JIT_SE_D
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
index 44f90945..751810b6 100644
--- a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
+++ b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -180,7 +181,7 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
         }
     }
 
-    [HttpGet,AllowAnonymous, Multiple, Order(-2), HtmlClass("el-button--primary")]
+    [HttpGet, AllowAnonymous, Multiple, Order(-2), HtmlClass("el-button--primary")]
     public virtual IActionResult Import()
     {
         try
@@ -194,8 +195,9 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
         }
     }
 
+    [Consumes("multipart/form-data")]
     [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")]
-    public virtual IActionResult Import(IFormFile importexcelfile)
+    public virtual IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         try
         {
diff --git a/docs/demo/src/WTA/wwwroot/components/list/index.js b/docs/demo/src/WTA/wwwroot/components/list/index.js
index 958a933e..441f14fc 100644
--- a/docs/demo/src/WTA/wwwroot/components/list/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/list/index.js
@@ -235,7 +235,7 @@ export default {
                   <el-link type="primary" @click="getImportTemplate">{{$t('下载')}}</el-link>
                 </el-form-item>
                 <el-form-item :label="$t('文件')">
-                  <el-upload drag v-model="importModel.file">
+                  <el-upload drag v-model="importModel.file" :auto-upload="false">
                     <el-icon class="el-icon--upload"><ep-upload-filled /></el-icon>
                     <div class="el-upload__text">{{$t('拖放文件到此处或')}} <em>{{$t('点击上传')}}</em></div>
                   </el-upload>