修改Merge List界面。

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

@@ -10401,7 +10401,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     pdf_path = [newPath lastPathComponent];
     
     // 保存信息
-    [params setObject:[params objectForKey:@"product_ids"] forKey:@"productIds"];
+//    [params setObject:[params objectForKey:@"product_ids"] forKey:@"productIds"];
     NSString *off_params = [RAUtils dict2string:params];
     
 
@@ -10969,7 +10969,9 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         [item setObject:off_params forKey:@"off_params"];
         [item setObject:uuid forKey:@"pdf_token"];
         
-
+        NSDictionary *off_Params_dic = [RAUtils string2dict:off_params];
+        [item setObject:[off_Params_dic objectForKey:@"product_ids"] forKey:@"product_ids"];
+        
         [ret setObject:item forKey:[NSString stringWithFormat:@"item_%ld",(*count)++]];
         [ret setObject:[NSNumber numberWithInteger:RESULT_TRUE] forKey:@"result"];
         [ret setObject:[NSNumber numberWithInteger:*count] forKey:@"count"];

RedAnt ERP Mobile/common/Functions/offline/SelectOrderTableViewCell.h

@@ -14,6 +14,7 @@ typedef void (^checkButtonBlock)(void);
 @property (strong, nonatomic) IBOutlet UILabel *labelsoid;
 @property (strong, nonatomic) IBOutlet UILabel *labelcompany;
 @property (strong, nonatomic) IBOutlet UIButton *checkedButton;
+@property (strong, nonatomic) IBOutlet UILabel *labelCreateTime;
 
 @property (nonatomic,copy) checkButtonBlock checkBlock;
 

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

@@ -183,7 +183,8 @@
     NSDictionary *dic = [self.mergeList objectAtIndex:indexPath.row];
     int check = [dic[@"check"] integerValue];
     NSString *so_id = dic[@"so_id"];
-    NSString *company_name = dic[@"company_name"];
+    NSString *create_by = dic[@"create_by"];
+    NSString *create_time = [dic[@"create_time"] stringByAppendingString:@" PST"];
     
     if (check) {
         cell.checkedButton.selected = YES;
@@ -193,7 +194,8 @@
     }
     
     cell.labelsoid.text = so_id;
-    cell.labelcompany.text = company_name;
+    cell.labelcompany.text = create_by;
+    cell.labelCreateTime.text = create_time;
     
     __weak typeof(self) weakSelf = self;
     __weak typeof(tableView) weakTable = tableView;
@@ -243,11 +245,18 @@
     UILabel *userlabel = [[UILabel alloc] initWithFrame:CGRectMake(48, 21, 100, 22)];
     userlabel.textColor=UIColorFromRGB(color);
     userlabel.backgroundColor = [UIColor clearColor];
-    userlabel.text=NSLocalizedString(@"Contact", nil);
+    userlabel.text=NSLocalizedString(@"Create By", nil);
     [userlabel sizeToFit];
     [myView addSubview:userlabel];
     
     
+    UILabel *createTimeLabel = [[UILabel alloc] initWithFrame:CGRectMake(tableView.bounds.size.width - 150, 21, 100, 22)];
+    createTimeLabel.textColor=UIColorFromRGB(color);
+    createTimeLabel.backgroundColor = [UIColor clearColor];
+    createTimeLabel.text=NSLocalizedString(@"Create Time", nil);
+    [createTimeLabel sizeToFit];
+    [myView addSubview:createTimeLabel];
+    
     
     myView.autoresizesSubviews=true;
 

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -1248,7 +1248,8 @@
             NSString *orderCode = [NSString stringWithFormat:@"%@",[self.content_data[indexPath.row] valueForKey:@"order_code"]];
             
             
-            NSString* customer_name = [self.content_data[indexPath.row] valueForKey:@"customer_name"];
+            NSString *create_by = [self.content_data[indexPath.row] valueForKey:@"create_by"];
+            NSString *create_time = [self.content_data[indexPath.row] valueForKey:@"purchase_time"];
             
             __block BOOL contain = NO;
             [self.mergeList enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -1307,7 +1308,8 @@
                                     
                                     [dic setValue:orderid forKey:@"order_id"];
                                     [dic setValue:so forKey:@"so_id"];
-                                    [dic setValue:customer_name forKey:@"company_name"];
+                                    [dic setValue:create_by forKey:@"create_by"];
+                                    [dic setValue:create_time forKey:@"create_time"];
                                     [dic setValue:[NSNumber numberWithInteger:0] forKey:@"check"]; // 合并到
                                     
                                     [self.mergeList addObject:dic];
@@ -1351,7 +1353,8 @@
                         
                         [dic setValue:orderid forKey:@"order_id"];
                         [dic setValue:so forKey:@"so_id"];
-                        [dic setValue:customer_name forKey:@"company_name"];
+                        [dic setValue:create_by forKey:@"create_by"];
+                        [dic setValue:create_time forKey:@"create_time"];
                         [dic setValue:[NSNumber numberWithInteger:0] forKey:@"check"]; // 合并到
                         
                         [self.mergeList addObject:dic];

RedAnt ERP Mobile/iSales-NPD/Base.lproj/OLM.storyboard

@@ -228,7 +228,7 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="86"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XXr-fU-67o" id="Ohn-hG-mj9">
-                                            <frame key="frameInset" width="768" height="86"/>
+                                            <frame key="frameInset" width="768" height="85.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AIn-eK-sCn">
@@ -247,17 +247,25 @@
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
                                                 </button>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v9S-8N-eqS">
-                                                    <frame key="frameInset" minX="48" width="98.75%" height="22" maxY="15"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v9S-8N-eqS">
+                                                    <frame key="frameInset" minX="48" width="63.19%" height="22" maxY="14.5"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="11/08/2016 17:55:32 PST" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="efa-f8-yHS">
+                                                    <frame key="frameInset" width="200" height="22" maxY="14.5"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                             </subviews>
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="checkedButton" destination="hrK-DY-RbO" id="AcK-F0-dz8"/>
+                                            <outlet property="labelCreateTime" destination="efa-f8-yHS" id="oxg-AP-dtP"/>
                                             <outlet property="labelcompany" destination="v9S-8N-eqS" id="99v-V9-l2l"/>
                                             <outlet property="labelsoid" destination="AIn-eK-sCn" id="YQb-1w-FW8"/>
                                         </connections>
@@ -286,7 +294,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="krm-rW-vWy" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2976" y="669"/>
+            <point key="canvasLocation" x="3069" y="595"/>
         </scene>
         <!--Sign_in-->
         <scene sceneID="Iag-oy-jaN">
@@ -374,11 +382,11 @@
                                         <rect key="frame" x="0.0" y="28" width="360" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0HM-qr-ZyP" id="qg6-aD-3QW">
-                                            <frame key="frameInset" width="360" height="43"/>
+                                            <frame key="frameInset" width="360" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hql-hH-AXh">
-                                                    <frame key="frameInset" minX="15" width="330" height="44"/>
+                                                    <frame key="frameInset" minX="15" width="330" height="43"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>