VueWebCoreApi/Tools/ImportExcelData.cs
@@ -3479,8 +3479,8 @@
                var dt3 = from r in excelTable[1].AsEnumerable()
                          where !(
                              from rr in excelTable[0].AsEnumerable()
                              select rr.Field<string>("*模具编号(唯一)")
                          ).Contains(r.Field<string>("模具编码"))
                              select rr.Field<string>("*模具编号(唯一)").Trim()
                          ).Contains(r.Field<string>("模具编码").Trim())
                          select r;
                List<DataRow> listRow = dt3.ToList();
                if (listRow.Count > 0)
@@ -3605,7 +3605,7 @@
                        list.Add(erro);
                    }
                    //通过模具点检标准页签模板中的标准编码查询模具点检项页签模板中对应的数据信息
                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*模具点检标准编号"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*模具点检标准编号"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
                    DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
                    if (ds.Rows.Count > 0)
                    {
@@ -3635,15 +3635,16 @@
            {
                if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
                {
                    sql = @"select *  from TMouldchk_Item where code=@code";
                    sql = @"select *  from TMouldchk_Item where code=@code and name=@name";
                    dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
                    dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count < 0)
                    if (dt.Rows.Count <= 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{*模具点检项编号(唯一)}";
                        erro.ErrorCont = "模具点检部位表:{*模具点检项编号(唯一)}字段" + excelTable[1].Rows[k][2].ToString().Trim() + "在数据表中不存在";
                        erro.ErrorCont = "模具点检部位表:{*模具点检项编号(唯一),*模具点检项名称}字段{" + excelTable[1].Rows[k][2].ToString().Trim() +","+ excelTable[1].Rows[k][3].ToString().Trim() + "}在模具点检项中不存在";
                        list.Add(erro);
                    }
                }
@@ -3652,8 +3653,8 @@
            var dt3 = from r in excelTable[1].AsEnumerable()
                      where !(
                          from rr in excelTable[0].AsEnumerable()
                          select rr.Field<string>("*模具点检标准编号(唯一)")
                      ).Contains(r.Field<string>("*模具点检标准编号"))
                          select rr.Field<string>("*模具点检标准编号(唯一)").Trim()
                      ).Contains(r.Field<string>("*模具点检标准编号").Trim())
                      select r;
            List<DataRow> listRow = dt3.ToList();
            if (listRow.Count > 0)
@@ -3777,7 +3778,7 @@
                        list.Add(erro);
                    }
                    //通过模具保养标准页签模板中的标准编码查询模具保养项页签模板中对应的数据信息
                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*模具保养标准编号"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*模具保养标准编号"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
                    DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
                    if (ds.Rows.Count > 0)
                    {
@@ -3807,15 +3808,16 @@
            {
                if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
                {
                    sql = @"select *  from TMouldmai_Item where code=@code";
                    sql = @"select *  from TMouldmai_Item where code=@code and name=@name";
                    dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
                    dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count < 0)
                    if (dt.Rows.Count <= 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{*模具保养项编号(唯一)}";
                        erro.ErrorCont = "模具保养部位表:{*模具保养项编号(唯一)}字段" + excelTable[1].Rows[k][2].ToString().Trim() + "在数据表中不存在";
                        erro.ErrorCont = "模具保养部位表:{*模具保养项编号(唯一),*模具保养项名称}字段{" + excelTable[1].Rows[k][2].ToString().Trim() + "," + excelTable[1].Rows[k][3].ToString().Trim() + "}在模具保养项中不存在";
                        list.Add(erro);
                    }
                }
@@ -3824,8 +3826,8 @@
            var dt3 = from r in excelTable[1].AsEnumerable()
                      where !(
                          from rr in excelTable[0].AsEnumerable()
                          select rr.Field<string>("*模具保养标准编号(唯一)")
                      ).Contains(r.Field<string>("*模具保养标准编号"))
                          select rr.Field<string>("*模具保养标准编号(唯一)").Trim()
                      ).Contains(r.Field<string>("*模具保养标准编号").Trim())
                      select r;
            List<DataRow> listRow = dt3.ToList();
            if (listRow.Count > 0)