产品定义原始完工

ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs

@@ -1,4 +1,5 @@
 using CSRedis;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
@@ -130,7 +131,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
         /// <param name="productName"></param>
         /// <returns></returns>
         [HttpGet("exportProduct")]
-        public IActionResult ExportProduct(DateTime starttime, DateTime endtime, string productCode="", string productName = "")
+        public IActionResult ExportProduct(DateTime starttime, DateTime endtime, string productCode = "", string productName = "")
         {
             List<MdProductDefine> units = null;
 
@@ -141,6 +142,46 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
             return ExportExcel(result.Item2, result.Item1);
 
         }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="updateSupport">0：只新增 1：新增且更新</param>
+        /// <returns></returns>
+        [HttpPost("importExcel")]
+        public IActionResult ImportExcel()
+        {
+
+
+            IFormFileCollection files = Request.Form.Files;
+            foreach (IFormFile file in files)
+            {
+                string directory = Path.Combine(App.WebHostEnvironment.ContentRootPath, "Images");
+                string fileExtension = Path.GetExtension(file.FileName);
+                string fileName = Guid.NewGuid().ToString() + fileExtension;
+                string filePath = Path.Combine(directory, fileName);// 生成文件路径
+
+                if (!Directory.Exists(directory))
+                {
+                    Directory.CreateDirectory(directory);
+                }
+
+                // 写入文件
+                using (var stream = new FileStream(filePath, FileMode.Create))
+                {
+                    file.CopyTo(stream);
+                    stream.Flush();
+                }
+            }
+            return null;
+        }
+
+        public IActionResult importTemplate()
+        {
+            return null;
+
+        }
     }
 
 }

ZR.Admin.WebApi/Controllers/mes/md/MdUnitController.cs

@@ -104,18 +104,17 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
         public IActionResult exportUnit([FromQuery] SearchOptionDTO searchOption)
         {
             List<MdUnit> units = null;
-            if(searchOption != null)
+            if (searchOption != null)
             {
-                units= unitService.GetList(searchOption);
+                units = unitService.GetList(searchOption);
             }
 
             var result = ExportExcelMini(units, "unit", "单位列表");
             return ExportExcel(result.Item2, result.Item1);
-       
+
         }
 
-
-
+  
 
     }