|
|
@@ -392,21 +392,24 @@ namespace UAS_MES.Make
|
|
|
SPID.Add(sp_id);
|
|
|
OperateResult.AppendText(">>物料" + sp_soncode + "采集成功\n");
|
|
|
code.Clear();
|
|
|
+ string fsoncode = "";
|
|
|
//如果+1后不小于B序列的长度,则已采集完成,不需要进行提示了
|
|
|
if (RemainIndex < RemainList.Length)
|
|
|
+ fsoncode = dt1.Rows[RemainIndex]["sp_fsoncode"].ToString();
|
|
|
+ if (RemindItem.Contains(fsoncode))
|
|
|
{
|
|
|
- string fsoncode = dt1.Rows[RemainIndex]["sp_fsoncode"].ToString();
|
|
|
- if (RemindItem.Contains(fsoncode))
|
|
|
- {
|
|
|
- RemainIndex = RemainIndex + 1;
|
|
|
- }
|
|
|
+ RemainIndex = RemainIndex + 1;
|
|
|
+ }
|
|
|
+ if (RemainIndex < RemainList.Length)
|
|
|
+ {
|
|
|
+ fsoncode = dt1.Rows[RemainIndex]["sp_fsoncode"].ToString();
|
|
|
+ string prdetail = dt1.Rows[RemainIndex]["pr_detail"].ToString();
|
|
|
string soncode = "";
|
|
|
for (int i = 0; i < dt1.Rows.Count; i++)
|
|
|
{
|
|
|
if (fsoncode == dt1.Rows[i]["sp_fsoncode"].ToString())
|
|
|
soncode += dt1.Rows[i]["sp_soncode"].ToString() + ",";
|
|
|
}
|
|
|
- string prdetail = dt1.Rows[RemainIndex]["pr_detail"].ToString();
|
|
|
if (!RemindItem.Contains(fsoncode))
|
|
|
{
|
|
|
RemindItem.Add(fsoncode);
|