Ray Zhang 10 anni fa
parent
commit
ff80a4718d

+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/AppDelegate.h

@@ -110,6 +110,6 @@
 
 @property (strong, nonatomic) NSString * printerURL;
 -(void) printPdf:(NSString*) url;
-
+@property (strong, nonatomic) NSMutableDictionary* OrderFilter;
 
 @end

+ 36 - 34
RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -218,7 +218,7 @@
         {
             if([mode isEqualToString:@"Regular Mode"])
             {
-                self.mode=@"Regular Mode";
+                self.mode=@"RM";
                 NSString* title = self.user;
                 [main_vc.buttonUser setTitle:title forState:UIControlStateNormal];
                 
@@ -233,7 +233,7 @@
             else
             {
                 
-                self.mode=@"Trade Show Mode";
+                self.mode=@"TM";
                 NSString* title = self.user;
                 [main_vc.buttonUser setTitle:title forState:UIControlStateNormal];
                 
@@ -359,38 +359,38 @@
 //}
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    NSString* order_filter_source_path =[[NSBundle mainBundle]  pathForResource:@"status_filter_cadedate" ofType:@"json" ];
-    
-    
-    
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-    NSString *documents = [paths objectAtIndex:0];
-    NSString *dist_path = [documents stringByAppendingPathComponent:@"status_filter_cadedate.json"];
-    
-    
-    if ([[NSFileManager defaultManager] fileExistsAtPath:dist_path]) {
-        
-        NSLog(@"文件已经存在了");
-        
-    }
-    else
-    {
-        
-        
-        
-        //        NSLog(@"resourceSampleImagesFolderPath=%@",resourceFolderPath);
-        
-        NSData *mainBundleFile = [NSData dataWithContentsOfFile:order_filter_source_path];
-        
-        //        NSLog(@"mainBundleFile==%@",mainBundleFile);
-        
-        [[NSFileManager defaultManager] createFileAtPath:dist_path
-         
-                                                contents:mainBundleFile
-         
-                                              attributes:nil];
-        
-    }
+//    NSString* order_filter_source_path =[[NSBundle mainBundle]  pathForResource:@"status_filter_cadedate" ofType:@"json" ];
+//    /var/folders/65/j0_0c8rx66zb29cjnjndr11r0000gn/T/AppIconMaker/appicon.png
+//    
+//    
+//    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+//    NSString *documents = [paths objectAtIndex:0];
+//    NSString *dist_path = [documents stringByAppendingPathComponent:@"status_filter_cadedate.json"];
+//    
+//    
+//    if ([[NSFileManager defaultManager] fileExistsAtPath:dist_path]) {
+//        
+//        NSLog(@"文件已经存在了");
+//        
+//    }
+//    else
+//    {
+//        
+//        
+//        
+//        //        NSLog(@"resourceSampleImagesFolderPath=%@",resourceFolderPath);
+//        
+//        NSData *mainBundleFile = [NSData dataWithContentsOfFile:order_filter_source_path];
+//        
+//        //        NSLog(@"mainBundleFile==%@",mainBundleFile);
+//        
+//        [[NSFileManager defaultManager] createFileAtPath:dist_path
+//         
+//                                                contents:mainBundleFile
+//         
+//                                              attributes:nil];
+//        
+//    }
     
     self.offline_mode = OFFLINE_MODE;
     // Override point for customization after application launch.
@@ -470,6 +470,8 @@
 }
 -(void) Logout
 {
+        MainViewController * main_vc= (MainViewController*)self.main_vc;
+    [main_vc logoutOrder];
     self.user = nil;
     self.password=nil;
     self.user_icon=nil;

File diff suppressed because it is too large
+ 189 - 167
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard


+ 4 - 3
RedAnt ERP Mobile/iSales-NPD/config.h

@@ -80,7 +80,8 @@
 #define  URL_SAVE_DM_DIRECT @"http://192.168.0.119:8080/site/isales/getTearSheetPdf.htm"
 #define  URL_SAVE_DM @"http://192.168.0.119:8080/site/isales/saveTearSheetPdf.htm"
 #define  URL_DM_LIST @"http://192.168.0.119:8080/site/isales/tearSheetPdfList.htm"
-
+#define  URL_DM_SET_QTY @"http://192.168.0.119:8080/site/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.119:8080/site/isales/getTearSheetAvailableQty.htm"
 
 #define  URL_CONTACT_LIST  @"http://192.168.0.119:8080/site/isales/getAllContact.htm"
 #define  URL_SHIPTO_LIST  @"http://192.168.0.119:8080/site/isales/getShipToContact.htm"
@@ -168,7 +169,7 @@
 //#define  URL_SAVE_DM_DIRECT @"https://www.newpacificdirect.com/isales/getTearSheetPdf.htm"
 //#define  URL_SAVE_DM @"https://www.newpacificdirect.com/isales/saveTearSheetPdf.htm"
 //#define  URL_DM_LIST @"https://www.newpacificdirect.com/isales/tearSheetPdfList.htm"
-//
+//#define  URL_DM_SET_QTY @"https://www.newpacificdirect.com/isales/setTearSheetAvailableQty.htm"
 //
 //#define  URL_CONTACT_LIST  @"https://www.newpacificdirect.com/isales/getAllContact.htm"
 //#define  URL_SHIPTO_LIST  @"https://www.newpacificdirect.com/isales/getShipToContact.htm"
@@ -204,6 +205,6 @@
 //#define  URL_EDIT_CUSTOMER  @"https://www.newpacificdirect.com/isales/getUpdateCustomerInfoByContact.htm"
 //#define  URL_CUSTOMER_PENDINGORDER  @"https://www.newpacificdirect.com/isales/hasPendingOrderByContact.htm"
 //#define  URL_PORTFOLIOLIST_REMOVE  @"https://www.newpacificdirect.com/isales/deleteTearSheetPdf.htm"
-//
+////
 
 #endif

Some files were not shown because too many files changed in this diff