修改设备保养项(去除保养周期) 新增设备保养App扫描设备(工位)接口

yl

2022-08-29 36ce82f94805fb73459ac28aaa4ebdb5900c8d65

 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()
                        }