Răsfoiți Sursa

1.修改NPD GATIT APPDelegate,使用条件编译区分Back Order。

Pen Li 8 ani în urmă
părinte
comite
ed14db0ac1

+ 8 - 2
RedAnt ERP Mobile/iSales-GATIT/AppDelegate.m

@@ -28,7 +28,11 @@
 #import "GoogleAnalyst.h"
 #import "GoogleAnalyst.h"
 #import "ERPUtils.h"
 #import "ERPUtils.h"
 #import "RANetwork.h"
 #import "RANetwork.h"
+
+#ifdef BACKORDER_PROCESS
 #import "RAOrderEditorViewController.h"
 #import "RAOrderEditorViewController.h"
+#endif
+
 #import "RAConvertor.h"
 #import "RAConvertor.h"
 
 
 #define UNZIP_OPEN_FAILED 0
 #define UNZIP_OPEN_FAILED 0
@@ -767,13 +771,15 @@ void UncaughtExceptionHandler(NSException *exception) {
                         orderinfoVC.resumeOrder = YES;
                         orderinfoVC.resumeOrder = YES;
                         
                         
                         [mainVC.navigationController pushViewController:orderinfoVC animated:true];
                         [mainVC.navigationController pushViewController:orderinfoVC animated:true];
-                    } else if ([className isEqualToString:@"RAOrderEditorViewController"]) {
+                    }
+#ifdef BACKORDER_PROCESS
+                    else if ([className isEqualToString:@"RAOrderEditorViewController"]) {
                         
                         
                         RAOrderEditorViewController *orderEditorVC = [mainStoryBoard instantiateViewControllerWithIdentifier:@"RAOrderEditorViewController"];
                         RAOrderEditorViewController *orderEditorVC = [mainStoryBoard instantiateViewControllerWithIdentifier:@"RAOrderEditorViewController"];
                         [orderEditorVC recoveryFromUrgencyDic:urgencyDic];
                         [orderEditorVC recoveryFromUrgencyDic:urgencyDic];
                         [mainVC.navigationController pushViewController:orderEditorVC animated:YES];
                         [mainVC.navigationController pushViewController:orderEditorVC animated:YES];
                     }
                     }
-                    
+#endif
                     
                     
                 } else  if ([className isEqualToString:@"AddressEditorViewController"]) {
                 } else  if ([className isEqualToString:@"AddressEditorViewController"]) {
                     // AddressEditorViewController
                     // AddressEditorViewController

+ 6 - 1
RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -28,7 +28,9 @@
 #import "GoogleAnalyst.h"
 #import "GoogleAnalyst.h"
 #import "ERPUtils.h"
 #import "ERPUtils.h"
 #import "RANetwork.h"
 #import "RANetwork.h"
+#ifdef BACKORDER_PROCESS
 #import "RAOrderEditorViewController.h"
 #import "RAOrderEditorViewController.h"
+#endif
 #import "RAConvertor.h"
 #import "RAConvertor.h"
 
 
 #define UNZIP_OPEN_FAILED 0
 #define UNZIP_OPEN_FAILED 0
@@ -763,12 +765,15 @@ void UncaughtExceptionHandler(NSException *exception) {
                         orderinfoVC.resumeOrder = YES;
                         orderinfoVC.resumeOrder = YES;
                         
                         
                         [mainVC.navigationController pushViewController:orderinfoVC animated:true];
                         [mainVC.navigationController pushViewController:orderinfoVC animated:true];
-                    } else if ([className isEqualToString:@"RAOrderEditorViewController"]) {
+                    }
+#ifdef BACKORDER_PROCESS
+                    else if ([className isEqualToString:@"RAOrderEditorViewController"]) {
                         
                         
                         RAOrderEditorViewController *orderEditorVC = [mainStoryBoard instantiateViewControllerWithIdentifier:@"RAOrderEditorViewController"];
                         RAOrderEditorViewController *orderEditorVC = [mainStoryBoard instantiateViewControllerWithIdentifier:@"RAOrderEditorViewController"];
                         [orderEditorVC recoveryFromUrgencyDic:urgencyDic];
                         [orderEditorVC recoveryFromUrgencyDic:urgencyDic];
                         [mainVC.navigationController pushViewController:orderEditorVC animated:YES];
                         [mainVC.navigationController pushViewController:orderEditorVC animated:YES];
                     }
                     }
+#endif
                     
                     
                     
                     
                 } else  if ([className isEqualToString:@"AddressEditorViewController"]) {
                 } else  if ([className isEqualToString:@"AddressEditorViewController"]) {