修复离线订单没有价格时在Order Detail和Order List中显示价格。

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

@@ -3,23 +3,6 @@
    type = "0"
    version = "2.0">
    <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            condition = "So == nil"
-            continueAfterRunningActions = "No"
-            filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "505294860.560773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "396"
-            endingLineNumber = "396"
-            landmarkName = "-SetSo:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -36,101 +19,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "506243141.918914"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "12262"
-            endingLineNumber = "12262"
-            landmarkName = "+preparePDF:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "506243344.871809"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11570"
-            endingLineNumber = "11570"
-            landmarkName = "+offline_savePDF:direct:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "506243361.176687"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11609"
-            endingLineNumber = "11609"
-            landmarkName = "+offline_savePDF:direct:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "+[OLDataProvider offline_savePDF:direct:]"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/macmini1/project/RedAnt%20ERP%20Mobile/common/Functions/offline/OLDataProvider.m"
-                  timestampString = "506245583.866522"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "11609"
-                  endingLineNumber = "11609"
-                  offsetFromSymbolStart = "1308">
-               </Location>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__41+[OLDataProvider offline_savePDF:direct:]_block_invoke"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/macmini1/project/RedAnt%20ERP%20Mobile/common/Functions/offline/OLDataProvider.m"
-                  timestampString = "506245583.868385"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "11609"
-                  endingLineNumber = "11609"
-                  offsetFromSymbolStart = "53">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "506243426.931549"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11687"
-            endingLineNumber = "11687"
-            landmarkName = "+offline_savePDF:direct:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -8092,7 +8092,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             NSString* Price=nil;
             if(str_price==nil)
             {
-                NSNumber* price = [self get_model_default_price:appDelegate.contact_id product_id:nil item_id:@(item_id) db:db1];
+                NSNumber* price = [self get_model_default_price:customerID product_id:nil item_id:@(item_id) db:db1];
                 if(price==nil)
                     Price=@"No Price.";
                 else
@@ -8301,10 +8301,10 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     if (so_id) {
 //        NSString *modelSql = [NSString stringWithFormat:@"select c.product_id,c.price,c.discount,c.item_count,c.line_note,m.name,m.description,c.item_id,m.stockUom,c._id from (select _id,product_id,decrypt(str_price) as price,discount,item_count,line_note,item_id from offline_cart where so_no='%@') c left join product m on c.product_id=m.product_id",so_id];
         
-        NSString *modelSql = [NSString stringWithFormat:@"select product_id,price,discount,item_count,item_id from (select product_id,decrypt(str_price) as price,discount,item_count,item_id from offline_cart where so_no='%@');",so_id];
+        NSString *modelSql = [NSString stringWithFormat:@"select product_id,price,discount,item_count,item_id,customer_cid from (select c.product_id,decrypt(c.str_price) as price,c.discount,c.item_count,c.item_id,o.customer_cid from offline_cart as c left join offline_order as o on c.so_no = o.so_id where c.so_no='%@');",so_id];
         
         
-        AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+//        AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
         
         [iSalesDB jk_query:modelSql db:db1 close:NO completion:^(sqlite3_stmt *stmt, NSMutableDictionary *container, long *count) {
             
@@ -8322,10 +8322,13 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             
             int item_id = sqlite3_column_int(stmt, 4);
             
+            char *customer_cid = (char *)sqlite3_column_text(stmt, 5);
+            NSString *customerID = [NSString stringWithUTF8String:customer_cid];
+            
             NSString* Price=nil;
             if(str_price==nil)
             {
-                NSNumber* price = [self get_model_default_price:appDelegate.contact_id product_id:nil item_id:@(item_id) db:db1];
+                NSNumber* price = [self get_model_default_price:customerID product_id:nil item_id:@(item_id) db:db1];
                 if(price==nil)
                     Price=@"No Price.";
                 else