Hcsy 8 vuotta sitten
vanhempi
commit
05f7b5ddae
1 muutettua tiedostoa jossa 18 lisäystä ja 20 poistoa
  1. 18 20
      UAS-MES/PublicMethod/Print.cs

+ 18 - 20
UAS-MES/PublicMethod/Print.cs

@@ -42,39 +42,37 @@ namespace UAS_MES.PublicMethod
                     if (Param.Rows.Count == 0)
                         return;
                     //查询的结果的参数个数大于1需要给标签的多个参数赋值
-                    if (Param.Rows.Count > 1)
+                    if (Param.Rows.Count > 0)
                     {
                         int LoopTime = Param.Rows.Count > 100 ? 100 : Param.Rows.Count;
                         for (int j = 0; j < LoopTime; j++)
                         {
-                            for (int k = j; k < doc.Variables.FormVariables.Count; k++)
+                            for (int k = 0; k < doc.Variables.FormVariables.Count; k++)
                             {
+                                if (j == 0 & doc.Variables.FormVariables.Item(k + 1).Name == dt.Rows[i]["lp_name"].ToString())
+                                {
+                                    doc.Variables.FormVariables.Item(k + 1).Value = Param.Rows[0][0].ToString();
+                                }
                                 //使用SN开头的参数赋值SN1,SN2,SN3等参数
                                 if (doc.Variables.FormVariables.Item(k + 1).Name == dt.Rows[i]["lp_name"].ToString() + j)
                                 {
                                     doc.Variables.FormVariables.Item(k + 1).Value = Param.Rows[j][0].ToString();
-                                    break;
-                                }
-                                if (doc.Variables.FormVariables.Item(k + 1).Name == dt.Rows[i]["lp_name"].ToString())
-                                {
-                                    doc.Variables.FormVariables.Item(k + 1).Value = Param.Rows[0][0].ToString();
-                                    break;
                                 }
-                            }  
-                        }
-                    }
-                    //否则只查询名称相等的参数赋值
-                    else
-                    {
-                        for (int j = 0; j < doc.Variables.FormVariables.Count; j++)
-                        {
-                            if (doc.Variables.FormVariables.Item(j + 1).Name == dt.Rows[i]["lp_name"].ToString())
-                            {
-                                doc.Variables.FormVariables.Item(j + 1).Value = Param.Rows[0][0].ToString();
-                                break;
                             }
                         }
                     }
+                    ////否则只查询名称相等的参数赋值
+                    //else
+                    //{
+                    //    for (int j = 0; j < doc.Variables.FormVariables.Count; j++)
+                    //    {
+                    //        if (doc.Variables.FormVariables.Item(j + 1).Name == dt.Rows[i]["lp_name"].ToString())
+                    //        {
+                    //            doc.Variables.FormVariables.Item(j + 1).Value = Param.Rows[0][0].ToString();
+                    //            break;
+                    //        }
+                    //    }
+                    //}
                 }
                 catch (System.Exception)
                 {