修复Check For Saved Order时Order List状态不对，禁止Order List可编辑。

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -2419,7 +2419,7 @@
             [self checklogin:true];
             
         };
-        
+        ovc.title = @"SAVED ORDER";
         [self.navigationController pushViewController:ovc animated:true];
     }
     else

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

@@ -186,7 +186,13 @@
     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) {
+        if(self.init_style==OL_OPEN)
+        {
+            NSData *data=[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:@"status_filter_cadedate_open" ofType:@"json" ]];
+            NSError *error=nil;
+            self.status_cadedate = [[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:&error] mutableCopy];
+            
+        } else if (self.orderTypeSegmentControl.selectedSegmentIndex == 0) {
             self.status_cadedate = self.shop_order_filter;
         } else {
             self.status_cadedate = self.sales_order_filter;
@@ -317,6 +323,15 @@
                 self.toolbarView.items = items;
             }
         }
+        
+        // Check For Saved Order 不能合并
+        if(self.init_style==OL_OPEN) {
+            if ([items containsObject:self.mergeListButton]) {
+                [items removeObject:self.mergeListButton];
+                self.toolbarView.items = items;
+            }
+
+        }
 
     } else {
         
@@ -1602,6 +1617,9 @@
     if(indexPath.row==self.content_data.count)
         return NO;
     
+    if(self.init_style==OL_OPEN)
+        return NO;
+    
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     NSString* order_status= [self.content_data[indexPath.row] valueForKey:@"order_status"];
     
@@ -1791,17 +1809,19 @@ 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;
+    if(self.init_style != OL_OPEN) {
+        switch (ordertype) {
+            case 0:{
+                self.status_cadedate = self.shop_order_filter;
+            }
+                break;
+            case 1:{
+                self.status_cadedate = self.sales_order_filter;
+            }
+                break;
+            default:
+                break;
         }
-            break;
-        default:
-            break;
     }
     [self ReloadData];
 }