增加Shop Order状态与Sales Order状态区分。

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

@@ -29,6 +29,9 @@
 
 @property (nonatomic,assign) NSInteger orderType;///<sales order/shop order
 
+@property (nonatomic,strong) NSMutableDictionary *sales_order_filter;
+@property (nonatomic,strong) NSMutableDictionary *shop_order_filter;
+
 @property (strong, nonatomic) IBOutlet UIBarButtonItem *mergeListButton;
 @property (strong, nonatomic) IBOutlet UISegmentedControl *orderTypeSegmentControl;
 
@@ -176,8 +179,21 @@
     
     if(self.status_cadedate!=nil)
         return;
+    
     UIApplication * app = [UIApplication sharedApplication];
     AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+    
+    if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
+        self.shop_order_filter = [Singleton sharedInstance].shop_order_status_filter;
+        self.sales_order_filter = appDelegate.OrderFilter;
+        if (self.orderTypeSegmentControl.selectedSegmentIndex == 0) {
+            self.status_cadedate = self.shop_order_filter;
+        } else {
+            self.status_cadedate = self.sales_order_filter;
+        }
+        return;
+    }
+    
     NSData* json =nil;
     if(self.init_style==OL_OPEN)
     {
@@ -336,7 +352,7 @@
     
     // 显示Sales Order与否
     if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
-        if ([Singleton sharedInstance].global_lock || ![Singleton sharedInstance].customer_can_see_sales_Order) {
+        if ([Singleton sharedInstance].global_lock || ![Singleton sharedInstance].customer_can_see_sales_Order) { // 是否解锁，是否有查看Sales Order权限
             if (self.orderTypeSegmentControl.numberOfSegments > 1) {
                 [self.orderTypeSegmentControl removeSegmentAtIndex:1 animated:YES];
             }
@@ -1775,6 +1791,18 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
 - (void)changeOrderType:(NSInteger)ordertype {
     self.orderType = ordertype;
     [Singleton sharedInstance].customer_order_type = ordertype;
+    switch (ordertype) {
+        case 0:{
+            self.status_cadedate = self.shop_order_filter;
+        }
+            break;
+        case 1:{
+            self.status_cadedate = self.sales_order_filter;
+        }
+            break;
+        default:
+            break;
+    }
     [self ReloadData];
 }
 

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -3618,7 +3618,12 @@ repeat:
         [appDelegate set_main_button_panel];
         
         if(appDelegate.user_type==USER_ROLE_CUSTOMER) {
-            //-
+        
+            // shop order status filter
+            NSString *shopOrderStatusFilterStr = [objheader valueForKey:@"shopOrderFilter"] ;
+            [Singleton sharedInstance].shop_order_status_filter = [[RAUtils string2dict:shopOrderStatusFilterStr] mutableCopy];
+            
+            //-价格类型
             [Singleton sharedInstance].npd_shop_price_type = [[objheader valueForKey:@"price_type"] integerValue];
             
             // 权限

RedAnt ERP Mobile/iSales-NPD/Singleton.h

@@ -32,6 +32,7 @@ typedef enum {
 
 @property (nonatomic,assign) BOOL global_lock;///<全局锁，Yes表示订单不能查看Detail，需要密码验证Price Setting，Hide Price
 @property (nonatomic,assign) BOOL customer_can_see_sales_Order;///<是否有权查看Sales Order，控制Order List
+@property (nonatomic,strong) NSMutableDictionary *shop_order_status_filter;///<Shop Order Status
 
 #pragma mark - Employee