1.修改NPD离线Order Detail显示旧订单地址信息。

RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -8372,7 +8372,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             moreInfo = [self replaceHtml:moreInfo String:@"ShipToCompany_or_" withString:shipToCompany];
             NSString *shipToName = [self textAtColumn:19 statement:statement];
             moreInfo = [self replaceHtml:moreInfo String:@"ShipToName_or_" withString:shipToName];
-//            NSString *shipToAddr = [self textAtColumn:20 statement:statement];
+            NSString *shipToAddr = [self textAtColumn:20 statement:statement];
 //            moreInfo = [self replaceHtml:moreInfo String:@"ShipToAddress_or_" withString:shipToAddr];
             
             NSString *shipToAddr1 = [self textAtColumn:64 statement:statement];
@@ -8382,25 +8382,33 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             NSString *shipToZipCode = [self textAtColumn:68 statement:statement];
             NSString *shipToCountryCodeId = [self textAtColumn:69 statement:statement];// countryCode_Id
             
-            NSString *shipToCountryCode = [self countryCodeByCountryCodeId:shipToCountryCodeId db:db];
-            
-            moreInfo = [self replaceHtml:moreInfo String:@"ShipToAddress_1_or_" withString:shipToAddr1];
-            moreInfo = [self replaceHtml:moreInfo String:@"ShipToAddress_2_or_" withString:shipToAddr2];
-            if (!shipToCity.length && !shipToStateCode.length && !shipToZipCode.length && !shipToCountryCode.length) {
+            if (!shipToAddr1.length && !shipToAddr2.length && !shipToCity.length && !shipToStateCode.length && !shipToZipCode.length && !shipToCountryCodeId.length) {
+                moreInfo = [self replaceHtml:moreInfo String:@"ShipToAddress_1_or_" withString:shipToAddr];
+                moreInfo = [self replaceHtml:moreInfo String:@"ShipToAddress_2_or_" withString:@""];
                 moreInfo = [self replaceHtml:moreInfo String:@"ShipTo_City_State_ZipCode_Country_or" withString:@""];
             } else {
-                moreInfo = [self replaceHtml:moreInfo String:@"ShipTo_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",shipToCity,shipToStateCode,shipToZipCode,shipToCountryCode]];
+                NSString *shipToCountryCode = [self countryCodeByCountryCodeId:shipToCountryCodeId db:db];
+                
+                moreInfo = [self replaceHtml:moreInfo String:@"ShipToAddress_1_or_" withString:shipToAddr1];
+                moreInfo = [self replaceHtml:moreInfo String:@"ShipToAddress_2_or_" withString:shipToAddr2];
+                if (!shipToCity.length && !shipToStateCode.length && !shipToZipCode.length && !shipToCountryCode.length) {
+                    moreInfo = [self replaceHtml:moreInfo String:@"ShipTo_City_State_ZipCode_Country_or" withString:@""];
+                } else {
+                    moreInfo = [self replaceHtml:moreInfo String:@"ShipTo_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",shipToCity,shipToStateCode,shipToZipCode,shipToCountryCode]];
+                }
             }
             
             
             
+            
+            
             /*****ship from******/
             // ShipFromCompany_or_&nbsp
             NSString *shipFromCompany = [self textAtColumn:21 statement:statement];
             moreInfo = [self replaceHtml:moreInfo String:@"ShipFromCompany_or_" withString:shipFromCompany];
             NSString *shipFromName = [self textAtColumn:22 statement:statement];
             moreInfo = [self replaceHtml:moreInfo String:@"ShipFromName_or_" withString:shipFromName];
-//            NSString *shipFromAddr = [self textAtColumn:23 statement:statement];
+            NSString *shipFromAddr = [self textAtColumn:23 statement:statement];
 //            moreInfo = [self replaceHtml:moreInfo String:@"ShipFromAddress_or_" withString:shipFromAddr];
             
             NSString *shipFromAddr1 = [self textAtColumn:70 statement:statement];
@@ -8410,14 +8418,21 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             NSString *shipFromZipCode = [self textAtColumn:74 statement:statement];
             NSString *shipFromCountryCodeId = [self textAtColumn:75 statement:statement];// countryCode_Id
             
-            NSString *shipFromCountryCode = [self countryCodeByCountryCodeId:shipFromCountryCodeId db:db];
-            
-            moreInfo = [self replaceHtml:moreInfo String:@"ShipFromAddress_1_or_" withString:shipFromAddr1];
-            moreInfo = [self replaceHtml:moreInfo String:@"ShipFromAddress_2_or_" withString:shipFromAddr2];
-            if (!shipFromCity.length && !shipFromStateCode.length && !shipFromZipCode.length && !shipFromCountryCode.length) {
+            if (!shipFromAddr1.length && !shipFromAddr2.length && !shipFromCity.length && !shipFromStateCode.length && !shipFromZipCode.length && !shipFromCountryCodeId.length) {
+                moreInfo = [self replaceHtml:moreInfo String:@"ShipFromAddress_1_or_" withString:shipFromAddr];
+                moreInfo = [self replaceHtml:moreInfo String:@"ShipFromAddress_2_or_" withString:@""];
                 moreInfo = [self replaceHtml:moreInfo String:@"ShipFrom_City_State_ZipCode_Country_or" withString:@""];
             } else {
-                moreInfo = [self replaceHtml:moreInfo String:@"ShipFrom_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",shipFromCity,shipFromStateCode,shipFromZipCode,shipFromCountryCode]];
+            
+                NSString *shipFromCountryCode = [self countryCodeByCountryCodeId:shipFromCountryCodeId db:db];
+                
+                moreInfo = [self replaceHtml:moreInfo String:@"ShipFromAddress_1_or_" withString:shipFromAddr1];
+                moreInfo = [self replaceHtml:moreInfo String:@"ShipFromAddress_2_or_" withString:shipFromAddr2];
+                if (!shipFromCity.length && !shipFromStateCode.length && !shipFromZipCode.length && !shipFromCountryCode.length) {
+                    moreInfo = [self replaceHtml:moreInfo String:@"ShipFrom_City_State_ZipCode_Country_or" withString:@""];
+                } else {
+                    moreInfo = [self replaceHtml:moreInfo String:@"ShipFrom_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",shipFromCity,shipFromStateCode,shipFromZipCode,shipFromCountryCode]];
+                }
             }
             
             /*****freight to******/
@@ -8426,7 +8441,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToCompany_or_" withString:freightBillToCompany];
             NSString *freightBillToName = [self textAtColumn:25 statement:statement];
             moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToName_or_" withString:freightBillToName];
-//            NSString *freightBillToAddr = [self textAtColumn:26 statement:statement];
+            NSString *freightBillToAddr = [self textAtColumn:26 statement:statement];
 //            moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToAddress_or_" withString:freightBillToAddr];
             
             NSString *FreightBillToAddr1 = [self textAtColumn:76 statement:statement];
@@ -8436,15 +8451,21 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             NSString *FreightBillToZipCode = [self textAtColumn:80 statement:statement];
             NSString *FreightBillToCountryCodeId = [self textAtColumn:81 statement:statement];// countryCode_Id
             
-            NSString *FreightBillToCountryCode = [self countryCodeByCountryCodeId:FreightBillToCountryCodeId db:db];
-            
-            moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToAddress_1_or_" withString:FreightBillToAddr1];
-            moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToAddress_2_or_" withString:FreightBillToAddr2];
-            
-            if (!FreightBillToCity.length && !FreightBillToStateCode.length && !FreightBillToZipCode.length && !FreightBillToCountryCode.length) {
+            if (!FreightBillToAddr1.length && !FreightBillToAddr2.length && !FreightBillToCity.length && !FreightBillToStateCode.length && !FreightBillToZipCode.length && !FreightBillToCountryCodeId.length) {
+                moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToAddress_1_or_" withString:freightBillToAddr];
+                moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToAddress_2_or_" withString:@""];
                 moreInfo = [self replaceHtml:moreInfo String:@"FreightBillTo_City_State_ZipCode_Country_or" withString:@""];
             } else {
-                moreInfo = [self replaceHtml:moreInfo String:@"FreightBillTo_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",FreightBillToCity,FreightBillToStateCode,FreightBillToZipCode,FreightBillToCountryCode]];
+                NSString *FreightBillToCountryCode = [self countryCodeByCountryCodeId:FreightBillToCountryCodeId db:db];
+                
+                moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToAddress_1_or_" withString:FreightBillToAddr1];
+                moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToAddress_2_or_" withString:FreightBillToAddr2];
+                
+                if (!FreightBillToCity.length && !FreightBillToStateCode.length && !FreightBillToZipCode.length && !FreightBillToCountryCode.length) {
+                    moreInfo = [self replaceHtml:moreInfo String:@"FreightBillTo_City_State_ZipCode_Country_or" withString:@""];
+                } else {
+                    moreInfo = [self replaceHtml:moreInfo String:@"FreightBillTo_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",FreightBillToCity,FreightBillToStateCode,FreightBillToZipCode,FreightBillToCountryCode]];
+                }
             }
             
             
@@ -8454,7 +8475,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToCompany_or_" withString:merchandiseBillToCompany];
             NSString *merchandiseBillToName = [self textAtColumn:28 statement:statement];
             moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToName_or_" withString:merchandiseBillToName];
-//            NSString *merchandiseBillToAddr = [self textAtColumn:29 statement:statement];
+            NSString *merchandiseBillToAddr = [self textAtColumn:29 statement:statement];
 //            moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToAddress_or_" withString:merchandiseBillToAddr];
             
             NSString *MerchandiseBillToAddr1 = [self textAtColumn:82 statement:statement];
@@ -8464,15 +8485,21 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             NSString *MerchandiseBillToZipCode = [self textAtColumn:86 statement:statement];
             NSString *MerchandiseBillToCountryCodeId = [self textAtColumn:87 statement:statement];// countryCode_Id
             
-            NSString *MerchandiseBillToCountryCode = [self countryCodeByCountryCodeId:MerchandiseBillToCountryCodeId db:db];
-            
-            moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToAddress_1_or_" withString:MerchandiseBillToAddr1];
-            moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToAddress_2_or_" withString:MerchandiseBillToAddr2];
-            
-            if (!MerchandiseBillToCity.length && !MerchandiseBillToStateCode.length && !MerchandiseBillToZipCode.length && !MerchandiseBillToCountryCode.length) {
+            if (!MerchandiseBillToAddr1.length && !MerchandiseBillToAddr2.length && !MerchandiseBillToCity.length && !MerchandiseBillToStateCode.length && !MerchandiseBillToZipCode.length && !MerchandiseBillToCountryCodeId.length) {
+                moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToAddress_1_or_" withString:merchandiseBillToAddr];
+                moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToAddress_2_or_" withString:@""];
                 moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillTo_City_State_ZipCode_Country_or" withString:@""];
             } else {
-                moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillTo_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",MerchandiseBillToCity,MerchandiseBillToStateCode,MerchandiseBillToZipCode,MerchandiseBillToCountryCode]];
+                NSString *MerchandiseBillToCountryCode = [self countryCodeByCountryCodeId:MerchandiseBillToCountryCodeId db:db];
+            
+                moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToAddress_1_or_" withString:MerchandiseBillToAddr1];
+                moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToAddress_2_or_" withString:MerchandiseBillToAddr2];
+            
+                if (!MerchandiseBillToCity.length && !MerchandiseBillToStateCode.length && !MerchandiseBillToZipCode.length && !MerchandiseBillToCountryCode.length) {
+                    moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillTo_City_State_ZipCode_Country_or" withString:@""];
+                } else {
+                    moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillTo_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",MerchandiseBillToCity,MerchandiseBillToStateCode,MerchandiseBillToZipCode,MerchandiseBillToCountryCode]];
+                }
             }
             
             /*****return to******/
@@ -8481,7 +8508,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             moreInfo = [self replaceHtml:moreInfo String:@"ReturnToCompany_or_" withString:returnToCompany];
             NSString *returnToName = [self textAtColumn:31 statement:statement];
             moreInfo = [self replaceHtml:moreInfo String:@"ReturnToName_or_" withString:returnToName];
-//            NSString *returnToAddr = [self textAtColumn:32 statement:statement];
+            NSString *returnToAddr = [self textAtColumn:32 statement:statement];
 //            moreInfo = [self replaceHtml:moreInfo String:@"ReturnToAddress_or_" withString:returnToAddr];
             
             
@@ -8492,15 +8519,21 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             NSString *ReturnToZipCode = [self textAtColumn:92 statement:statement];
             NSString *ReturnToCountryCodeId = [self textAtColumn:93 statement:statement];// countryCode_Id
             
-            NSString *ReturnToCountryCode = [self countryCodeByCountryCodeId:ReturnToCountryCodeId db:db];
-            
-            moreInfo = [self replaceHtml:moreInfo String:@"ReturnToAddress_1_or_" withString:ReturnToAddr1];
-            moreInfo = [self replaceHtml:moreInfo String:@"ReturnToAddress_2_or_" withString:ReturnToAddr2];
-            
-            if (!ReturnToCity.length && !ReturnToStateCode.length && !ReturnToZipCode.length && !ReturnToCountryCode.length) {
+            if (!ReturnToAddr1.length && !ReturnToAddr2.length && !ReturnToCity.length && !ReturnToStateCode.length && !ReturnToZipCode.length && !ReturnToCountryCodeId.length) {
+                moreInfo = [self replaceHtml:moreInfo String:@"ReturnToAddress_1_or_" withString:returnToAddr];
+                moreInfo = [self replaceHtml:moreInfo String:@"ReturnToAddress_2_or_" withString:@""];
                 moreInfo = [self replaceHtml:moreInfo String:@"ReturnTo_City_State_ZipCode_Country_or" withString:@""];
             } else {
-                moreInfo = [self replaceHtml:moreInfo String:@"ReturnTo_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",ReturnToCity,ReturnToStateCode,ReturnToZipCode,ReturnToCountryCode]];
+                NSString *ReturnToCountryCode = [self countryCodeByCountryCodeId:ReturnToCountryCodeId db:db];
+            
+                moreInfo = [self replaceHtml:moreInfo String:@"ReturnToAddress_1_or_" withString:ReturnToAddr1];
+                moreInfo = [self replaceHtml:moreInfo String:@"ReturnToAddress_2_or_" withString:ReturnToAddr2];
+            
+                if (!ReturnToCity.length && !ReturnToStateCode.length && !ReturnToZipCode.length && !ReturnToCountryCode.length) {
+                    moreInfo = [self replaceHtml:moreInfo String:@"ReturnTo_City_State_ZipCode_Country_or" withString:@""];
+                } else {
+                    moreInfo = [self replaceHtml:moreInfo String:@"ReturnTo_City_State_ZipCode_Country_or" withString:[NSString stringWithFormat:@"%@, %@ %@ %@",ReturnToCity,ReturnToStateCode,ReturnToZipCode,ReturnToCountryCode]];
+                }
             }
             
             //