自定义标签打印参数取值修改

UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -211,13 +211,13 @@ namespace UAS_MES.Make
                         OperateResult.AppendText("<<打印成功\n", Color.Green);
                         //重置currenIndex为1
                         currentIndex = 1;
-                        OperateResult.AppendText(">>请输入自定义模板的" + paramsInfo.Rows[0]["lp_name"].ToString() + "\n", Color.Black);
+                        OperateResult.AppendText(">>请输入自定义模板的" + paramsInfo.Rows[0]["lp_name"].ToString() + "所需参数\n", Color.Black);
                     }
                     else
                     {
                         canPrint = false;
                         currentIndex++;
-                        OperateResult.AppendText("<<请输入自定义模板的" + paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString() + "\n", Color.Green, inputText);
+                        OperateResult.AppendText("<<请输入自定义模板的" + paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString() + "所需参数\n", Color.Green, inputText);
                     }
                 }
             }
@@ -229,13 +229,13 @@ namespace UAS_MES.Make
             {
                 return;
             }
-            paramsInfo = (DataTable)dh.ExecuteSql("select lp_detno, lp_name, lp_valuetype,lp_sql from label left join labelparameter on lp_laid=la_id where la_code='" + listA.Rows[PrintLabel.SelectedIndex]["la_code"].ToString() + "' order by lp_detno asc", "select");
+            paramsInfo = (DataTable)dh.ExecuteSql("select lp_detno, lp_name, lp_valuetype,lp_sql from label left join labelparameter on lp_laid=la_id where la_code='" + listA.Rows[PrintLabel.SelectedIndex]["la_code"].ToString() + "'and LA_TEMPLATETYPE = '自定义' order by lp_detno asc", "select");
             if (paramsInfo.Rows.Count > 0)
             {
                 //根据查询出来的参数，一次提示用户, “<<SN001 “, 
                 //“>> 请输入自定义模板的(XXXX参数名称)lp_name”
                 OperateResult.AppendText("<<" + listA.Rows[PrintLabel.SelectedIndex]["la_code"].ToString() + "\n", Color.Black);
-                OperateResult.AppendText(">>请输入自定义模板" + paramsInfo.Rows[0]["lp_name"].ToString() + "的值\n", Color.Green);
+                OperateResult.AppendText(">>请输入自定义模板" + paramsInfo.Rows[0]["lp_name"].ToString() + "所需参数\n", Color.Green);
                 //打开模板路径
                 currentIndex = 1;
                 //聚焦输入框

UAS_MES_NEW/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -211,13 +211,13 @@ namespace UAS_MES_NEW.Make
                         OperateResult.AppendText("<<打印成功\n", Color.Green);
                         //重置currenIndex为1
                         currentIndex = 1;
-                        OperateResult.AppendText(">>请输入自定义模板的" + paramsInfo.Rows[0]["lp_name"].ToString() + "\n", Color.Black);
+                        OperateResult.AppendText(">>请输入自定义模板的" + paramsInfo.Rows[0]["lp_name"].ToString() + "所需参数\n", Color.Black);
                     }
                     else
                     {
                         canPrint = false;
                         currentIndex++;
-                        OperateResult.AppendText("<<请输入自定义模板的" + paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString() + "\n", Color.Green, inputText);
+                        OperateResult.AppendText("<<请输入自定义模板的" + paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString() + "所需参数\n", Color.Green, inputText);
                     }
                 }
             }
@@ -229,13 +229,13 @@ namespace UAS_MES_NEW.Make
             {
                 return;
             }
-            paramsInfo = (DataTable)dh.ExecuteSql("select lp_detno, lp_name, lp_valuetype,lp_sql from label left join labelparameter on lp_laid=la_id where la_code='" + listA.Rows[PrintLabel.SelectedIndex]["la_code"].ToString() + "' order by lp_detno asc", "select");
+            paramsInfo = (DataTable)dh.ExecuteSql("select lp_detno, lp_name, lp_valuetype,lp_sql from label left join labelparameter on lp_laid=la_id where la_code='" + listA.Rows[PrintLabel.SelectedIndex]["la_code"].ToString() + "'and LA_TEMPLATETYPE = '自定义' order by lp_detno asc", "select");
             if (paramsInfo.Rows.Count > 0)
             {
                 //根据查询出来的参数，一次提示用户, “<<SN001 “, 
                 //“>> 请输入自定义模板的(XXXX参数名称)lp_name”
                 OperateResult.AppendText("<<" + listA.Rows[PrintLabel.SelectedIndex]["la_code"].ToString() + "\n", Color.Black);
-                OperateResult.AppendText(">>请输入自定义模板" + paramsInfo.Rows[0]["lp_name"].ToString() + "的值\n", Color.Green);
+                OperateResult.AppendText(">>请输入自定义模板" + paramsInfo.Rows[0]["lp_name"].ToString() + "所需参数\n", Color.Green);
                 //打开模板路径
                 currentIndex = 1;
                 //聚焦输入框
@@ -283,7 +283,7 @@ namespace UAS_MES_NEW.Make
                     string update = "la_lastwritetime = to_date((regexp_substr('" + filechangetime + "','\\d+.+\\d+')),'yyyy-mm-dd hh24:mi:ss')";
                     dh.UpdateByCondition("label", update, "la_id = '" + listA.Rows[PrintLabel.SelectedIndex]["la_id"].ToString() + "'");
                 }
-                doc = lbl.Documents.Open(listA.Rows[PrintLabel.SelectedIndex]["la_url"].ToString(),true);
+                doc = lbl.Documents.Open(listA.Rows[PrintLabel.SelectedIndex]["la_url"].ToString(), true);
                 sb = new StringBuilder();
                 //将值赋到doc对应的变量
                 for (int i = 0; i < doc.Variables.FormVariables.Count; i++)