VueWebApi/Tools/ImportExcelData.cs
@@ -1271,7 +1271,7 @@
                return Message;
            }
            else if (excelTable[0].Columns.Count != 10)
            else if (excelTable[0].Columns.Count != 9)
            {
                code = "300";
                Message = "节拍工价模板不符合规范,请检查列名字段数";
@@ -2408,8 +2408,8 @@
                }
                //判断工艺路线是否关联工序
                sql = @"select R.name,S.stepname  from TFlw_Rtdt A
                        inner join TFlw_Rout R on A.route_code=M.code
                        inner join TStep S on R.step_code=S.stepcode
                        inner join TFlw_Rout R on A.rout_code=R.code
                        inner join TStep S on A.step_code=S.stepcode
                        where R.name=@routename and S.stepname=@stepname";
                dynamicParams.Add("@routename", excelTable.Rows[i][2].ToString().Trim());
                dynamicParams.Add("@stepname", excelTable.Rows[i][3].ToString().Trim());
@@ -2423,7 +2423,7 @@
                    list.Add(erro);
                }
                //判断工序是否关联设备
               sql = @"select R.name,S.stepname  from TFlw_Rteqp A
               sql = @"select E.name,S.stepname  from TFlw_Rteqp A
                        inner join TStep S on A.step_code=S.stepcode
                        inner join TEqpInfo E on A.eqp_code=E.code
                        where S.stepname=@stepname and E.name=@eqpname";
@@ -3312,7 +3312,7 @@
                    var data = DapperHelper.selectdata(sql, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
                        partcode = data.Rows[0]["partname"].ToString();
                        partcode = data.Rows[0]["partcode"].ToString();
                    }
                    else 
                    {
@@ -3326,7 +3326,7 @@
                    var data0 = DapperHelper.selectdata(sql, dynamicParams);
                    if (data0.Rows.Count > 0)
                    {
                        routecode = data.Rows[0]["code"].ToString();
                        routecode = data0.Rows[0]["code"].ToString();
                    }
                    else
                    {
@@ -3340,7 +3340,7 @@
                    var data1 = DapperHelper.selectdata(sql, dynamicParams);
                    if (data1.Rows.Count > 0)
                    {
                        stepcode = data.Rows[0]["stepcode"].ToString();
                        stepcode = data1.Rows[0]["stepcode"].ToString();
                    }
                    else
                    {
@@ -3354,7 +3354,7 @@
                    var data4 = DapperHelper.selectdata(sql, dynamicParams);
                    if (data4.Rows.Count > 0)
                    {
                        eqpcode = data.Rows[0]["code"].ToString();
                        eqpcode = data4.Rows[0]["code"].ToString();
                    }
                    else
                    {
@@ -3368,7 +3368,7 @@
                    var data5 = DapperHelper.selectdata(sql, dynamicParams);
                    if (data5.Rows.Count > 0)
                    {
                        wkspcode = data.Rows[0]["wksp_code"].ToString();
                        wkspcode = data5.Rows[0]["wksp_code"].ToString();
                    }
                    else
                    {