打印参数修改

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -30,6 +30,8 @@ namespace UAS_MES.Make
 
         DataTable dt;
 
+        Document doc;
+
         private System.DateTime[] indate;
 
         string ErrMessage;
@@ -246,7 +248,8 @@ namespace UAS_MES.Make
                                     if (PrintLabel.Items.Count != 0)
                                     {
                                         OperateResult.AppendText(">>打印序列号" + sn_code.Text + "\n", Color.Black);
-                                        Print.CodeSoft(Tag.ToString(), lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                                        doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text.Split(':')[1]);
+                                        Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
                                         dh.UpdateByCondition("makeserial", "ms_printcount=nvl(ms_printcount,0)+1", "ms_sncode='" + sn_code.Text + "'");
                                     }
                                     else OperateResult.AppendText(">>" + pr_code.Text + "未维护标签\n", Color.Black);

UAS-MES/PublicMethod/Print.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.IO;
 using UAS_MES.Entity;
 using System.Windows;
+using System.Text.RegularExpressions;
 
 namespace UAS_MES.PublicMethod
 {
@@ -41,7 +42,12 @@ namespace UAS_MES.PublicMethod
                         string sql = dt.Rows[j]["lp_sql"].ToString();
                         try
                         {
-                            sql = sql.Substring(0, sql.IndexOf("{")) + "'" + SnCode + "'";
+                            Regex ConnoteA = new Regex("{\\w+}");
+                            foreach (Match mch in ConnoteA.Matches(sql))
+                            {
+                                string x = mch.Value.Trim();
+                                sql = sql.Replace(x,"'" + SnCode + "'");
+                            }
                             doc.Variables.FormVariables.Item(i + 1).Value = dh.GetLabelParam(sql).ToString();
                             sb.AppendLine("打印参数【" + doc.Variables.FormVariables.Item(i + 1).Name + "】赋值，" + "取值SQL:" + sql + "，取到值" + doc.Variables.FormVariables.Item(i + 1).Value);
                         }
@@ -80,7 +86,12 @@ namespace UAS_MES.PublicMethod
                         string sql = dt.Rows[j]["lp_sql"].ToString();
                         try
                         {
-                            sql = sql.Substring(0, sql.IndexOf("{")) + "'" + SnCode + "'";
+                            Regex ConnoteA = new Regex("{\\w+}");
+                            foreach (Match mch in ConnoteA.Matches(sql))
+                            {
+                                string x = mch.Value.Trim();
+                                sql = sql.Replace(x, "'" + SnCode + "'");
+                            }
                             doc.Variables.FormVariables.Item(i + 1).Value = dh.GetLabelParam(sql).ToString();
                             sb.AppendLine("打印参数【" + doc.Variables.FormVariables.Item(i + 1).Name + "】赋值，" + "取值SQL:" + sql + "，取到值" + doc.Variables.FormVariables.Item(i + 1).Value);
                         }