From 22af5bed0da8a5852bd824a1e21e6fc43df6df2a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 11 十二月 2023 19:20:43 +0800
Subject: [PATCH] 1.App 智能分析,生产进度看板接口 2.PC端设备点检项目、保养项目、点检标准、保养标准、点检记录、保养记录、维修记录 3.工序检验扫码添加判断(条码任务是否存在、工单是否关闭) 4.添加App图标图片文件

---
 VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
index c8df2f4..b33f3d0 100644
--- a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
@@ -68,8 +68,14 @@
                 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);
@@ -103,7 +109,7 @@
 
 
             mes.code = StuCode;
-            mes.Message = Message;
+            mes.message = Message;
 
             return mes;
         }
@@ -166,8 +172,14 @@
                 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);
@@ -256,8 +268,14 @@
                 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);
@@ -288,7 +306,7 @@
             }
 
             mes.code = StuCode;
-            mes.Message = Message;
+            mes.message = Message;
             return mes;
         }
         #endregion

--
Gitblit v1.9.3