打印过程修改

UAS-MES/PublicMethod/Print.cs

@@ -47,20 +47,20 @@ namespace UAS_MES.PublicMethod
                         int LoopTime = Param.Rows.Count > 100 ? 100 : Param.Rows.Count;
                         for (int j = 0; j < LoopTime; j++)
                         {
-                            for (int k = 0; k < doc.Variables.FormVariables.Count; k++)
+                            for (int k = j; k < doc.Variables.FormVariables.Count; k++)
                             {
-                                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;
-                                }
                                 //使用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;
+                                }
+                            }  
                         }
                     }
                     //否则只查询名称相等的参数赋值