Преглед изворни кода

修改PDF同步数据准备。已经同步过的,并且没被删除,就不需要上传。

Pen Li пре 9 година
родитељ
комит
c5ec2155af

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 8 - 4
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -10927,8 +10927,8 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         where=@"is_dirty=1";
         
     }
-#warning Price is not correct
-    NSString *sqlQuery =[NSString stringWithFormat:@"select _id,ifnull(tearsheets_id,'null'),pdf_path,create_user,tear_note,tear_name,model_info,createtime,modify_time,configureParams,off_params,is_delete from offline_pdf where %@",where];
+
+    NSString *sqlQuery =[NSString stringWithFormat:@"select _id,ifnull(tearsheets_id,'null'),pdf_path,create_user,tear_note,tear_name,model_info,createtime,modify_time,configureParams,off_params,is_delete,is_local from offline_pdf where %@",where];
     
     
     [ret setValue:[NSNumber numberWithInt:AP_USER_NOT_AUTH ] forKey:@"result"];
@@ -10951,7 +10951,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         NSString *uuid = [NSUUID UUID].UUIDString;
         int is_delete = sqlite3_column_int(stmt, 11);
         NSString *tearsheet_id_null = [self textAtColumn:1 statement:stmt];
-        
+        int is_local = sqlite3_column_int(stmt, 12);
         
         [item setObject:[NSNumber numberWithInteger:_id] forKey:@"_id"];
         if (![tearsheet_id_null isEqualToString:@"null"]) {
@@ -10972,7 +10972,11 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         NSDictionary *off_Params_dic = [RAUtils string2dict:off_params];
         [item setObject:[off_Params_dic objectForKey:@"product_ids"] forKey:@"product_ids"];
         
-        [ret setObject:item forKey:[NSString stringWithFormat:@"item_%ld",(*count)++]];
+        if (!is_local && !is_delete) { // 已经同步过的,并且没被删除,就不需要上传。
+            
+        } else {
+            [ret setObject:item forKey:[NSString stringWithFormat:@"item_%ld",(*count)++]];
+        }
         [ret setObject:[NSNumber numberWithInteger:RESULT_TRUE] forKey:@"result"];
         [ret setObject:[NSNumber numberWithInteger:*count] forKey:@"count"];