1.修改NPD Order Detail Address新格式。

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

@@ -8323,6 +8323,8 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             moreInfo = [self replaceHtml:moreInfo String:@"ShipToName_or_" withString:shipToName];
             NSString *shipToAddr = [self textAtColumn:20 statement:statement];
             shipToAddr = [shipToAddr stringByReplacingOccurrencesOfString:@"\r\n" withString:@"<br/>"];
+            shipToAddr = [shipToAddr stringByReplacingOccurrencesOfString:@"\r" withString:@"<br/>"]; // 手动输入的可能是\r 或 \n
+            shipToAddr = [shipToAddr stringByReplacingOccurrencesOfString:@"\n" withString:@"<br/>"];
             moreInfo = [self replaceHtml:moreInfo String:@"ShipToAddress_or_" withString:shipToAddr];
             
             /*****ship from******/
@@ -8333,6 +8335,8 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             moreInfo = [self replaceHtml:moreInfo String:@"ShipFromName_or_" withString:shipFromName];
             NSString *shipFromAddr = [self textAtColumn:23 statement:statement];
             shipFromAddr = [shipFromAddr stringByReplacingOccurrencesOfString:@"\r\n" withString:@"<br/>"];
+            shipFromAddr = [shipFromAddr stringByReplacingOccurrencesOfString:@"\r" withString:@"<br/>"];
+            shipFromAddr = [shipFromAddr stringByReplacingOccurrencesOfString:@"\n" withString:@"<br/>"];
             moreInfo = [self replaceHtml:moreInfo String:@"ShipFromAddress_or_" withString:shipFromAddr];
             
             /*****freight to******/
@@ -8343,6 +8347,8 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToName_or_" withString:freightBillToName];
             NSString *freightBillToAddr = [self textAtColumn:26 statement:statement];
             freightBillToAddr = [freightBillToAddr stringByReplacingOccurrencesOfString:@"\r\n" withString:@"<br/>"];
+            freightBillToAddr = [freightBillToAddr stringByReplacingOccurrencesOfString:@"\r" withString:@"<br/>"];
+            freightBillToAddr = [freightBillToAddr stringByReplacingOccurrencesOfString:@"\n" withString:@"<br/>"];
             moreInfo = [self replaceHtml:moreInfo String:@"FreightBillToAddress_or_" withString:freightBillToAddr];
             
             /*****merchandise to******/
@@ -8353,6 +8359,8 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToName_or_" withString:merchandiseBillToName];
             NSString *merchandiseBillToAddr = [self textAtColumn:29 statement:statement];
             merchandiseBillToAddr = [merchandiseBillToAddr stringByReplacingOccurrencesOfString:@"\r\n" withString:@"<br/>"];
+            merchandiseBillToAddr = [merchandiseBillToAddr stringByReplacingOccurrencesOfString:@"\r" withString:@"<br/>"];
+            merchandiseBillToAddr = [merchandiseBillToAddr stringByReplacingOccurrencesOfString:@"\n" withString:@"<br/>"];
             moreInfo = [self replaceHtml:moreInfo String:@"MerchandiseBillToAddress_or_" withString:merchandiseBillToAddr];
             
             /*****return to******/
@@ -8363,6 +8371,8 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             moreInfo = [self replaceHtml:moreInfo String:@"ReturnToName_or_" withString:returnToName];
             NSString *returnToAddr = [self textAtColumn:32 statement:statement];
             returnToAddr = [returnToAddr stringByReplacingOccurrencesOfString:@"\r\n" withString:@"<br/>"];
+            returnToAddr = [returnToAddr stringByReplacingOccurrencesOfString:@"\r" withString:@"<br/>"];
+            returnToAddr = [returnToAddr stringByReplacingOccurrencesOfString:@"\n" withString:@"<br/>"];
             moreInfo = [self replaceHtml:moreInfo String:@"ReturnToAddress_or_" withString:returnToAddr];
             //