修改产地字段取值

UAS-出货标签管理/UAS_出货标签管理.cs

@@ -152,11 +152,6 @@ namespace UAS_LabelMachine
             }
         }
 
-        private void RefreshDB(object sender, EventArgs e)
-        {
-            DataHelper dh = new DataHelper();
-        }
-
         private void 贴标机条码打印_Load(object sender, EventArgs e)
         {
             //杀死之前全部未关闭的进程
@@ -1194,6 +1189,8 @@ namespace UAS_LabelMachine
                             StringBuilder ParamLog = new StringBuilder();
                             for (int j = 0; j < SingleDoc.Variables.FreeVariables.Count; j++)
                             {
+                                if (arg.Contains(SingleDoc.Variables.FreeVariables.Item(j + 1).Name))
+                                    SingleDoc.Variables.FreeVariables.Item(j + 1).Value = dr[0][SingleDoc.Variables.FreeVariables.Item(j + 1).Name].ToString();
                                 if (SingleDoc.Variables.FreeVariables.Item(j + 1).Name.ToLower().Contains("datecode1"))
                                 {
                                     if (LabelInf.Rows[i].Cells["pib_datecode1"].Value != null)
@@ -1219,8 +1216,6 @@ namespace UAS_LabelMachine
                                     if (LabelInf.Rows[i].Cells["pib_cusbarcode"].Value != null)
                                         SingleDoc.Variables.FreeVariables.Item(j + 1).Value = LabelInf.Rows[i].Cells["pib_cusbarcode"].Value.ToString();
                                 }
-                                else if (arg.Contains(SingleDoc.Variables.FreeVariables.Item(j + 1).Name))
-                                    SingleDoc.Variables.FreeVariables.Item(j + 1).Value = dr[0][SingleDoc.Variables.FreeVariables.Item(j + 1).Name].ToString();
                                 ParamLog.AppendLine("pib_id:" + LabelInf.Rows[i].Cells["pib_id1"].Value.ToString() + ",SingleDoc打印参数【" + SingleDoc.Variables.FreeVariables.Item(j + 1).Name + "】赋值，" + "取到值" + SingleDoc.Variables.FreeVariables.Item(j + 1).Value);
                             }
                             LogManager.DoLog(ParamLog.ToString());