修复离线Model的Bundle价格不正确。

RedAnt ERP Mobile/HMLG Mobile/config.h

@@ -33,131 +33,131 @@
 #ifdef test_server
 
 //------------------- chen server-----------------------
-#define  URL_UPDATE_AUTH  @"http://192.168.0.132:8080/site/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.132:8080/site/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.132:8080/site/isales/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"http://192.168.0.132:80/pj/isales/login.htm"
+#define  URL_LOGOUT  @"http://192.168.0.132:80/pj/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"http://192.168.0.132:80/pj/isales/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"http://192.168.0.132:8080/site/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.132:8080/site/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.132:8080/site/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.132:8080/site/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.132:8080/site/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.132:8080/site/isales/categoryMore.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.132:8080/site/isales/getContactAdvance.htm"
+#define  URL_REQUEST_CATMENU  @"http://192.168.0.132:80/pj/isales/menu.htm"
+#define  URL_LOAD_HOME  @"http://192.168.0.132:80/pj/isales/homePage.htm"
+#define  URL_CATEGORY @"http://192.168.0.132:80/pj/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"http://192.168.0.132:80/pj/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"http://192.168.0.132:80/pj/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.132:80/pj/isales/categoryMore.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.132:80/pj/isales/getContactAdvance.htm"
 
 
-#define  URL_ORDER_LIST  @"http://192.168.0.132:8080/site/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.132:8080/site/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.132:8080/site/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.132:8080/site/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.132:8080/site/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.132:8080/site/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.132:8080/site/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.132:8080/site/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.132:8080/site/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.132:8080/site/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.132:8080/site/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.132:8080/site/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"http://192.168.0.132:80/pj/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"http://192.168.0.132:80/pj/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"http://192.168.0.132:80/pj/isales/createOrder.htm"
+#define URL_COPY_ORDER @"http://192.168.0.132:80/pj/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"http://192.168.0.132:80/pj/isales/updateOrderSign.htm"
+#define URL_SAVE_ORDER @"http://192.168.0.132:80/pj/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.132:80/pj/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"http://192.168.0.132:80/pj/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"http://192.168.0.132:80/pj/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"http://192.168.0.132:80/pj/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"http://192.168.0.132:80/pj/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"http://192.168.0.132:80/pj/isales/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"http://192.168.0.132:8080/site/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.132:8080/site/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.132:8080/site/isales/updateGeneralNote.htm"
+#define  URL_CART_SET_PRICE  @"http://192.168.0.132:80/pj/isales/setPrice.htm"
+#define  URL_CART_ITEM_NOTES  @"http://192.168.0.132:80/pj/isales/setItemNotes.htm"
+#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.132:80/pj/isales/updateGeneralNote.htm"
 
-#define  URL_CART_INCRESEMENT  @"http://192.168.0.132:8080/site/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.132:8080/site/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.132:8080/site/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.132:8080/site/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.132:8080/site/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.132:8080/site/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.132:8080/site/isales/wishlistRemoveToCart.htm"
+#define  URL_CART_INCRESEMENT  @"http://192.168.0.132:80/pj/isales/increment.htm"
+#define  URL_CART  @"http://192.168.0.132:80/pj/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"http://192.168.0.132:80/pj/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"http://192.168.0.132:80/pj/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"http://192.168.0.132:80/pj/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"http://192.168.0.132:80/pj/isales/checkCartItem.htm"
+#define  URL_CART2WISH  @"http://192.168.0.132:80/pj/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"http://192.168.0.132:80/pj/isales/wishlistRemoveToCart.htm"
 
 
 
 
-#define  URL_CATEGORYADDALL  @"http://192.168.0.132:8080/site/isales/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"http://192.168.0.132:8080/site/isales/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"http://192.168.0.132:8080/site/isales/itemSearchAddAllTo.htm"
+#define  URL_CATEGORYADDALL  @"http://192.168.0.132:80/pj/isales/categoryAddAllTo.htm"
+#define  URL_SEARCHADDALL  @"http://192.168.0.132:80/pj/isales/searchAddAllTo.htm"
+#define  URL_ITEMSEARCHADDALL @"http://192.168.0.132:80/pj/isales/itemSearchAddAllTo.htm"
 
 
-#define  URL_ITEM_DETAIL  @"http://192.168.0.132:8080/site/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"http://192.168.0.132:80/pj/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.132:8080/site/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.132:8080/site/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.132:80/pj/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"http://192.168.0.132:80/pj/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.132:80/pj/isales/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.132:8080/site/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.132:8080/site/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.132:8080/site/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.132:8080/site/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.132:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.132:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.132:8080/site/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.132:8080/site/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://192.168.0.132:8080/site/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.132:8080/site/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.132:80/pj/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.132:80/pj/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.132:80/pj/isales/deleteTearSheetPdf.htm"
+#define  URL_PORTFOLIO  @"http://192.168.0.132:80/pj/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.132:80/pj/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"http://192.168.0.132:80/pj/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"http://192.168.0.132:80/pj/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"http://192.168.0.132:80/pj/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"http://192.168.0.132:80/pj/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"http://192.168.0.132:80/pj/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.0.132:80/pj/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.132:80/pj/isales/getTearSheetAvailableQty.htm"
 
-#define  URL_CONTACT_LIST  @"http://192.168.0.132:8080/site/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.132:8080/site/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"http://192.168.0.132:80/pj/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"http://192.168.0.132:80/pj/isales/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.132:8080/site/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.132:8080/site/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.132:80/pj/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"http://192.168.0.132:80/pj/isales/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.132:8080/site/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.132:8080/site/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.132:80/pj/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"http://192.168.0.132:80/pj/isales/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"http://192.168.0.132:8080/site/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.132:8080/site/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.132:8080/site/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.132:8080/site/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.132:8080/site/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.132:8080/site/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.132:8080/site/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_INFO  @"http://192.168.0.132:80/pj/isales/getCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.132:80/pj/isales/hasPendingOrderByContact.htm"
+#define  URL_NEW_CUSTOMER  @"http://192.168.0.132:80/pj/isales/getAddCustomer.htm"
+#define  URL_EDIT_CUSTOMER  @"http://192.168.0.132:80/pj/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_SAVE  @"http://192.168.0.132:80/pj/isales/saveCustomer.htm"
+#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.132:80/pj/isales/updateCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.132:80/pj/isales/updateCustomerBusiCard.htm"
 
 
 
 
 
 
-#define  URL_ERR_LOG  @"http://192.168.0.132:8080/site/isales/er_log.htm"
+#define  URL_ERR_LOG  @"http://192.168.0.132:80/pj/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.132:8080/site/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"http://192.168.0.132:80/pj/isales/uploadImg.htm"
 
 
-#define  URL_NPD_POLICY  @"http://192.168.0.132:8080/site/isales/generalPolicy.htm"
+#define  URL_NPD_POLICY  @"http://192.168.0.132:80/pj/isales/generalPolicy.htm"
 
 
-#define  URL_CHECK_OFFLINE  @"http://192.168.0.132:8080/site/offline/initDatas.htm"
-#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.132:8080/site/offline/uploadOfflineData.htm"
+#define  URL_CHECK_OFFLINE  @"http://192.168.0.132:80/pj/offline/initDatas.htm"
+#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.132:80/pj/offline/uploadOfflineData.htm"
 
 
-#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.132:8080/site/offline/downloadDatas.htm"
-#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.132:8080/site/offline/confirmVersion.htm"
+#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.132:80/pj/offline/downloadDatas.htm"
+#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.132:80/pj/offline/confirmVersion.htm"
 
 
-#define  URL_GET_RESULT  @"http://192.168.0.132:8080/site/offline/getResultBySerial.htm"
+#define  URL_GET_RESULT  @"http://192.168.0.132:80/pj/offline/getResultBySerial.htm"
 
-#define URL_SET_PRICE_TYPE @"http://192.168.0.132:8080/site/isales/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"http://192.168.0.132:80/pj/isales/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"http://192.168.0.132:8080/site/isales/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"http://192.168.0.132:80/pj/isales/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"http://192.168.0.132:8080/site/isales/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"http://192.168.0.132:80/pj/isales/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"http://192.168.0.132:8080/site/isales/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"http://192.168.0.132:80/pj/isales/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"http://192.168.0.132:8080/site/isales/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"http://192.168.0.132:80/pj/isales/requestLogin.htm"
 
-#define URL_EMAIL_CART @"http://192.168.0.132:8080/site/isales/sendCartEmail.htm"
+#define URL_EMAIL_CART @"http://192.168.0.132:80/pj/isales/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"http://192.168.0.132:8080/site/isales/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"http://192.168.0.132:80/pj/isales/notifyMeEmail.htm"
 
 #else
 

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

@@ -6,16 +6,16 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "505961244.831024"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "506423351.49693"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2038"
-            endingLineNumber = "2038"
-            landmarkName = "-connection:didReceiveResponse:"
+            startingLineNumber = "3922"
+            endingLineNumber = "3922"
+            landmarkName = "+model_bundle:db:compute_part:contactID:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -12,7 +12,7 @@
 
 //#define test_server
 #define exception_switch 1
-#define notifyMe_switch 1
+#define notifyMe_switch 0
 
 //#define ab_lager @"Delivery price"
 #define flat_price @"MSRP"

RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7</string>
+	<string>1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>