提交代码

WCS.WebApi/Controllers/MatBaseInfoController.cs

@@ -82,6 +82,9 @@ namespace WCS.WebApi.Controllers
                 await excelFile.CopyToAsync(stream);
                 stream.Position = 0;
                 var list = MiniExcelLibs.MiniExcel.Query<MatBaseInfoImportModel>(stream, "物料管理", ExcelType.XLSX).ToList();
+                //去除空白行
+                list.RemoveAll(x => string.IsNullOrWhiteSpace(x.物料编码));
+
                 return await _matBaseInfoService.importMatBaseInfo(list, userName, deviceType);
             }
         }
@@ -134,5 +137,28 @@ namespace WCS.WebApi.Controllers
         {
             return await _matBaseInfoService.printedMatInfo(request);
         }
+
+
+        /// <summary>
+        /// 金川项目-编码获取 没得的就生成
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("JinChuanGenerateMatInfo")]
+        public async Task<ResponseBase> JinChuanGenerateMatInfo(JinChuanGenerateMatInfoRequest request)
+        {
+            return await _generateMatInfoService.JinChuanGenerateMatInfo(request);
+        }
+
+        /// <summary>
+        /// 金川项目-扫描解析生成打印
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("JinChuanCommitMatInfo")]
+        public async Task<ResponseBase> JinChuanCommitMatInfo(JinChuanCommitMatInfoRequest request)
+        {
+            return await _generateMatInfoService.JinChuanCommitMatInfo(request);
+        }
     }
 }