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

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

@@ -1164,6 +1164,7 @@ namespace UAS_LabelMachine
                 {
                     GetMidBoxData();
                 }
+                int LastCheckRowIndex = 0;
                 for (int i = 0; i < LabelInf.RowCount; i++)
                 {
                     if (i + 1 < LabelInf.RowCount)
@@ -1181,10 +1182,15 @@ namespace UAS_LabelMachine
                         if (LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() != "True")
                             outboxcode1[LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()] = false;
                     }
+                    if (LabelInf.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True" && LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() == "True" && LabelInf.Rows[i].Cells["pib_ifprint"].FormattedValue.ToString() != "True")
+                    {
+                        LastCheckRowIndex = i;
+                    }
                 }
                 //用于判断用户是否勾选了行
                 int CheckedRowCount = 0;
                 string[] arg = SingleBoxArgument.ToArray();
+
                 //一盒打印的份数
                 List<string> PrintNums = new List<string>();
                 //打印所有的选中行
@@ -1207,7 +1213,7 @@ namespace UAS_LabelMachine
                             }
                         }
                         //如果包含
-                        if (!PrintNums.Contains(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()) || i == LabelInf.RowCount - 1)
+                        if (!PrintNums.Contains(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()) || i == LastCheckRowIndex)
                         {
                             string pib_id = LabelInf.Rows[i].Cells["pib_id1"].Value.ToString();
                             DataRow[] dr = SingleBoxCacheData.Select("pib_id=" + pib_id);