Просмотр исходного кода

修复离线Order Detail中Customer Info地址不全。

Pen Li 9 лет назад
Родитель
Сommit
83904b1038

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


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

@@ -109,11 +109,11 @@
             ignoreCount = "0"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "507029105.57406"
+            timestampString = "507089093.724149"
             startingColumnNumber = "9223372036854775807"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10535"
-            endingLineNumber = "10535"
+            startingLineNumber = "10549"
+            endingLineNumber = "10549"
             landmarkName = "+offline_placeorder:"
             landmarkName = "+offline_placeorder:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
@@ -125,11 +125,11 @@
             ignoreCount = "0"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "507029105.57406"
+            timestampString = "507089093.724149"
             startingColumnNumber = "9223372036854775807"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10606"
-            endingLineNumber = "10606"
+            startingLineNumber = "10620"
+            endingLineNumber = "10620"
             landmarkName = "+offline_placeorder:"
             landmarkName = "+offline_placeorder:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
@@ -141,11 +141,11 @@
             ignoreCount = "0"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "507029105.57406"
+            timestampString = "507089093.724149"
             startingColumnNumber = "9223372036854775807"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10503"
-            endingLineNumber = "10503"
+            startingLineNumber = "10517"
+            endingLineNumber = "10517"
             landmarkName = "+paymentInfoDic:db:"
             landmarkName = "+paymentInfoDic:db:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>

+ 6 - 1
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -7840,7 +7840,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             if(addr_1==nil)
             if(addr_1==nil)
                 addr_1="";
                 addr_1="";
             NSString *nsaddr_1= [[NSString alloc]initWithUTF8String:addr_1];
             NSString *nsaddr_1= [[NSString alloc]initWithUTF8String:addr_1];
-            nsaddr_1 = [nsaddr_1 stringByAppendingFormat:@" %@, %@ %@ %@",customer_city,customer_state,customer_zipcode,customer_country];
+            
             
             
             char *addr_2 = (char*)sqlite3_column_text(statement, 8);
             char *addr_2 = (char*)sqlite3_column_text(statement, 8);
             if(addr_2==nil)
             if(addr_2==nil)
@@ -7864,6 +7864,11 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             [arr_addr addObject:nsaddr_2];
             [arr_addr addObject:nsaddr_2];
             [arr_addr addObject:nsaddr_3];
             [arr_addr addObject:nsaddr_3];
             [arr_addr addObject:nsaddr_4];
             [arr_addr addObject:nsaddr_4];
+            [arr_addr addObject:[NSString stringWithFormat:@"%@,",customer_city]];
+            [arr_addr addObject:customer_state];
+            [arr_addr addObject:customer_zipcode];
+            [arr_addr addObject:customer_country];
+            
             NSString * customer_address = [RAUtils arr2string:arr_addr separator:@"<br>" trim:true];
             NSString * customer_address = [RAUtils arr2string:arr_addr separator:@"<br>" trim:true];
             
             
             
             

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

@@ -10,7 +10,7 @@
 #define RedAnt_ERP_Mobile_config_h
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_NPD
 #define BUILD_NPD
 
 
-#define test_server
+//#define test_server
 #define exception_switch 1
 #define exception_switch 1
 #define notifyMe_switch 1
 #define notifyMe_switch 1