Sales Order取消合并。

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

@@ -1479,7 +1479,9 @@
     
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     if(appDelegate.user_type==USER_ROLE_CUSTOMER) {
-        
+        if (self.orderType == 1) {// Sales Order不能合并
+            return NO;
+        }
         if (![Singleton sharedInstance].permissions_merge_order) {
             // 没有合并订单的权限
             return NO;