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

160824

Add func
offline_signorder
offline_placeorder
Ray Zhang 9 лет назад
Родитель
Сommit
40479f6c90

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


+ 24 - 8
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -404,11 +404,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "493694672.763421"
+            timestampString = "493715060.152765"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3009"
-            endingLineNumber = "3009"
+            startingLineNumber = "3016"
+            endingLineNumber = "3016"
             landmarkName = "+parse_authinfo:user:password:"
             landmarkType = "5">
          </BreakpointContent>
@@ -823,7 +823,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1538"
             endingLineNumber = "1538"
-            landmarkName = "+model_subtotal:count:db:compute_part:"
+            landmarkName = "+model_bundle:db:compute_part:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -871,7 +871,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1477"
             endingLineNumber = "1477"
-            landmarkName = "+model_bundle:db:compute_part:"
+            landmarkName = "+offline_add2cart:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -935,7 +935,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1802"
             endingLineNumber = "1802"
-            landmarkName = "+offline_login:"
+            landmarkName = "+offline_requestcart:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1015,7 +1015,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "5535"
             endingLineNumber = "5535"
-            landmarkName = "+offline_cartsetprice:"
+            landmarkName = "+offline_orderlist:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1031,7 +1031,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "5536"
             endingLineNumber = "5536"
-            landmarkName = "+offline_cartsetprice:"
+            landmarkName = "+offline_orderlist:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1051,5 +1051,21 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/iSalesNetwork.m"
+            timestampString = "493715060.152765"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "891"
+            endingLineNumber = "891"
+            landmarkName = "+cancel_Order:order_code:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 4 - 1
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.h

@@ -49,6 +49,9 @@
 +(NSData*) offline_orderdetail :(NSMutableDictionary *) params;
 +(NSData*) offline_editorder :(NSMutableDictionary *) params;
 +(NSData*) offline_cancelorder :(NSMutableDictionary *) params;
++(NSData*) offline_signorder :(NSMutableDictionary *) params;
+
+
 +(NSData*) offline_add2cart :(NSMutableDictionary *) params;
 +(NSData*) offline_requestcart :(NSMutableDictionary *) params;
 +(NSData*) offline_updategnotes :(NSMutableDictionary *) params;
@@ -57,7 +60,7 @@
 +(NSData*) offline_cartsetprice :(NSMutableDictionary *) params;
 +(NSData*) offline_cartsetlnotes :(NSMutableDictionary *) params;
 +(NSData*) offline_cartsetqty :(NSMutableDictionary *) params;
-
++(NSData*) offline_placeorder :(NSMutableDictionary *) params;
 +(NSDictionary*) offline_category_menu ;
 +(NSDictionary*) offline_home ;
 

+ 10 - 3
RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -729,14 +729,18 @@ repeat:
     [params setValue:path forKey:@"picpath"];
     //    [params setValue:sourceid forKey:@"sourceid"];
     //    [params setValue:editor forKey:@"editor"];
+    NSData* json=nil;
     if(appDelegate.offline_mode)
     {
-        return [OLDataProvider offline_notimpl];
+        json= [OLDataProvider offline_signorder:params];
     }
+    else
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
     
-    NSData* json=[self get_json:URL_SIGN_ORDER parameters:params];
+    json=[self get_json:URL_SIGN_ORDER parameters:params];
+    }
     if(json!=nil)
     {
         NSError *error=nil;
@@ -1274,7 +1278,10 @@ repeat:
         {
             json= [OLDataProvider offline_contactAdvancedSearch:params];
         }
-        
+        else if([request_url isEqualToString:URL_CARTDELIVERY])
+        {
+            json= [OLDataProvider offline_placeorder:params];
+        }
         
         else
             return [OLDataProvider offline_notimpl];