优化显示，BUG调整

UAS-出货标签管理(吉利通)/PublicMethod/LogicHandler.cs

@@ -50,7 +50,7 @@ namespace UAS_LabelMachine.PublicMethod
             {
                 string DevStart = dt.Rows[0][Movement].ToString();
                 byte[] newbyte = new byte[1];
-                newbyte[0] = (byte)Convert.ToInt32(DevStart, 16);
+                newbyte[0] = (byte)Convert.ToInt32(DevStart == "" ? "0" : DevStart, 16);
                 PLC.Write(newbyte, 0, 1);
             }
         }

UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -514,14 +514,18 @@ namespace UAS_LabelMachine
                                                 CurrentPage = rownum / PageSize + 1;
                                                 LoadGridData();
                                                 CurrentRowIndex = rownum % PageSize == 0 ? PageSize - 1 : rownum % PageSize - 1;
-                                                if (CurrentRowIndex - 10 > 0)
+                                                if (CurrentRowIndex - 5 > 0)
                                                     LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 5;
+                                                else
+                                                    LabelInf.FirstDisplayedScrollingRowIndex = 0;
                                             }
                                             else
                                             {
                                                 CurrentRowIndex = rownum % PageSize == 0 ? PageSize - 1 : rownum % PageSize - 1;
-                                                if (CurrentRowIndex - 10 > 0)
+                                                if (CurrentRowIndex - 5 > 0)
                                                     LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 5;
+                                                else
+                                                    LabelInf.FirstDisplayedScrollingRowIndex = 0;
                                             }
                                         }
                                         else
@@ -755,8 +759,10 @@ namespace UAS_LabelMachine
                 {
                     LabelInf.Invalidate();
                     RefreshProcessData();
-                    if (CurrentRowIndex - 10 > 0)
+                    if (CurrentRowIndex - 5 > 0)
                         LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 5;
+                    else
+                        LabelInf.FirstDisplayedScrollingRowIndex = 0;
                     //如果成功上传了数据
                     if (LogicHandler.CheckUploadData(pi_inoutno.Text, UploadNum))
                     {
@@ -1387,7 +1393,7 @@ namespace UAS_LabelMachine
                 DataRow[] dr1 = MidLabelParam.Select("lp_name='" + MidDoc.Variables.FormVariables.Item(j + 1).Name + "'");
                 if (dr1.Length == 0)
                     dr1 = MidLabelParam.Select("lp_name='" + MidDoc.Variables.FormVariables.Item(j + 1).Name.Replace("_1", "") + "'");
-                if (dr1.Length > 0 && dr1[0]["lp_valuetype"].ToString() == "字符串")
+                if (dr1.Length > 0 && dr1[0]["lp_valuetype"].ToString() == "字符串" && dr1[0]["lp_sql"].ToString() != "")
                 {
                     MidDoc.Variables.FormVariables.Item(j + 1).Value = dt.Rows[0][dr1[0]["lp_sql"].ToString()].ToString();
                 }
@@ -1476,7 +1482,7 @@ namespace UAS_LabelMachine
                     //多参数命名
                     if (dr1.Length == 0)
                         dr1 = OutLabelParam.Select("lp_name='" + OutBoxDoc.Variables.FormVariables.Item(j + 1).Name.Replace("_1", "") + "'");
-                    if (dr1.Length > 0 && dr1[0]["lp_valuetype"].ToString() == "字符串")
+                    if (dr1.Length > 0 && dr1[0]["lp_valuetype"].ToString() == "字符串" && dr1[0]["lp_sql"].ToString() != "")
                     {
                         OutBoxDoc.Variables.FormVariables.Item(j + 1).Value = dt.Rows[0][dr1[0]["lp_sql"].ToString()].ToString();
                     }
@@ -2583,7 +2589,7 @@ namespace UAS_LabelMachine
                         }
                     }
                 }
-                else if (dr1.Length > 0)
+                else if (dr1.Length > 0 && dr1[0]["lp_valuetype"].ToString() == "字符串" && dr1[0]["lp_sql"].ToString() != "")
                 {
                     SingleDoc.Variables.FormVariables.Item(j + 1).Value = dt.Rows[0][dr1[0]["lp_sql"].ToString()].ToString();
                 }
@@ -2638,6 +2644,7 @@ namespace UAS_LabelMachine
                         break;
                 }
             }
+            ScanGroup = (DataTable)dh.ExecuteSql("select distinct sg_brand,sg_id,sg_autolabel,sg_name,sg_script from prodiobarcode left join scangroup on pib_brand=sg_brand where pib_inoutno='" + pi_inoutno.Text + "' and sg_id is not null", "select");
         }
 
         int Outbox1;