فهرست منبع

Available设置为红色,Order List排序增加Create Time DESC

Pen Li 9 سال پیش
والد
کامیت
aadf784704

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


+ 2 - 2
RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -3985,9 +3985,9 @@
             NSString *availability = [item_json objectForKey:@"quantity_available"];
             NSString *available_str = @"Available Now";
             if ([availability integerValue] > 0) {
-                available_str = @"Available Now";
+                available_str = [NSString stringWithFormat:@"Available: %@",availability];
             } else {
-                available_str = @"In Production";
+                available_str = @"Available: In Production";
             }
             cell.avalibilityLabel.text = available_str;
             

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

@@ -6655,7 +6655,7 @@
         }
     }
     
-    NSString*     sqlQuery=[NSString stringWithFormat:@"SELECT o._id,o.so_id,o.status,o.sales_rep,o.create_by,decrypt(c.company_name),o.modify_time,o.total_price,o.customer_contact,o.erpOrderStatus,o.order_id is null from offline_order o left join offline_contact c on o.customer_cid=c.contact_id where %@ order by o.modify_time desc limit %d offset %d" ,where, limit, offset];
+    NSString*     sqlQuery=[NSString stringWithFormat:@"SELECT o._id,o.so_id,o.status,o.sales_rep,o.create_by,decrypt(c.company_name),o.modify_time,o.total_price,o.customer_contact,o.erpOrderStatus,o.order_id is null from offline_order o left join offline_contact c on o.customer_cid=c.contact_id where %@ order by o.modify_time desc,o.create_time desc limit %d offset %d" ,where, limit, offset];
     
 //    DebugLog(@"order list sql: %@",sqlQuery);
     

+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -6504,7 +6504,7 @@ Email: redantsupport@united-us.net</string>
                                                     <rect key="frame" x="461" y="75" width="179" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x9999" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PId-iu-lS8">