1.修改NPD离线Place Order信息修改后未被覆盖。

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

@@ -12470,71 +12470,96 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     NSString *receive_cid = [self valueInParams:param key:@"receive_cid" translateSingleQuote:YES];
     if (receive_cid.length) {
          receive_cid = [NSString stringWithFormat:@"receive_cid = '%@',",receive_cid];
+    } else {
+        receive_cid = [NSString stringWithFormat:@"receive_cid = null,"];
     }
     
     NSString *receive_name = [self valueInParams:param key:@"receive_name" translateSingleQuote:YES];
     if (receive_name.length) {
         receive_name = [NSString stringWithFormat:@"receive_name = '%@',",receive_name];
+    } else {
+        receive_name = [NSString stringWithFormat:@"receive_name = null,"];
     }
     
     
     NSString *receive_ext = [self valueInParams:param key:@"receive_ext" translateSingleQuote:YES];
     if (receive_ext.length) {
         receive_ext = [NSString stringWithFormat:@"receive_ext = '%@',",receive_ext];
+    } else {
+        receive_ext = [NSString stringWithFormat:@"receive_ext = null,"];
     }
     
     NSString *receive_addr1 = [self valueInParams:param key:@"receive_address1" translateSingleQuote:YES];
     if (receive_addr1.length) {
         receive_addr1 = [NSString stringWithFormat:@"receive_address1 = '%@',",receive_addr1];
+    } else {
+        receive_addr1 = [NSString stringWithFormat:@"receive_address1 = null,"];
     }
     
     NSString *receive_addr2 = [self valueInParams:param key:@"receive_address2" translateSingleQuote:YES];
     if (receive_addr2.length) {
         receive_addr2 = [NSString stringWithFormat:@"receive_address2 = '%@',",receive_addr2];
+    } else {
+        receive_addr2 = [NSString stringWithFormat:@"receive_address2 = null,"];
     }
     
     NSString *receive_city = [self valueInParams:param key:@"receive_city" translateSingleQuote:YES];
     if (receive_city.length) {
         receive_city = [NSString stringWithFormat:@"receive_city = '%@',",receive_city];
+    } else {
+        receive_city = [NSString stringWithFormat:@"receive_city = null,"];
     }
     
     NSString *receive_state = [self valueInParams:param key:@"receive_state" translateSingleQuote:YES];
     if (receive_state.length) {
         receive_state = [NSString stringWithFormat:@"receive_state = '%@',",receive_state];
+    } else {
+        receive_state = [NSString stringWithFormat:@"receive_state = null,"];
     }
     
     NSString *receive_zipcode = [self valueInParams:param key:@"receive_zipcode" translateSingleQuote:YES];
     if (receive_zipcode.length) {
         receive_zipcode = [NSString stringWithFormat:@"receive_zipcode = '%@',",receive_zipcode];
+    } else {
+        receive_zipcode = [NSString stringWithFormat:@"receive_zipcode = null,"];
     }
     
     NSString *receive_country = [self valueInParams:param key:@"receive_country" translateSingleQuote:YES];
     if (receive_country.length) {
         receive_country = [NSString stringWithFormat:@"receive_country = '%@',",receive_country];
+    } else {
+        receive_country = [NSString stringWithFormat:@"receive_country = null,"];
     }
     
     NSString *receive_contact = [self valueInParams:param key:@"receive_contact" translateSingleQuote:YES];
     if (receive_contact.length) {
         receive_contact = [NSString stringWithFormat:@"receive_contact = '%@',",receive_contact];
+    } else {
+        receive_contact = [NSString stringWithFormat:@"receive_contact = null,"];
     }
     
     
     NSString *receive_phone = [self valueInParams:param key:@"receive_phone" translateSingleQuote:YES];
     if (receive_phone.length) {
         receive_phone = [NSString stringWithFormat:@"receive_phone = '%@',",receive_phone];
+    } else {
+        receive_phone = [NSString stringWithFormat:@"receive_phone = null,"];
     }
     
     
     NSString *receive_email = [self valueInParams:param key:@"receive_email" translateSingleQuote:YES];
     if (receive_email.length) {
         receive_email = [NSString stringWithFormat:@"receive_email = '%@',",receive_email];
-
+    } else {
+        receive_email = [NSString stringWithFormat:@"receive_email = null,"];
     }
     
     
     NSString *receive_fax = [self valueInParams:param key:@"receive_fax" translateSingleQuote:YES];
     if (receive_fax.length) {
         receive_fax = [NSString stringWithFormat:@"receive_fax = '%@',",receive_fax];
+    } else {
+        receive_fax = [NSString stringWithFormat:@"receive_fax = null,"];
     }
     
     
@@ -12543,266 +12568,370 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     NSString *sender_cid = [self valueInParams:param key:@"sender_cid" translateSingleQuote:YES];
     if (sender_cid.length) {
         sender_cid = [NSString stringWithFormat:@"sender_cid = '%@',",sender_cid];
+    } else {
+        sender_cid = [NSString stringWithFormat:@"sender_cid = null,"];
     }
     
     NSString *sender_name = [self valueInParams:param key:@"sender_name" translateSingleQuote:YES];
     if (sender_name.length) {
         sender_name = [NSString stringWithFormat:@"sender_name = '%@',",sender_name];
+    } else {
+        sender_name = [NSString stringWithFormat:@"sender_name = null,"];
     }
     
     NSString *sender_ext = [self valueInParams:param key:@"sender_ext" translateSingleQuote:YES];
     if (sender_ext.length) {
         sender_ext = [NSString stringWithFormat:@"sender_ext = '%@',",sender_ext];
+    } else {
+        sender_ext = [NSString stringWithFormat:@"sender_ext = null,"];
     }
     
     NSString *sender_addr1 = [self valueInParams:param key:@"sender_address1" translateSingleQuote:YES];
     if (sender_addr1.length) {
         sender_addr1 = [NSString stringWithFormat:@"sender_address1 = '%@',",sender_addr1];
+    } else {
+        sender_addr1 = [NSString stringWithFormat:@"sender_address1 = null,"];
     }
     
     NSString *sender_addr2 = [self valueInParams:param key:@"sender_address2" translateSingleQuote:YES];
     if (sender_addr2.length) {
         sender_addr2 = [NSString stringWithFormat:@"sender_address2 = '%@',",sender_addr2];
+    } else {
+        sender_addr2 = [NSString stringWithFormat:@"sender_address2 = null,"];
     }
     
     NSString *sender_city = [self valueInParams:param key:@"sender_city" translateSingleQuote:YES];
     if (sender_city.length) {
         sender_city = [NSString stringWithFormat:@"sender_city = '%@',",sender_city];
+    } else {
+        sender_city = [NSString stringWithFormat:@"sender_city = null,"];
     }
     
     NSString *sender_state = [self valueInParams:param key:@"sender_state" translateSingleQuote:YES];
     if (sender_state.length) {
         sender_state = [NSString stringWithFormat:@"sender_state = '%@',",sender_state];
+    } else {
+        sender_state = [NSString stringWithFormat:@"sender_state = null,"];
     }
     
     NSString *sender_zipcode = [self valueInParams:param key:@"sender_zipcode" translateSingleQuote:YES];
     if (sender_zipcode.length) {
         sender_zipcode = [NSString stringWithFormat:@"sender_zipcode = '%@',",sender_zipcode];
+    } else {
+        sender_zipcode = [NSString stringWithFormat:@"sender_zipcode = null,"];
     }
     
     NSString *sender_country = [self valueInParams:param key:@"sender_country" translateSingleQuote:YES];
     if (sender_country.length) {
         sender_country = [NSString stringWithFormat:@"sender_country = '%@',",sender_country];
+    } else {
+        sender_country = [NSString stringWithFormat:@"sender_country = null,"];
     }
     
     NSString *sender_contact = [self valueInParams:param key:@"sender_contact" translateSingleQuote:YES];
     if(sender_contact.length) {
         sender_contact = [NSString stringWithFormat:@"sender_contact = '%@',",sender_contact];
+    } else {
+        sender_contact = [NSString stringWithFormat:@"sender_contact = null,"];
     }
     
     NSString *sender_phone = [self valueInParams:param key:@"sender_phone" translateSingleQuote:YES];
     if (sender_phone.length) {
         sender_phone = [NSString stringWithFormat:@"sender_phone = '%@',",sender_phone];
+    } else {
+        sender_phone = [NSString stringWithFormat:@"sender_phone = null,"];
     }
     
     
     NSString *sender_fax = [self valueInParams:param key:@"sender_fax" translateSingleQuote:YES];
     if (sender_fax.length) {
         sender_fax = [NSString stringWithFormat:@"sender_fax = '%@',",sender_fax];
+    } else {
+        sender_fax = [NSString stringWithFormat:@"sender_fax = null,"];
     }
     
     NSString *sender_email = [self valueInParams:param key:@"sender_email" translateSingleQuote:YES];
     if (sender_email.length) {
         sender_email = [NSString stringWithFormat:@"sender_email = '%@',",sender_email];
+    } else {
+        sender_email = [NSString stringWithFormat:@"sender_email = null,"];
     }
     
     NSString *shipping_billto_cid = [self valueInParams:param key:@"shipping_billto_cid" translateSingleQuote:YES];
     if (shipping_billto_cid.length) {
         shipping_billto_cid = [NSString stringWithFormat:@"shipping_billto_cid = '%@',",shipping_billto_cid];
+    } else {
+        shipping_billto_cid = [NSString stringWithFormat:@"shipping_billto_cid = null,"];
     }
     
     
     NSString *shipping_billto_name = [self valueInParams:param key:@"shipping_billto_name" translateSingleQuote:YES];
     if (shipping_billto_name.length) {
         shipping_billto_name = [NSString stringWithFormat:@"shipping_billto_name = '%@',",shipping_billto_name];
+    } else {
+        shipping_billto_name = [NSString stringWithFormat:@"shipping_billto_name = null,"];
     }
     
     
     NSString *shipping_billto_ext = [self valueInParams:param key:@"shipping_billto_ext" translateSingleQuote:YES];
     if (shipping_billto_ext.length) {
         shipping_billto_ext = [NSString stringWithFormat:@"shipping_billto_ext = '%@',",shipping_billto_ext];
+    } else {
+        shipping_billto_ext = [NSString stringWithFormat:@"shipping_billto_ext = null,"];
     }
     
     NSString *shipping_billto_addr1 = [self valueInParams:param key:@"shipping_billto_address1" translateSingleQuote:YES];
     if (shipping_billto_addr1.length) {
         shipping_billto_addr1 = [NSString stringWithFormat:@"shipping_billto_address1 = '%@',",shipping_billto_addr1];
+    } else {
+        shipping_billto_addr1 = [NSString stringWithFormat:@"shipping_billto_address1 = null,"];
     }
     
     NSString *shipping_billto_addr2 = [self valueInParams:param key:@"shipping_billto_address2" translateSingleQuote:YES];
     if (shipping_billto_addr2.length) {
         shipping_billto_addr2 = [NSString stringWithFormat:@"shipping_billto_address2 = '%@',",shipping_billto_addr2];
+    } else {
+        shipping_billto_addr2 = [NSString stringWithFormat:@"shipping_billto_address2 = null,"];
     }
     
     NSString *shipping_billto_city = [self valueInParams:param key:@"shipping_billto_city" translateSingleQuote:YES];
     if (shipping_billto_city.length) {
         shipping_billto_city = [NSString stringWithFormat:@"shipping_billto_city = '%@',",shipping_billto_city];
+    } else {
+        shipping_billto_city = [NSString stringWithFormat:@"shipping_billto_city = null,"];
     }
     
     NSString *shipping_billto_state = [self valueInParams:param key:@"shipping_billto_state" translateSingleQuote:YES];
     if (shipping_billto_state.length) {
         shipping_billto_state = [NSString stringWithFormat:@"shipping_billto_state = '%@',",shipping_billto_state];
+    } else {
+        shipping_billto_state = [NSString stringWithFormat:@"shipping_billto_state = null,"];
     }
     
     NSString *shipping_billto_zipcode = [self valueInParams:param key:@"shipping_billto_zipcode" translateSingleQuote:YES];
     if (shipping_billto_zipcode.length) {
         shipping_billto_zipcode = [NSString stringWithFormat:@"shipping_billto_zipcode = '%@',",shipping_billto_zipcode];
+    } else {
+        shipping_billto_zipcode = [NSString stringWithFormat:@"shipping_billto_zipcode = null,"];
     }
     
     NSString *shipping_billto_country = [self valueInParams:param key:@"shipping_billto_country" translateSingleQuote:YES];
     if (shipping_billto_country.length) {
         shipping_billto_country = [NSString stringWithFormat:@"shipping_billto_country = '%@',",shipping_billto_country];
+    } else {
+        shipping_billto_country = [NSString stringWithFormat:@"shipping_billto_country = null,"];
     }
     
     NSString *shipping_billto_contact = [self valueInParams:param key:@"shipping_billto_contact" translateSingleQuote:YES];
     if (shipping_billto_contact.length) {
         shipping_billto_contact = [NSString stringWithFormat:@"shipping_billto_contact = '%@',",shipping_billto_contact];
+    } else {
+        shipping_billto_contact = [NSString stringWithFormat:@"shipping_billto_contact = null,"];
     }
     
     NSString *shipping_billto_phone = [self valueInParams:param key:@"shipping_billto_phone" translateSingleQuote:YES];
     if (shipping_billto_phone.length) {
         shipping_billto_phone = [NSString stringWithFormat:@"shipping_billto_phone = '%@',",shipping_billto_phone];
+    } else {
+        shipping_billto_phone = [NSString stringWithFormat:@"shipping_billto_phone = null,"];
     }
     
     NSString *shipping_billto_fax = [self valueInParams:param key:@"shipping_billto_fax" translateSingleQuote:YES];
     if (shipping_billto_fax.length) {
         shipping_billto_fax = [NSString stringWithFormat:@"shipping_billto_fax = '%@',",shipping_billto_fax];
+    } else {
+        shipping_billto_fax = [NSString stringWithFormat:@"shipping_billto_fax = null,"];
     }
     
     NSString *shipping_billto_email = [self valueInParams:param key:@"shipping_billto_email" translateSingleQuote:YES];
     if (shipping_billto_email.length) {
         shipping_billto_email = [NSString stringWithFormat:@"shipping_billto_email = '%@',",shipping_billto_email];
+    } else {
+        shipping_billto_email = [NSString stringWithFormat:@"shipping_billto_email = null,"];
     }
     
     
     NSString *billing_cid = [self valueInParams:param key:@"billing_cid" translateSingleQuote:YES];
     if (billing_cid.length) {
         billing_cid = [NSString stringWithFormat:@"billing_cid = '%@',",billing_cid];
+    } else {
+        billing_cid = [NSString stringWithFormat:@"billing_cid = null,"];
     }
     
     NSString *billing_name = [self valueInParams:param key:@"billing_name" translateSingleQuote:YES];
     if (billing_name.length) {
         billing_name = [NSString stringWithFormat:@"billing_name = '%@',",billing_name];
+    } else {
+        billing_name = [NSString stringWithFormat:@"billing_name = null,"];
     }
     
     NSString *billing_ext = [self valueInParams:param key:@"billing_ext" translateSingleQuote:YES];
     if (billing_ext.length) {
         billing_ext = [NSString stringWithFormat:@"billing_ext = '%@',",billing_ext];
+    } else {
+        billing_ext = [NSString stringWithFormat:@"billing_ext = null,"];
     }
     
     NSString *billing_addr1 = [self valueInParams:param key:@"billing_address1" translateSingleQuote:YES];
     if (billing_addr1.length) {
         billing_addr1 = [NSString stringWithFormat:@"billing_address1 = '%@',",billing_addr1];
+    } else {
+        billing_addr1 = [NSString stringWithFormat:@"billing_address1 = null,"];
     }
     
     NSString *billing_addr2 = [self valueInParams:param key:@"billing_address2" translateSingleQuote:YES];
     if (billing_addr2.length) {
         billing_addr2 = [NSString stringWithFormat:@"billing_address2 = '%@',",billing_addr2];
+    } else {
+        billing_addr2 = [NSString stringWithFormat:@"billing_address2 = null,"];
     }
     
     NSString *billing_city = [self valueInParams:param key:@"billing_city" translateSingleQuote:YES];
     if (billing_city.length) {
         billing_city = [NSString stringWithFormat:@"billing_city = '%@',",billing_city];
+    } else {
+        billing_city = [NSString stringWithFormat:@"billing_city = null,"];
     }
     
     NSString *billing_state = [self valueInParams:param key:@"billing_state" translateSingleQuote:YES];
     if (billing_state.length) {
         billing_state = [NSString stringWithFormat:@"billing_state = '%@',",billing_state];
+    } else {
+        billing_state = [NSString stringWithFormat:@"billing_state = null,"];
     }
     
     NSString *billing_zipcode = [self valueInParams:param key:@"billing_zipcode" translateSingleQuote:YES];
     if (billing_zipcode.length) {
         billing_zipcode = [NSString stringWithFormat:@"billing_zipcode = '%@',",billing_zipcode];
+    } else {
+        billing_zipcode = [NSString stringWithFormat:@"billing_zipcode = null,"];
     }
     
     NSString *billing_country = [self valueInParams:param key:@"billing_country" translateSingleQuote:YES];
     if (billing_country.length) {
         billing_country = [NSString stringWithFormat:@"billing_country = '%@',",billing_country];
+    } else {
+        billing_country = [NSString stringWithFormat:@"billing_country = null,"];
     }
     
     NSString *billing_contact = [self valueInParams:param key:@"billing_contact" translateSingleQuote:YES];
     if (billing_contact.length) {
         billing_contact = [NSString stringWithFormat:@"billing_contact = '%@',",billing_contact];
+    } else {
+        billing_contact = [NSString stringWithFormat:@"billing_contact = null,"];
     }
     
     NSString *billing_phone = [self valueInParams:param key:@"billing_phone" translateSingleQuote:YES];
     if (billing_phone.length) {
         billing_phone = [NSString stringWithFormat:@"billing_phone = '%@',",billing_phone];
+    } else {
+        billing_phone = [NSString stringWithFormat:@"billing_phone = null,"];
     }
     
     NSString *billing_fax = [self valueInParams:param key:@"billing_fax" translateSingleQuote:YES];
     if (billing_fax.length) {
         billing_fax = [NSString stringWithFormat:@"billing_fax = '%@',",billing_fax];
+    } else {
+        billing_fax = [NSString stringWithFormat:@"billing_fax = null,"];
     }
     
     NSString *billing_email = [self valueInParams:param key:@"billing_email" translateSingleQuote:YES];
     if (billing_email.length) {
         billing_email = [NSString stringWithFormat:@"billing_email = '%@',",billing_email];
+    } else {
+        billing_email = [NSString stringWithFormat:@"billing_email = null,"];
     }
     
     
     NSString *returnto_cid = [self valueInParams:param key:@"returnto_cid" translateSingleQuote:YES];
     if (returnto_cid.length) {
         returnto_cid = [NSString stringWithFormat:@"returnto_cid = '%@',",returnto_cid];
+    } else {
+        returnto_cid = [NSString stringWithFormat:@"returnto_cid = null,"];
     }
     
     NSString *returnto_name = [self valueInParams:param key:@"returnto_name" translateSingleQuote:YES];
     if (returnto_name.length) {
         returnto_name = [NSString stringWithFormat:@"returnto_name = '%@',",returnto_name];
+    } else {
+        returnto_name = [NSString stringWithFormat:@"returnto_name = null,"];
     }
     
     NSString *returnto_ext = [self valueInParams:param key:@"returnto_ext" translateSingleQuote:YES];
     if (returnto_ext.length) {
         returnto_ext = [NSString stringWithFormat:@"returnto_ext = '%@',",returnto_ext];
+    } else {
+        returnto_ext = [NSString stringWithFormat:@"returnto_ext = null,"];
     }
     
     NSString *returnto_addr1 = [self valueInParams:param key:@"returnto_address1" translateSingleQuote:YES];
     if (returnto_addr1.length) {
         returnto_addr1 = [NSString stringWithFormat:@"returnto_address1 = '%@',",returnto_addr1];
+    } else {
+        returnto_addr1 = [NSString stringWithFormat:@"returnto_address1 = null,"];
     }
     
     NSString *returnto_addr2 = [self valueInParams:param key:@"returnto_address2" translateSingleQuote:YES];
     if (returnto_addr2.length) {
         returnto_addr2 = [NSString stringWithFormat:@"returnto_address2 = '%@',",returnto_addr2];
+    } else {
+        returnto_addr2 = [NSString stringWithFormat:@"returnto_address2 = null,"];
     }
     
     NSString *returnto_city = [self valueInParams:param key:@"returnto_city" translateSingleQuote:YES];
     if (returnto_city.length) {
         returnto_city = [NSString stringWithFormat:@"returnto_city = '%@',",returnto_city];
+    } else {
+        returnto_city = [NSString stringWithFormat:@"returnto_city = null,"];
     }
     
     NSString *returnto_state = [self valueInParams:param key:@"returnto_state" translateSingleQuote:YES];
     if (returnto_state.length) {
         returnto_state = [NSString stringWithFormat:@"returnto_state = '%@',",returnto_state];
+    } else {
+        returnto_state = [NSString stringWithFormat:@"returnto_state = null,"];
     }
     
     NSString *returnto_zipcode = [self valueInParams:param key:@"returnto_zipcode" translateSingleQuote:YES];
     if (returnto_zipcode.length) {
         returnto_zipcode = [NSString stringWithFormat:@"returnto_zipcode = '%@',",returnto_zipcode];
+    } else {
+        returnto_zipcode = [NSString stringWithFormat:@"returnto_zipcode = null,"];
     }
     
     NSString *returnto_country = [self valueInParams:param key:@"returnto_country" translateSingleQuote:YES];
     if (returnto_country.length) {
         returnto_country = [NSString stringWithFormat:@"returnto_country = '%@',",returnto_country];
+    } else {
+        returnto_country = [NSString stringWithFormat:@"returnto_country = null,"];
     }
     
     NSString *returnto_contact = [self valueInParams:param key:@"returnto_contact" translateSingleQuote:YES];
     if (returnto_contact.length) {
         returnto_contact = [NSString stringWithFormat:@"returnto_contact = '%@',",returnto_contact];
+    } else {
+        returnto_contact = [NSString stringWithFormat:@"returnto_contact = null,"];
     }
     
     NSString *returnto_phone = [self valueInParams:param key:@"returnto_phone" translateSingleQuote:YES];
     if (returnto_phone.length) {
         returnto_phone = [NSString stringWithFormat:@"returnto_phone = '%@',",returnto_phone];
+    } else {
+        returnto_phone = [NSString stringWithFormat:@"returnto_phone = null,"];
     }
     
     NSString *returnto_fax = [self valueInParams:param key:@"returnto_fax" translateSingleQuote:YES];
     if (returnto_fax.length) {
         returnto_fax = [NSString stringWithFormat:@"returnto_fax = '%@',",returnto_fax];
+    } else {
+        returnto_fax = [NSString stringWithFormat:@"returnto_fax = null,"];
     }
     
     NSString *returnto_email = [self valueInParams:param key:@"returnto_email" translateSingleQuote:YES];
     if (returnto_email.length) {
         returnto_email = [NSString stringWithFormat:@"returnto_email = '%@',",returnto_email];
+    } else {
+        returnto_email = [NSString stringWithFormat:@"returnto_email = null,"];
     }
     
     NSString *order_status = @"status = 1,";