登陆设置global lock

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -125,9 +125,7 @@
     // Customer Order Type 0 Shop Order/ 1 Sales Order
     self.orderType = self.orderTypeSegmentControl.selectedSegmentIndex;
     [Singleton sharedInstance].customer_order_type = self.orderType;
-    if ([Singleton sharedInstance].global_lock) {
-        [self.orderTypeSegmentControl removeSegmentAtIndex:1 animated:YES];
-    }
+    
     
     UIRefreshControl *ref = [[UIRefreshControl alloc]init];
     ref.tag = 201 ;
@@ -334,6 +332,13 @@
         self.table_order.frame = frame;
     }
     
+    // 显示Sales Order与否
+    if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
+        if ([Singleton sharedInstance].global_lock) {
+            [self.orderTypeSegmentControl removeSegmentAtIndex:1 animated:YES];
+        }
+    }
+    
 }
 - (IBAction)onNewOrderClicked:(id)sender {
     

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -3617,19 +3617,21 @@ repeat:
         
         [appDelegate set_main_button_panel];
         
-        //-
-        [Singleton sharedInstance].npd_shop_price_type = [[objheader valueForKey:@"price_type"] integerValue];
-        
-        // 权限
-        [Singleton sharedInstance].permissions_price_setting = [[objheader valueForKey:@"can_set_price_formula"] boolValue];
-        [Singleton sharedInstance].permissions_edit_order = [[objheader valueForKey:@"can_place_order"] boolValue];
-
-        [Singleton sharedInstance].permissions_submit_order = [[objheader valueForKey:@"can_submit_order"] boolValue];
+        if(appDelegate.user_type==USER_ROLE_CUSTOMER) {
+            //-
+            [Singleton sharedInstance].npd_shop_price_type = [[objheader valueForKey:@"price_type"] integerValue];
+            
+            // 权限
+            [Singleton sharedInstance].permissions_price_setting = [[objheader valueForKey:@"can_set_price_formula"] boolValue];
+            [Singleton sharedInstance].permissions_edit_order = [[objheader valueForKey:@"can_place_order"] boolValue];
 
-        [Singleton sharedInstance].permissions_merge_order = [[objheader valueForKey:@"can_merge_order"] boolValue];
-        
-        [Singleton sharedInstance].deliveryString = [objheader valueForKey:@"delivery_price"];
+            [Singleton sharedInstance].permissions_submit_order = [[objheader valueForKey:@"can_submit_order"] boolValue];
 
+            [Singleton sharedInstance].permissions_merge_order = [[objheader valueForKey:@"can_merge_order"] boolValue];
+            
+            [Singleton sharedInstance].deliveryString = [objheader valueForKey:@"delivery_price"];
+            [[Singleton sharedInstance] resetGlobalLock];
+        }
         
         //        DebugLog(@"sessionid=%@ ",appDelegate.sessionid);
         //        if ([[objheader valueForKey:@"update"] boolValue]==false)

RedAnt ERP Mobile/iSales-NPD/Singleton.h

@@ -40,4 +40,6 @@ typedef enum {
 
 + (instancetype)sharedInstance;
 
+- (void)resetGlobalLock;
+
 @end

RedAnt ERP Mobile/iSales-NPD/Singleton.m

@@ -29,4 +29,8 @@
     }
 }
 
+- (void)resetGlobalLock {
+    _global_lock = YES;
+}
+
 @end