修复Lock应用后登出，再登录时Order List不能看到Purchase Order to NPD。

合并订单增加参数Customer Info。

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,22 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/iSalesNetwork.m"
+            timestampString = "506856910.270393"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3854"
+            endingLineNumber = "3854"
+            landmarkName = "+merge_order:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/offline/SelectUploadOrderViewController.m

@@ -15,6 +15,7 @@
 #import "iSalesNetwork.h"
 #import "RAUtils.h"
 #import "AppDelegate.h"
+#import "Singleton.h"
 
 @interface SelectUploadOrderViewController ()<UITableViewDataSource,UITableViewDelegate>
 
@@ -196,9 +197,11 @@
     if (closeOrder) {
         [order_ids deleteCharactersInRange:NSMakeRange(order_ids.length - 1, 1)];
         
+        
         NSMutableDictionary *params = [NSMutableDictionary dictionary];
         [params setObject:order_ids forKey:@"order_ids"];
         [params setObject:checked_id forKey:@"targetOrderId"];
+        [params setObject:[Singleton sharedInstance].customerInfo forKey:@"customerInfo"];
         
         UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait" title:@"Merge Order"];
         

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

@@ -393,6 +393,12 @@
             if (self.orderTypeSegmentControl.numberOfSegments > 1) {
                 [self.orderTypeSegmentControl removeSegmentAtIndex:1 animated:YES];
             }
+        } else {
+            
+            if (self.orderTypeSegmentControl.numberOfSegments == 1) {
+                [self.orderTypeSegmentControl insertSegmentWithTitle:@"Purchase Order to NPD" atIndex:1 animated:YES];
+            }
+            
         }
     }
     

RedAnt ERP Mobile/common/Singleton.h

@@ -34,6 +34,7 @@ typedef enum {
 @property (nonatomic,  copy) NSString *specialInstruction;///<登陆时传的Special Instruction，在提交订单时显示
 @property (nonatomic,assign) BOOL currentOrderIsMerged;///<当前打开的订单是否为Purchas Order
 @property (nonatomic,  copy) NSString *customer_email;///<Customer邮箱地址，登录时保存
+@property (nonatomic,strong) NSDictionary *customerInfo;///<登录账号信息
 
 #pragma mark - Employee
 

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -3647,6 +3647,7 @@ repeat:
             [[Singleton sharedInstance] resetGlobalLock];
             [Singleton sharedInstance].customer_can_see_sales_Order = [[objheader valueForKey:@"can_see_salesorder"] boolValue];
             [Singleton sharedInstance].customer_email = [appDelegate.customerInfo valueForKey:@"customer_email"];
+            [Singleton sharedInstance].customerInfo = [objheader objectForKeyedSubscript:@"customerInfo"];
         }
         
         //        DebugLog(@"sessionid=%@ ",appDelegate.sessionid);
@@ -3848,7 +3849,7 @@ repeat:
     
     [dic setValue:[params objectForKey:@"order_ids"] forKey:@"order_ids"];
     [dic setValue:[params objectForKey:@"targetOrderId"] forKey:@"targetOrderId"];
-    
+    [dic setValue:[params objectForKey:@"customerInfo"] forKey:@"customerInfo"];
     NSData* json=nil;
     if(appDelegate.offline_mode)
     {