Sfoglia il codice sorgente

hmlg scan order 1.41 iOS 17 compatible optimize

Ray Zhang 2 anni fa
parent
commit
5746f8fd63

+ 1 - 1
RedAnt ERP Mobile/HMLG Scan Order/AppDelegate.m

@@ -83,7 +83,7 @@
     
     
     bool blogin = true;
-    if(self.user.length==0||[self.user.lowercaseString isEqualToString:@"guest"])
+    if(RASingleton.sharedInstance.user.length==0||[RASingleton.sharedInstance.user.lowercaseString isEqualToString:@"guest"])
         blogin = false;
     
 //    int a=0;

+ 2 - 2
RedAnt ERP Mobile/HMLG Scan Order/ServerSettingViewController.m

@@ -107,7 +107,7 @@
 //        self.labelPriceGroup.text =appDelegate.price_group;
 //        
 //    }
-    if(appDelegate.user==nil)
+    if(RASingleton.sharedInstance.user==nil)
         self.btnSetPriceGroup.hidden =true;
     else
         self.btnSetPriceGroup.hidden =false;
@@ -227,7 +227,7 @@
     self.labelStock.text = [RADataProvider queryStockUpdateTime];
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
 
-    if(appDelegate.user==nil)
+    if(RASingleton.sharedInstance.user==nil)
         self.btnSetPriceGroup.hidden =true;
     else
         self.btnSetPriceGroup.hidden =false;

+ 2 - 2
RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -3676,10 +3676,10 @@ void UncaughtExceptionHandler(NSException *exception) {
 }
 
 - (NSMutableArray *)cachedUploadTasks {
-    if (!self.user) {
+    if (!RASingleton.sharedInstance.user) {
         return nil;
     }
-    NSString *path = [[RAUtils appCacheDirectory] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_uploadTasks",self.user]];
+    NSString *path = [[RAUtils appCacheDirectory] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_uploadTasks",RASingleton.sharedInstance.user]];
     
     NSFileManager *manager = [NSFileManager defaultManager];
     if ([manager fileExistsAtPath:path]) {

+ 2 - 2
RedAnt ERP Mobile/common/Functions/OLO/ScanOrderListViewController.m

@@ -1311,7 +1311,7 @@
 
                 appDelegate.order_code = ordercode;
                 
-                [appDelegate setUser:orderitem[@"create_by"]];
+                [RASingleton.sharedInstance setUser:orderitem[@"create_by"]];
                 //            RASingleton.sharedInstance.user =;
                 //        appDelegate.custo orderitem[@"customer_name"]
     //            appDelegate.user_type = USER_ROLE_EMPLOYEE;
@@ -1384,7 +1384,7 @@
                     NSString* ordercode =orderitem[@"order_code"];
                     appDelegate.order_code = ordercode;
                     
-                    [appDelegate setUser:orderitem[@"create_by"]];
+                    [RASingleton.sharedInstance setUser:orderitem[@"create_by"]];
                     //            RASingleton.sharedInstance.user =;
                     //        appDelegate.custo orderitem[@"customer_name"]
         //            appDelegate.user_type = USER_ROLE_EMPLOYEE;

+ 4 - 4
RedAnt ERP Mobile/common/Functions/order/CreateOrderViewController.m

@@ -2518,9 +2518,9 @@
      
         NSDictionary* params = @{
             @"site_name":[RADataProvider getSiteName],
-            @"user":Appdelegate.user,
+            @"user":RASingleton.sharedInstance.user,
             @"_method":@"uploadOfflineOrder",
-            @"password" : Appdelegate.password,
+            @"password" : RASingleton.sharedInstance.password,
             @"md5":md5
                                  };
         task[@"params"]=params;
@@ -3107,7 +3107,7 @@
         else
         {
             realuser = RASingleton.sharedInstance.user;
-            realpassword = appDelegate.password;
+            realpassword = RASingleton.sharedInstance.password;
         }
         NSDictionary* params = @{
 //                @"site_name":[RADataProvider getSiteName],
@@ -3269,7 +3269,7 @@
     else
     {
         realuser = RASingleton.sharedInstance.user;
-        realpassword = appDelegate.password;
+        realpassword = RASingleton.sharedInstance.password;
     }
     if((appDelegate.user_type==USER_ROLE_CUSTOMER && [upparams[@"customer_cid"] stringValue].length>0) || [upparams[@"customer_cid"] stringValue].length>0 ||[RASingleton.sharedInstance.user.uppercaseString isEqualToString:@"GUEST"])
     {