Bläddra i källkod

修复Cart Mark不正确。
修改Order List,Order Status在Customer使用状态码获取,Employee登录时直接使用请求数据。
修改Order Detail请求结果为8的情况时不再重复请求。

Pen Li 9 år sedan
förälder
incheckning
d576a7d91f

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


+ 5 - 2
RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -19,6 +19,7 @@
 #import "SelectUploadOrderViewController.h"
 #import "NotificationNameCenter.h"
 #import "Singleton.h"
+#import "ERPUtils.h"
 
 
 @interface OrderListViewController ()
@@ -1064,10 +1065,12 @@
             price=nil;
         }
         
-//        NSInteger statusCode = [[self.content_data[indexPath.row] valueForKey:@"orderStatus"] integerValue];
+        NSInteger statusCode = [[self.content_data[indexPath.row] valueForKey:@"orderStatus"] integerValue];
         NSString* purchase_time= [self.content_data[indexPath.row] valueForKey:@"purchase_time"];
         NSString* status = [self.content_data[indexPath.row] valueForKey:@"order_status"] ;
-//        NSString* status = [RAUtils orderStatus:statusCode];
+        if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
+            status = [ERPUtils orderStatus:statusCode];
+        }
         NSString* customer_name = [self.content_data[indexPath.row] valueForKey:@"customer_name"];
         NSString* model_count = [self.content_data[indexPath.row] valueForKey:@"model_count"];
         NSString* sales = [self.content_data[indexPath.row] valueForKey:@"sales_rep"];

+ 2 - 1
RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -1773,7 +1773,8 @@ repeat:
                 {
                     
                     NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
-                    if([jsobj[@"result"] intValue]==2)
+                    int resultCode = [jsobj[@"result"] intValue];
+                    if(resultCode==2 || resultCode == 8)
                     {
                         break;
                     }

+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/config.h

@@ -10,7 +10,7 @@
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_NPD
 
-#define test_server
+//#define test_server
 #define exception_switch 1
 #define notifyMe_switch 1