Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-出货标签管理(贸易版)/UAS_出货标签管理.cs

@@ -1126,6 +1126,8 @@ namespace UAS_LabelMachine
                         string[] param = new string[] { PI_ID, "" };
                         dh.CallProcedure("GetCustBarcode", ref param);
                     }
+                    CurrentItemIndex = 0;
+                    CurrentRowIndex = 0;
                     LoadGridData(sender, e);
                     //重新输入单号后清除缓存
                     MidBoxArgument.Clear();
@@ -1151,7 +1153,6 @@ namespace UAS_LabelMachine
                     BaseUtil.SetFormCenter(stw);
                     stw.ShowDialog();
                     //重置采集项次
-                    CurrentItemIndex = 0;
                     LogManager.DoLog("输入单号【" + pi_inoutno.Text + "】");
                 }
                 else