|
|
@@ -79,13 +79,11 @@ namespace UAS_LabelMachine.PublicMethod
|
|
|
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)
|
|
|
+ if (iUploadNum <= upload.Rows.Count || unupload.Rows.Count == 0)
|
|
|
{
|
|
|
//上传数据
|
|
|
- dh.SaveDataTable(dt, "prodiobarcode", "pib_id");
|
|
|
+ dh.SaveDataTable(upload, "prodiobarcode", "pib_id");
|
|
|
//更新本地数据为已上传
|
|
|
if (adh.UpdateByCondition("prodiobarcode", "pib_ifupload=-1", "pib_inoutno='" + iInoutno + "' and pib_ifrecheck=-1 and pib_ifupload<>-1") > 0)
|
|
|
{
|
章政