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/Controllers/ImportExcelController.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/VueWebCoreApi/Controllers/ImportExcelController.cs b/VueWebCoreApi/Controllers/ImportExcelController.cs
index 3d67241..16276d0 100644
--- a/VueWebCoreApi/Controllers/ImportExcelController.cs
+++ b/VueWebCoreApi/Controllers/ImportExcelController.cs
@@ -15,7 +15,7 @@
[ApiExplorerSettings(GroupName = "Excel瀵煎叆")]
[ApiController]
[Route("api/[controller]")]
- //[ChannelActionFilter]
+ [ChannelActionFilter]
public class ImportExcelController : Controller
{
@@ -84,12 +84,12 @@
list.json2 = list.json2;
return Json(list);
}
- //list.json3 = ExcelCheckData(myModel); //鏁版嵁楠岃瘉
- //if (list.json3.code == "300")
- //{
- // list.json3 = list.json3;
- // return Json(list);
- //}
+ list.json3 = ExcelImportSubmit(dataTable, FileCode); //鏁版嵁瀵煎叆
+ if (list.json3.code == "300")
+ {
+ list.json3 = list.json3;
+ return Json(list);
+ }
return Json(list);
}
#endregion
@@ -119,7 +119,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return mes;
}
@@ -145,7 +145,7 @@
List<DataTable> dataTable = myModel.TableData;
list = ExcelCheckBLL.ExcelCheckData(FileCode, dataTable, out StuCode, out message, out count);
mes.code = StuCode;
- mes.Message = message;
+ mes.message = message;
mes.count = count;
mes.data = list;
return mes;
@@ -179,7 +179,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return mes;
}
--
Gitblit v1.9.3