采集数据更新处理

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

@@ -71,14 +71,18 @@ namespace UAS_LabelMachine.PublicMethod
         }
 
         /// <summary>
-        /// 检测数据库未上传的数据，根据设置的上传条数上传数据
+        /// 检测数据库未上传的数据，根据设置的上传条数上传数据   
         /// </summary>
         /// <param name="iInoutno"></param>
         public static bool CheckUploadData(string iInoutno, int iUploadNum)
         {
-            DataTable dt = (DataTable)adh.ExecuteSql("select pib_id,pib_outboxcode1,pib_outboxcode2,pib_lotno,pib_ifmodify,pib_datecode,pib_ifpick,-1 as pib_ifupload,pib_ifprint,pib_ifrecheck from prodiobarcode where pib_inoutno='" + iInoutno + "'  and pib_ifupload=0 and pib_ifrecheck=-1", "select");
-            //如果本地需要上传的数据已经达到了需要上传的条数
-            if (iUploadNum <= dt.Rows.Count)
+            DataTable dt = (DataTable)adh.ExecuteSql("select pib_id,pib_outboxcode1,pib_outboxcode2,pib_lotno,pib_ifmodify,pib_datecode,pib_ifpick,-1 as pib_ifupload,pib_ifprint,pib_ifrecheck from prodiobarcode where pib_inoutno='" + iInoutno + "'   ", "select");
+            DataTable upload = BaseUtil.filterDataTable(dt, "pib_ifupload=0 and pib_ifrecheck=-1");
+            DataTable unupload = BaseUtil.filterDataTable(dt, "pib_ifpick=0");
+            Console.WriteLine(iUploadNum);
+            Console.WriteLine(unupload.Rows.Count);
+            //如果本地需要上传的数据已经达到了需要上传的条数或者已经采集完了最后一条数据
+            if (iUploadNum <= dt.Rows.Count || unupload.Rows.Count == 0)
             {
                 //上传数据
                 dh.SaveDataTable(dt, "prodiobarcode", "pib_id");

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

@@ -268,6 +268,8 @@ namespace UAS_LabelMachine
                             if (MidLabelAutoPrint.Checked)
                                 AutoPrintMidLabel();
                             LabelInf.Rows[CurrentRowIndex].Cells["pib_ifpick"].Value = true;
+                            //设置变量为已勾选
+                            ShowDt.Select("pib_id=" + pib_id)[0]["pib_ifpick"] = -1;
                             LogicHandler.SendDataToPLC(PLC1, PLCInstruct.FrontDataPass);
                             LabelInf.Refresh();
                         }
@@ -364,13 +366,13 @@ namespace UAS_LabelMachine
                                         LoadGridData();
                                         CurrentRowIndex = rownum % PageSize - 1;
                                         if (CurrentRowIndex - 10 > 0)
-                                            LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 10;
+                                            LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 5;
                                     }
                                     else
                                     {
                                         CurrentRowIndex = rownum - 1;
                                         if (CurrentRowIndex - 10 > 0)
-                                            LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 10;
+                                            LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 5;
                                     }
                                 }
                                 else
@@ -512,7 +514,7 @@ namespace UAS_LabelMachine
                 {
                     Item += CheckItem[i].ToString() + " ";
                 }
-                MessageLog.AppendText(Item + "复核不通过\n", Color.Red);
+                ErrorMsg = ">>" + Item + "复核不通过";
                 return false;
             }
             LabelInf.Rows[CurrentRowIndex].Cells["pib_ifrecheck"].Value = true;
@@ -647,7 +649,7 @@ namespace UAS_LabelMachine
                 CurrentRowIndex = CurrentRowIndex + 1;
             RefreshProcessData();
             if (CurrentRowIndex - 10 > 0)
-                LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 10;
+                LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 5;
             //如果成功上传了数据
             if (LogicHandler.CheckUploadData(pi_inoutno.Text, UploadNum))
             {
@@ -855,11 +857,11 @@ namespace UAS_LabelMachine
                     pi_cardcode.Text = dt.Rows[0]["pi_cardcode"].ToString();
                     pi_date.Text = dt.Rows[0]["pi_date"].ToString();
                     PI_ID = dt.Rows[0]["pi_id"].ToString();
-                    if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
-                    {
-                        string[] param = new string[] { PI_ID, "" };
-                        dh.CallProcedure("GetCustBarcode", ref param);
-                    }
+                    //if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
+                    //{
+                    string[] param = new string[] { PI_ID, "" };
+                    dh.CallProcedure("GetCustBarcode", ref param);
+                    //}
                     //获取客户自定义设置
                     sql.Clear();
                     sql.Append("select cu_print_middc,cu_print_outdc,cu_print_midlotno,nvl(cu_print_custprodmatchmodel,'Equal')cu_print_custprodmatchmodel,cu_print_midspec,cu_print_midpo,cu_print_midprod,cu_print_outlotno,cu_print_outspec,cu_print_outpo");