Просмотр исходного кода

offline_requestcart:增加general_note

Pen Li 9 лет назад
Родитель
Сommit
e261a17f4d

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


+ 0 - 16
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,21 +13,5 @@
             stopOnStyle = "0">
             stopOnStyle = "0">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493624961.355323"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1422"
-            endingLineNumber = "1422"
-            landmarkName = "+offline_add2cart:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
    </Breakpoints>
 </Bucket>
 </Bucket>

+ 6 - 2
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -1788,10 +1788,14 @@
 
 
     ret[@"mode"]=@"Regular Mode";
     ret[@"mode"]=@"Regular Mode";
     
     
-    ret[@"general_note"]=@"GENERAL NOTE NOT IMPL";
-    
     [iSalesDB close_db:db];
     [iSalesDB close_db:db];
     
     
+    NSString *general_note = [iSalesDB jk_queryText:[NSString stringWithFormat:@"select general_notes from offline_order where so_id = '%@';",orderCode]];
+    
+    DebugLog(@"general notes :%@",general_note);
+    
+    ret[@"general_note"]= general_note;
+    
     return [RAUtils dict2data:ret];
     return [RAUtils dict2data:ret];
 }
 }
 +(NSData*) offline_updategnotes :(NSMutableDictionary *) params
 +(NSData*) offline_updategnotes :(NSMutableDictionary *) params

+ 2 - 0
RedAnt ERP Mobile/common/data_provider/iSalesDB.m

@@ -1017,6 +1017,8 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
 
 
 + (NSString *)jk_queryText:(NSString *)sql{
 + (NSString *)jk_queryText:(NSString *)sql{
     
     
+    NSLog(@"%s sql: %@",__func__,sql);
+    
     __block NSString *ret = nil;
     __block NSString *ret = nil;
     
     
     sqlite3 *db = [iSalesDB get_db];
     sqlite3 *db = [iSalesDB get_db];