From 36ce82f94805fb73459ac28aaa4ebdb5900c8d65 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 29 八月 2022 17:24:08 +0800
Subject: [PATCH] 修改设备保养项(去除保养周期) 新增设备保养App扫描设备(工位)接口
---
VueWebApi/Tools/ImportExcelData.cs | 52 +++++++++++++++++++++++-----------------------------
1 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 0057bdd..4d64a78 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -737,19 +737,13 @@
Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕淇濆吇椤圭洰鍚嶇О}";
return Message;
}
- else if (excelTable[0].Columns[3].ColumnName != "淇濆吇鍛ㄦ湡")
- {
- code = "300";
- Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕淇濆吇鍛ㄦ湡}";
- return Message;
- }
- else if (excelTable[0].Columns[4].ColumnName != "鏄惁鎵爜")
+ else if (excelTable[0].Columns[3].ColumnName != "鏄惁鎵爜")
{
code = "300";
Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
return Message;
}
- else if (excelTable[0].Columns[5].ColumnName != "淇濆吇椤圭洰瑕佹眰")
+ else if (excelTable[0].Columns[4].ColumnName != "淇濆吇椤圭洰瑕佹眰")
{
code = "300";
Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕淇濆吇椤圭洰瑕佹眰}";
@@ -2727,26 +2721,26 @@
for (int i = 0; i < excelTable.Rows.Count; i++)
{
string Type = "", IsScan = "";
- switch (excelTable.Rows[i][3].ToString().Trim())
- {
- case "骞�":
- Type = "Y";
- break;
- case "瀛�":
- Type = "S";
- break;
- case "鏈�":
- Type = "M";
- break;
- case "鍛�":
- Type = "W";
- break;
- case "鏃�":
- Type = "D";
- break;
- default:
- break;
- }
+ //switch (excelTable.Rows[i][3].ToString().Trim())
+ //{
+ // case "骞�":
+ // Type = "Y";
+ // break;
+ // case "瀛�":
+ // Type = "S";
+ // break;
+ // case "鏈�":
+ // Type = "M";
+ // break;
+ // case "鍛�":
+ // Type = "W";
+ // break;
+ // case "鏃�":
+ // Type = "D";
+ // break;
+ // default:
+ // break;
+ //}
switch (excelTable.Rows[i][4].ToString().Trim())
{
case "鏄�":
@@ -2769,7 +2763,7 @@
name = excelTable.Rows[i][2].ToString().Trim(),
descr = excelTable.Rows[i][5].ToString().Trim(),
isscan = IsScan,
- cycle = Type,
+ cycle = "",
Operator = User,
CreateDate = DateTime.Now.ToString()
}
--
Gitblit v1.9.3