Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/wms/config/storagemaintenance.vue

@@ -412,7 +412,7 @@ export default {
         loadexcel() {
             axios
                 .request({
-                    url: "/config/Download/GetTemplate?name=StorageLocation",
+                    url: "/wms/Location/DownloadTemplate",
                     method: "get",
                 })
                 .then((res) => {

Server/Apis/Siger.ApiWMS/Controllers/LocationController.cs

@@ -546,7 +546,14 @@ namespace Siger.ApiWMS.Controllers
         [HttpGet]
         public IActionResult DownloadTemplate()
         {
-            var list = new List<List<string>>() { GetExcelTitle() };
+            var data = new List<string>(){
+                "*ID",
+                "*仓库名称"
+            };
+            var range = locationtype.GetList(f => f.status == (int)RowState.Valid && f.projectid == ProjectId).OrderBy(f => f.id).Select(f => "*" + f.name).ToList();
+            data.AddRange(range);
+
+            var list = new List<List<string>>() { data };
 
             var fileName = Utility.GetExcelFileName("Location");
             CommonExcelHelper.Generate(list, fileName);