消除商品checkPrice和checkTotal字段对转运单收货的影响（转运单在收货单里面收货）

XFFruit.xcodeproj/project.pbxproj

@@ -915,6 +915,10 @@
 		8F3EB1A41F21AABC00F3A669 /* PurchaseReceiveProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F3EB1A31F21AABC00F3A669 /* PurchaseReceiveProductViewController.m */; };
 		8F67988A1DB8CC9400348267 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F6798891DB8CC9400348267 /* WebKit.framework */; };
 		8F67988C1DB8CC9E00348267 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F67988B1DB8CC9E00348267 /* WebKit.framework */; };
+		8FC3755A1F5D22AA00FD43EA /* ReceiveOwnProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC375591F5D22AA00FD43EA /* ReceiveOwnProductViewController.m */; };
+		8FC3755B1F5D22AA00FD43EA /* ReceiveOwnProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC375591F5D22AA00FD43EA /* ReceiveOwnProductViewController.m */; };
+		8FC3755C1F5D22AA00FD43EA /* ReceiveOwnProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC375591F5D22AA00FD43EA /* ReceiveOwnProductViewController.m */; };
+		8FC3755D1F5D22AA00FD43EA /* ReceiveOwnProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC375591F5D22AA00FD43EA /* ReceiveOwnProductViewController.m */; };
 		8FD12B531EC4737200845F9B /* ProductStockModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FD12B521EC4737200845F9B /* ProductStockModel.m */; };
 		8FD12B541EC4737200845F9B /* ProductStockModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FD12B521EC4737200845F9B /* ProductStockModel.m */; };
 		8FDA63651F0F56FE00617495 /* TransportCreateProductCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FDA63641F0F56FE00617495 /* TransportCreateProductCell.m */; };
@@ -1931,7 +1935,7 @@
 		72F9D48A1BA8582100795A00 /* NoticeBoltView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoticeBoltView.m; sourceTree = "<group>"; };
 		7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		86D33EC280C440156ED1B976 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		8F0F9B6E1F2A3AE7004FB434 /* XFFruit copy 2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "XFFruit copy 2.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		8F0F9B6E1F2A3AE7004FB434 /* XFFruit copy 2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = "XFFruit copy 2.app"; path = XFFruit_TEST.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		8F0F9B6F1F2A3AE8004FB434 /* XFFruit_TEST.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = XFFruit_TEST.plist; path = /Users/Javen/Documents/MyProject/xffruit/XFFruit_TEST.plist; sourceTree = "<absolute>"; };
 		8F1523D11F21B2D4004ECC7B /* PurchaseReceiveProductCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurchaseReceiveProductCell.h; sourceTree = "<group>"; };
 		8F1523D21F21B2D4004ECC7B /* PurchaseReceiveProductCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseReceiveProductCell.m; sourceTree = "<group>"; };
@@ -1941,6 +1945,8 @@
 		8F3EB1A31F21AABC00F3A669 /* PurchaseReceiveProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseReceiveProductViewController.m; sourceTree = "<group>"; };
 		8F6798891DB8CC9400348267 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/PrivateFrameworks/WebKit.framework; sourceTree = SDKROOT; };
 		8F67988B1DB8CC9E00348267 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		8FC375581F5D22AA00FD43EA /* ReceiveOwnProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReceiveOwnProductViewController.h; sourceTree = "<group>"; };
+		8FC375591F5D22AA00FD43EA /* ReceiveOwnProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReceiveOwnProductViewController.m; sourceTree = "<group>"; };
 		8FD12B511EC4737200845F9B /* ProductStockModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductStockModel.h; sourceTree = "<group>"; };
 		8FD12B521EC4737200845F9B /* ProductStockModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductStockModel.m; sourceTree = "<group>"; };
 		8FDA63631F0F56FE00617495 /* TransportCreateProductCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportCreateProductCell.h; sourceTree = "<group>"; };
@@ -2949,6 +2955,8 @@
 				72A813FF1BCD3B0A003631F3 /* NewReceiveViewController.m */,
 				72A814131BCF990B003631F3 /* ReceiveProductViewController.h */,
 				72A814141BCF990B003631F3 /* ReceiveProductViewController.m */,
+				8FC375581F5D22AA00FD43EA /* ReceiveOwnProductViewController.h */,
+				8FC375591F5D22AA00FD43EA /* ReceiveOwnProductViewController.m */,
 				72A814191BCFD6A1003631F3 /* NewReceiveProductViewController.h */,
 				72A8141A1BCFD6A1003631F3 /* NewReceiveProductViewController.m */,
 			);
@@ -4449,6 +4457,7 @@
 				8F0F9A4A1F2A3AE7004FB434 /* ICRPerson.m in Sources */,
 				8F0F9A4B1F2A3AE7004FB434 /* NewReceiveProductViewController.m in Sources */,
 				8F0F9A4C1F2A3AE7004FB434 /* IBTTableViewInfo.m in Sources */,
+				8FC3755D1F5D22AA00FD43EA /* ReceiveOwnProductViewController.m in Sources */,
 				8F0F9A4D1F2A3AE7004FB434 /* PurchaseCell.m in Sources */,
 				8F0F9A4E1F2A3AE7004FB434 /* GXFWarehouseViewController.m in Sources */,
 				8F0F9A4F1F2A3AE7004FB434 /* ICRAnswer.m in Sources */,
@@ -4778,6 +4787,7 @@
 				8F250BB41F2891C60031B4BC /* ICRPerson.m in Sources */,
 				8F250BB51F2891C60031B4BC /* NewReceiveProductViewController.m in Sources */,
 				8F250BB61F2891C60031B4BC /* IBTTableViewInfo.m in Sources */,
+				8FC3755C1F5D22AA00FD43EA /* ReceiveOwnProductViewController.m in Sources */,
 				8F250BB71F2891C60031B4BC /* PurchaseCell.m in Sources */,
 				8F250BB81F2891C60031B4BC /* GXFWarehouseViewController.m in Sources */,
 				8F250BB91F2891C60031B4BC /* ICRAnswer.m in Sources */,
@@ -5290,6 +5300,7 @@
 				8FEE26D01DB60B570099B596 /* UIView+ViewFrameGeometry.m in Sources */,
 				8FEE26D11DB60B570099B596 /* IBTImagePicker.m in Sources */,
 				8FEE26D21DB60B570099B596 /* ICRAttachment.m in Sources */,
+				8FC3755B1F5D22AA00FD43EA /* ReceiveOwnProductViewController.m in Sources */,
 				8FEE26D31DB60B570099B596 /* IBTAdditionsObserver.m in Sources */,
 				8FEE26D41DB60B570099B596 /* NoticeRecord.m in Sources */,
 				8FEE26D51DB60B570099B596 /* IBTLoadingView.m in Sources */,
@@ -5433,6 +5444,7 @@
 				04040E001B6FE75800326D12 /* ICRPerson.m in Sources */,
 				72A8141B1BCFD6A1003631F3 /* NewReceiveProductViewController.m in Sources */,
 				C159183F1AC062460013B391 /* IBTTableViewInfo.m in Sources */,
+				8FC3755A1F5D22AA00FD43EA /* ReceiveOwnProductViewController.m in Sources */,
 				7281A0BC1B897EAB0052B1AC /* PurchaseCell.m in Sources */,
 				35CF339E1B96E606001211EF /* GXFWarehouseViewController.m in Sources */,
 				C11A34661B24487D00079129 /* ICRAnswer.m in Sources */,

XFFruit/ViewControllers/Receiving/Controllers/NewReceiveViewController.m

@@ -7,7 +7,7 @@
 //
 
 #import "NewReceiveViewController.h"
-#import "ReceiveProductViewController.h"
+#import "ReceiveOwnProductViewController.h"
 #import "TransferPdtDetail.h"
 #import "NewReceiveProductViewController.h"
 #import "ReceiveViewController.h"
@@ -29,7 +29,7 @@ typedef enum : NSUInteger {
     UIView *_bottomView;
     UIButton *_firstBtn;
     UIButton *_secondBtn;
-    ReceiveProductViewController *_pvc;
+    ReceiveOwnProductViewController *_pvc;
     id uuidObject;
     id billNumberObject;
     NSNumber *versionObject;
@@ -300,7 +300,7 @@ typedef enum : NSUInteger {
     
     [_scrollView addSubview:_bottomView];
 
-    _pvc = [[ReceiveProductViewController alloc]init];
+    _pvc = [[ReceiveOwnProductViewController alloc]init];
     _pvc.viewFrame = _bottomView.bounds;
     _pvc.isHiddenAdd = YES;
     _pvc.isHiddenEdit = self.isNotShowEdit;
@@ -438,6 +438,8 @@ typedef enum : NSUInteger {
     }
     NSMutableArray *billProducts = [NSMutableArray array];
     for (TransferPdtDetail *pdtDetail in _pvc.productArr) {
+        pdtDetail.checkPrice = nil;
+        pdtDetail.checkTotal = nil;
         [billProducts  addObject:[pdtDetail dictForCommit]];
     }
     NSDictionary *dict = @{@"uuid":uuidObject,

XFFruit/ViewControllers/Receiving/Controllers/ReceiveOwnProductViewController.h

+//
+//  ReceiveOwnProductViewController.h
+//  XFFruit
+//
+//  Created by Javen on 2017/9/4.
+//  Copyright © 2017年 Xummer. All rights reserved.
+//
+
+#import "ICRBaseViewController.h"
+
+@interface ReceiveOwnProductViewController : ICRBaseViewController
+@property (nonatomic,strong)NSMutableArray *defaultState;
+@property (nonatomic,strong)NSMutableArray *productArr;
+@property (nonatomic,strong)UITableView *tableView;
+@property (nonatomic,assign)CGRect viewFrame;
+@property (nonatomic,assign)BOOL isHiddenAdd;
+@property (nonatomic,assign)BOOL isHiddenEdit;
+@property (nonatomic,strong)NSString *productName;
+@end

XFFruit/ViewControllers/Receiving/Controllers/ReceiveOwnProductViewController.m

+//
+//  ReceiveOwnProductViewController.m
+//  XFFruit
+//
+//  Created by Javen on 2017/9/4.
+//  Copyright © 2017年 Xummer. All rights reserved.
+//
+
+#import "ReceiveOwnProductViewController.h"
+#import "HeaderCell.h"
+#import "ReceiveProductCell.h"
+#import "PurchaseBillProduct.h"
+#define TableHeight 44
+#define ShowHeight  130
+#define HeaderHeight 40
+@interface ReceiveOwnProductViewController ()<UITableViewDataSource,UITableViewDelegate,HeaderCellDelegate>
+{
+    CGRect _tableFrame;
+    NSMutableArray *_selectRowArr;//记录当前选中的cell
+}
+//采购单号
+@property (strong, nonatomic) NSMutableArray *arrBillNumber;
+//按照采购单号区分之后的数据
+@property (strong, nonatomic) NSMutableDictionary *dictData;
+
+@end
+
+@implementation ReceiveOwnProductViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.view.backgroundColor  = XXFBgColor;
+    [super viewDidLoad];
+    [self initData];
+    [self createView];
+}
+- (void)initData{
+    _selectRowArr = [[NSMutableArray alloc]init];
+    if (!self.productArr) {
+        self.productArr = [NSMutableArray array];
+    }
+}
+
+- (void)setProductArr:(NSMutableArray *)productArr {
+    _productArr = productArr;
+    [self convertData];
+}
+
+- (void)convertData {
+    self.arrBillNumber = [NSMutableArray array];
+    self.dictData = [NSMutableDictionary dictionary];
+    for (TransferPdtDetail *pdt in self.productArr) {
+        NSString *sourceBillNumber = pdt.sourcebillnumber ? pdt.sourcebillnumber : @" ";
+        
+        if (![self.arrBillNumber containsObject:sourceBillNumber]) {
+            [self.arrBillNumber addObject:sourceBillNumber];
+        }
+        
+        NSMutableArray *arrTemp = [self.dictData objectForKey:sourceBillNumber];
+        if (!arrTemp) {
+            arrTemp = [NSMutableArray array];
+            [self.dictData setObject:arrTemp forKey:sourceBillNumber];
+        }
+        
+        [arrTemp addObject:pdt];
+    }
+    CLog(@"%@", self.dictData);
+}
+
+
+- (void)setViewFrame:(CGRect)viewFrame{
+    _tableFrame = viewFrame;
+    _tableView.frame = viewFrame;
+}
+- (void)createView{
+    self.tableView = [[UITableView alloc]initWithFrame:_tableFrame style:(UITableViewStylePlain)];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    [self.view addSubview:self.tableView];
+    
+    NSArray *arr = @[@"商品",@"规格", @"待收包装数",@"已收包装数"];
+    
+    HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenAdd];
+    [self.view addSubview:headCell];
+    headCell.delegate = self;
+    self.tableView.tableHeaderView = headCell;
+}
+
+- (void)editClick:(UIButton *)btn{
+    NSInteger section = btn.tag / 1000;
+    NSInteger row = btn.tag % 1000;
+    NSMutableArray *arrSection = [self.dictData objectForKey:self.arrBillNumber[section]];
+    
+    TransferPdtDetail *pdDetail = arrSection[row];
+    NSInteger index = [self.productArr indexOfObject:pdDetail];
+    [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_EditReceiveProduct object:nil userInfo:@{@"transferPdtDetail":pdDetail,@"indexPath":@(index)}];
+}
+#pragma mark - 协议方法
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return self.arrBillNumber.count;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+    NSString *sourceBillNumber = self.arrBillNumber[section];
+    if (sourceBillNumber.length == 1) {
+        return 0;
+    }else{
+        return HeaderHeight;
+    }
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+    UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0, 0, ScreenSize.width, HeaderHeight)];
+    header.backgroundColor = [UIColor whiteColor];
+    UILabel *transportBillNumber = [[UILabel alloc] initWithFrame:CGRectMake(16, 0, 250, HeaderHeight)];
+    [header addSubview:transportBillNumber];
+    transportBillNumber.text = [NSString stringWithFormat:@"[采购单：%@]",
+                                self.arrBillNumber[section]];
+    transportBillNumber.textColor = GXF_GREEN_COLOR;
+    
+    UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, HeaderHeight - 1, IBT_MAIN_SCREEN_WIDTH, 1)];
+    line.backgroundColor = [UIColor colorWithWhite:0.835 alpha:1.000];
+    [header addSubview:line];
+    //删除按钮
+    //    UIButton *btnDelete = [UIButton buttonWithType:UIButtonTypeCustom];
+    //    btnDelete.frame = CGRectMake(IBT_MAIN_SCREEN_WIDTH - 16 - 30, (HeaderHeight - 30)/2, 30, 30);
+    //    [btnDelete setImage:[UIImage imageNamed:@"xf_delete_pic"] forState:UIControlStateNormal];
+    //    [header addSubview:btnDelete];
+    //    btnDelete.tag = section;
+    //    [btnDelete addTarget:self action:@selector(actionDeleteBillNumber:) forControlEvents:UIControlEventTouchUpInside];
+    
+    return header;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    NSMutableArray *arrSection = [self.dictData objectForKey:self.arrBillNumber[section]];
+    return arrSection.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    static NSString *cellID = @"ReceiveProductCell";
+    ReceiveProductCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+    cell.showCheckPrice.hidden = YES;
+    cell.showCheckTotal.hidden = YES;
+    if (cell == nil) {
+        cell = [[ReceiveProductCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+        cell.selectionStyle = UITableViewCellSelectionStyleNone;
+        if (self.isHiddenEdit) {
+            cell.editBtn.hidden = YES;
+        }
+    }
+    if ([self isHaveIndexPath:indexPath]) {
+        cell.smallImageView.image = [UIImage imageNamed:@"arrowdown"];
+        CGRect Linefrmame = cell.lineLabel.frame;
+        Linefrmame.origin.y = ShowHeight + TableHeight -1;
+        cell.lineLabel.frame = Linefrmame;
+        CGRect showfrmame = cell.showView.frame;
+        showfrmame.size.height = ShowHeight;
+        cell.showView.frame = showfrmame;
+        cell.backgroundColor = XXFBgColor;
+    }else{
+        cell.smallImageView.image = [UIImage imageNamed:@"arrowright"];
+        CGRect Linefrmame = cell.lineLabel.frame;
+        Linefrmame.origin.y = TableHeight-1;
+        cell.lineLabel.frame = Linefrmame;
+        CGRect showfrmame = cell.showView.frame;
+        showfrmame.size.height = 0;
+        cell.showView.frame = showfrmame;
+        cell.backgroundColor = [UIColor whiteColor];
+    }
+    cell.editBtn.tag = indexPath.section * 1000 + indexPath.row;
+    [cell.editBtn addTarget:self action:@selector(editClick:) forControlEvents:UIControlEventTouchUpInside];
+    
+    if (self.productArr.count > 0) {
+        NSMutableArray *arrSection = [self.dictData objectForKey:self.arrBillNumber[indexPath.section]];
+        TransferPdtDetail *billP = arrSection[indexPath.row];
+        [cell setBillProduct:billP row:indexPath.row defaultState:self.defaultState[indexPath.row]];
+    }
+    //    cell.backgroundColor = [UIColor redColor];
+    return cell;
+}
+- (BOOL)isHaveIndexPath:(NSIndexPath *)indexPath{
+    for (NSIndexPath *path in _selectRowArr) {
+        if (path == indexPath) {
+            return YES;
+        }
+    }
+    return NO;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    ReceiveProductCell *cell = (ReceiveProductCell *)[tableView cellForRowAtIndexPath:indexPath];
+    CGRect Linefrmame = cell.lineLabel.frame;
+    CGRect showfrmame = cell.showView.frame;
+    if (Linefrmame.origin.y == TableHeight - 1) {
+        cell.smallImageView.image = [UIImage imageNamed:@"arrowdown"];
+        
+        Linefrmame.origin.y = ShowHeight + TableHeight - 1;
+        showfrmame.size.height = ShowHeight;
+        cell.backgroundColor = [UIColor whiteColor];
+        [_selectRowArr addObject:indexPath];
+    }else{
+        cell.smallImageView.image = [UIImage imageNamed:@"arrowright"];
+        Linefrmame.origin.y = TableHeight -1;
+        showfrmame.size.height = 0;
+        cell.backgroundColor = [UIColor whiteColor];
+        [_selectRowArr removeObject:indexPath];
+    }
+    cell.lineLabel.frame = Linefrmame;
+    cell.showView.frame = showfrmame;
+    [self.tableView reloadData];
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    if ([self isHaveIndexPath:indexPath]) {
+        return ShowHeight + TableHeight;
+    }
+    return TableHeight;
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m

@@ -233,6 +233,8 @@ typedef enum : NSUInteger {
         pdtCopy.receivedQty = nil;
         pdtCopy.shippedQty = nil;
         pdtCopy.shippedFlag = nil;
+        pdtCopy.checkTotal = nil;
+        pdtCopy.checkPrice = nil;
         [billProducts  addObject:[pdtCopy dictForCommit]];
     }
     NSMutableArray *costs = [NSMutableArray array];

XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m

@@ -648,6 +648,8 @@ typedef enum : NSUInteger {
             [ICRUserUtil sharedInstance].needFresh = YES;
             [IBTLoadingView showTips:@"   收货成功！   "];
             [weakSelf.navigationController popViewControllerAnimated:YES];
+        }else{
+            [IBTLoadingView showTips:succ[@"message"]];
         }
     } failure:^(id fail) {
         [IBTLoadingView showTips:fail];