Răsfoiți Sursa

修复离线Model Detail在未缺货时显示ETA,同时屏蔽ETA值为字符串NULL的情况。

Pen Li 9 ani în urmă
părinte
comite
402a121a71

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 0 - 18
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,22 +2,4 @@
 <Bucket
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "506423351.49693"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3922"
-            endingLineNumber = "3922"
-            landmarkName = "+model_bundle:db:compute_part:contactID:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

+ 7 - 1
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -3265,7 +3265,13 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             if(eta==nil)
                 eta="";
             NSString *nseta = [[NSString alloc]initWithUTF8String:eta];
-            [img_section setValue:nseta forKey:@"ETA"];
+            if ([nseta isEqualToString:@"null"]) {
+                nseta = @"";
+            }
+            if (availability <= 0) {
+                [img_section setValue:nseta forKey:@"ETA"];
+            }
+            
             
             int item_id = sqlite3_column_int(statement, 26);