From ecebb28b60d49eeac50dfa3c9a812a0a221e55ae Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 13 十月 2023 16:07:49 +0800
Subject: [PATCH] 1.通用基础资料:增加模具检验项目、保养项目下拉接口 2.模具管理:点检项目、点检标准、保养项目、保养标准、导入接口
---
VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
index 454b8e1..54cfec8 100644
--- a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
@@ -62,14 +62,20 @@
case "23"://璁惧淇濆吇鏍囧噯
Message = ImportExcelData.TwentyThree(savePath, out StuCode);
break;
- case "12"://宸ヨ娓呭崟
- Message = ImportExcelData.Twelve(savePath, out StuCode);
+ case "12"://妯″叿娓呭崟
+ Message = ImportExcelData.Twelve(dataTable, out StuCode);
break;
- case "13"://宸ヨ鐐规
- Message = ImportExcelData.Thirteen(savePath, out StuCode);
+ case "13"://妯″叿鐐规椤圭洰
+ Message = ImportExcelData.Thirteen(dataTable, out StuCode);
break;
- case "14"://宸ヨ淇濆吇
- Message = ImportExcelData.Fourteen(savePath, out StuCode);
+ case "13_1"://妯″叿鐐规鏍囧噯
+ Message = ImportExcelData.Thirteen_one(dataTable, out StuCode);
+ break;
+ case "14"://妯″叿淇濆吇椤圭洰
+ Message = ImportExcelData.Fourteen(dataTable, out StuCode);
+ break;
+ case "14_1"://妯″叿淇濆吇鏍囧噯
+ Message = ImportExcelData.Fourteen_one(dataTable, out StuCode);
break;
case "15"://宸ュ簭瀹氫箟
Message = ImportExcelData.Fifteen(dataTable, out StuCode);
@@ -160,14 +166,20 @@
case "23"://璁惧淇濆吇鏍囧噯
list = ImportExcelData.TwentyThreeData(savePath, out stuCode, out message, out count);
break;
- case "12"://宸ヨ娓呭崟
- list = ImportExcelData.TwelveData(savePath, out stuCode, out message, out count);
+ case "12"://妯″叿娓呭崟
+ list = ImportExcelData.TwelveData(dataTable, out stuCode, out message, out count);
break;
- case "13"://宸ヨ鐐规
- list = ImportExcelData.ThirteenData(savePath, out stuCode, out message, out count);
+ case "13"://妯″叿鐐规椤圭洰
+ list = ImportExcelData.ThirteenData(dataTable, out stuCode, out message, out count);
break;
- case "14"://宸ヨ淇濆吇
- list = ImportExcelData.FourteenData(savePath, out stuCode, out message, out count);
+ case "13_1"://妯″叿鐐规鏍囧噯
+ list = ImportExcelData.Thirteen_oneData(dataTable, out stuCode, out message, out count);
+ break;
+ case "14"://妯″叿淇濆吇椤圭洰
+ list = ImportExcelData.FourteenData(dataTable, out stuCode, out message, out count);
+ break;
+ case "14_1"://妯″叿淇濆吇鏍囧噯
+ list = ImportExcelData.FourteenData_one(dataTable, out stuCode, out message, out count);
break;
case "15"://宸ュ簭瀹氫箟
list = ImportExcelData.FifteenData(dataTable, out stuCode, out message, out count);
@@ -250,14 +262,20 @@
case "23"://璁惧淇濆吇鏍囧噯
Message = ImportExcelData.TwentyThreeSubmit(savePath, User, out StuCode);
break;
- case "12"://宸ヨ娓呭崟
- Message = ImportExcelData.TwelveSubmit(savePath, User, out StuCode);
+ case "12"://妯″叿娓呭崟
+ Message = ImportExcelData.TwelveSubmit(dataTable, us, out StuCode);
break;
- case "13"://宸ヨ鐐规
- Message = ImportExcelData.ThirteenSubmit(savePath, User, out StuCode);
+ case "13"://妯″叿鐐规椤圭洰
+ Message = ImportExcelData.ThirteenSubmit(dataTable, us, out StuCode);
break;
- case "14"://宸ヨ淇濆吇
- Message = ImportExcelData.FourteenSubmit(savePath, User, out StuCode);
+ case "13_1"://妯″叿鐐规鏍囧噯
+ Message = ImportExcelData.Thirteen_oneSubmit(dataTable, us, out StuCode);
+ break;
+ case "14"://妯″叿淇濆吇椤圭洰
+ Message = ImportExcelData.FourteenSubmit(dataTable, us, out StuCode);
+ break;
+ case "14_1"://妯″叿淇濆吇鏍囧噯
+ Message = ImportExcelData.Fourteen_oneSubmit(dataTable, us, out StuCode);
break;
case "15"://宸ュ簭瀹氫箟
Message = ImportExcelData.FifteenSubmit(dataTable, us, out StuCode);
--
Gitblit v1.9.3