收货单

XFFruit/Controllers/HTTPController/ICRHTTPController.h

@@ -385,6 +385,19 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
                                 version:(NSNumber *)version
                                 success:(void (^)(id))succ
                                 failure:(void (^)(id))fail;
+
+
+//6.保存收货单
+- (void)saveReceiveWithData:(id)data
+                     success:(void (^)(id))succ
+                     failure:(void (^)(id))fail;
+
+//7.保存并收货
+-(void)saveReceiptAndReceiveWithData:(id)data
+                   success:(void (^)(id))succ
+                   failure:(void (^)(id))fail;
+
+
 @end
 
 

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -123,6 +123,10 @@ typedef NS_ENUM(NSUInteger, ICRHTTPAction) {
     XFFHttp_GetTransferDetail,
     XFFHttp_EndTransfer,
     XFFHttp_AbortTransfer,
+    //收货单
+    XFFHttp_SaveRctinfo,
+    XFFHttp_SaveReceipt,
+
     
     
 };
@@ -222,11 +226,17 @@ static NSString * const ICRHTTPInterface[] = {
     [XFFHttp_EndTransport]                  = @"transport/finish",
     [XFFHttp_AbortTransport]                = @"transport/abort",
     
+    //转运单
     [XFFHTTP_TransferSave]                  = @"transfer/save_transfer",
     [XFFHttp_QueryTransfer]                 = @"transfer/query_transfer",
     [XFFHttp_GetTransferDetail]             = @"transfer/get_transfer",
-    [XFFHttp_EndTransfer]                  = @"transfer/finish",
-    [XFFHttp_AbortTransfer]                = @"transfer/abort",
+    [XFFHttp_EndTransfer]                   = @"transfer/finish",
+    [XFFHttp_AbortTransfer]                 = @"transfer/abort",
+    
+    
+    //收货
+    [XFFHttp_SaveRctinfo]                   =@"transfer/save_rctinfo",
+    [XFFHttp_SaveReceipt]                   =@"transfer/receipt",
 };
 
 static NSString * const ICRAttachmentTypeValue[] = {
@@ -2225,6 +2235,34 @@ acceptTypeJson:YES
        success:success
        failure:failure];
 }
+
+////选择发运单列表
+//- (void)chooseTransPortWithData:(id)data
+//                       success:(void (^)(id))succ
+//                       failure:(void (^)(id))fail{
+//    
+//    void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+//        CLog(@"%@", responseObject);
+//        if (succ) {
+//            succ( responseObject );
+//        }
+//    };
+//    void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+//        CLog(@"%@", error);
+//        if (fail) {
+//            fail( error );
+//        }
+//    };
+//    NSDictionary *dict = data;
+//    NSString *urlStr = [[self class] UrlForPluginHTTPAction:XFFHttp_QueryTransport];
+//    [self POST:urlStr
+//    parameters:dict
+//     needToken:NO
+//acceptTypeJson:YES
+//       success:success
+//       failure:failure];
+//}
+
 //获取发运单详情
 - (void)getTransportResultWithTransportUuid:(NSString *)transportUuid
                                     success:(void (^)(id))succ
@@ -2776,6 +2814,75 @@ acceptTypeJson:YES
        failure:failure];
     
 }
-
+//保存收货单
+- (void)saveReceiveWithData:(id)data
+                    success:(void (^)(id))succ
+                    failure:(void (^)(id))fail{
+    if (!data) {
+        if (fail) {
+            fail( [[self class] ErrorWithMsg:ERROR_PARAMETER code:0] );
+        }
+        return;
+    }
+    
+    void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+        CLog(@"%@", responseObject);
+        if (succ) {
+            succ( responseObject );
+        }
+    };
+    void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+        CLog(@"%@", error);
+        if (fail) {
+            fail( error );
+        }
+    };
+    NSDictionary *dict = data;
+    NSString *currentTime = [[NSDate date] httpParameterString];
+    ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
+    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SaveRctinfo] stringByAppendingFormat:@"?time=%@&operId=%@&operName=%@",currentTime,userUtil.userCode,userUtil.displayName];
+    NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    [self POST:encodeUrlStr
+    parameters:dict
+     needToken:NO
+acceptTypeJson:YES
+       success:success
+       failure:failure];
+}
+//保存并收货
+- (void)saveReceiptAndReceiveWithData:(id)data
+                              success:(void (^)(id))succ
+                              failure:(void (^)(id))fail{
+    if (!data) {
+        if (fail) {
+            fail( [[self class] ErrorWithMsg:ERROR_PARAMETER code:0] );
+        }
+        return;
+    }
+    
+    void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+        CLog(@"%@", responseObject);
+        if (succ) {
+            succ( responseObject );
+        }
+    };
+    void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+        CLog(@"%@", error);
+        if (fail) {
+            fail( error );
+        }
+    };
+    NSDictionary *dict = data;
+    NSString *currentTime = [[NSDate date] httpParameterString];
+    ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
+    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SaveReceipt] stringByAppendingFormat:@"?time=%@&operId=%@&operName=%@",currentTime,userUtil.userCode,userUtil.displayName];
+    NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    [self POST:encodeUrlStr
+    parameters:dict
+     needToken:NO
+acceptTypeJson:YES
+       success:success
+       failure:failure];
+}
 
 @end

XFFruit/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.gomore.XFFruit</string>
+	<string>com.cntaiping.life.XFFruit</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

XFFruit/Macro/ICRNotificationMacro.h

@@ -13,6 +13,9 @@
 #define KNOTIFICATION_getSelectPurchaseProduct @"KNOTIFICATION_getSelectPurchaseProduct"
 #define KNOTIFICATION_ChoseTransportPurchase @"KNOTIFICATION_ChoseTransportPurchase"//选择采购单
 #define KNOTIFICATION_ChoseTransportProduct @"KNOTIFICATION_ChoseTransportProduct"//选择发运单
+#define KNOTIFICATION_EditReceiveProduct @"KNOTIFICATION_EditReceiveProduct"
+
+
 
 #define KNOTIFICATION_AddPurchaseProduct @"KNOTIFICATION_AddPurchaseProduct"
 #define KNOTIFICATION_AddTransportCost @"KNOTIFICATION_AddTransportCost"

XFFruit/Utilities/IBTUIKit/IBTCommon.h

@@ -41,4 +41,6 @@
 + (NSMutableAttributedString *)setTextViewFontOfString:(NSString *)string paragraphStyle:(NSInteger)lineHeight fontSize:(float)size color:(UIColor *)color;
 + (NSString *)trimmingCharacters:(NSString *)str;
 + (int)compareDate:(NSString*)oneDate withDate:(NSString*)twoDate;
++ (BOOL)checkIsPermission:(NSString *)permission;
+
 @end

XFFruit/Utilities/IBTUIKit/IBTCommon.m

@@ -243,5 +243,13 @@
     }
     return ci;
 }
++ (BOOL)checkIsPermission:(NSString *)permission{
+    for (NSString *per in [ICRUserUtil sharedInstance].permissions) {
+        if ([per isEqualToString:permission]) {
+            return YES;
+        }
+    }
+    return NO;
+}
 
 @end

XFFruit/Utilities/IBTUIKit/IBTConstants.h

@@ -150,11 +150,7 @@
 #define PURCHASE_ACTION_FINISH              @"finish"
 #define PURCHASE_ACTION_ABORT               @"abort"
 
-//权限列表vendorapprove
-#define PURCHASE_PERMISSIONS_MANAGEAPPROVE              @"500405"
-#define PURCHASE_PERMISSIONS_VENDORAPPROVE              @"500406"
-#define PURCHASE_PERMISSIONS_FINISH                     @"500407"
-#define PURCHASE_PERMISSIONS_ABORT                      @"500408"
+
 
 
 //加工单状态
@@ -182,13 +178,6 @@
 #define TRANSPORT_STATE_RECEIVED        @"received" //已收货
 #define TRANSPORT_STATE_ABORTED         @"aborted" //已废用
 
-//发运单权限
-#define TRANSPORT_ACTION_FINISH         @"500404"  //结束权
-#define TRANSPORT_ACTION_ABORT          @"500505"   //作废权
-
-
-
-
 //采购通知单状态
 //initial("未提交"), notAccepted("未接受"), purchasing("采购中"), finished("已完成")
 #define PURCHASENOTICE_STATE_INITIAL        @"initial"
@@ -196,19 +185,37 @@
 #define PURCHASENOTICE_STATE_PURCHASEING    @"purchasing"
 #define PURCHASENOTICE_STATE_FINISHED       @"finished"
 
-//采购通知单权限
-#define NOTICE_PERMISSIONS_ACCEPTTASK                   @"500304"//接受任务
-#define NOTICE_PERMISSIONS_CREATEBILL                   @"500305"//新建权
-#define NOTICE_PERMISSIONS_FINISH                       @"500306"//结束
-
-
 //转运单状态
 #define TRANSFER_STATE_INITIAL         @"initial"   //未提交
 #define TRANSFER_STATE_UNRECEIVED      @"unreceived"//待收货
 #define TRANSFER_STATE_RECEIVED        @"received"  //已收货
 #define TRANSFER_STATE_ABORTED         @"aborted"   //已废用
-#define TRANSFER_ACTION_FINISH         @"500604"    //结束权
+//收货单
+#define RECEIVE_STATE_SAVE             @"save"      //保存
+#define RECEIVE_STATE_RECEIVE          @"receive"   //收货
+
+
+
+//权限列表vendorapprove 采购单
+#define PURCHASE_PERMISSIONS_MANAGEAPPROVE              @"500405"
+#define PURCHASE_PERMISSIONS_VENDORAPPROVE              @"500406"
+#define PURCHASE_PERMISSIONS_FINISH                     @"500407"
+#define PURCHASE_PERMISSIONS_ABORT                      @"500408"
+
+//转运单
 #define TRANSFER_ACTION_ABORT          @"500605"    //作废权
+#define RECEIVE_ACTION_RECEIVE         @"500803"    //收货权
+
+//采购通知单权限
+#define NOTICE_PERMISSIONS_ACCEPTTASK                   @"500304"//接受任务
+#define NOTICE_PERMISSIONS_CREATEBILL                   @"500305"//新建权
+#define NOTICE_PERMISSIONS_FINISH                       @"500306"//结束
+//发运单权限
+#define TRANSPORT_ACTION_FINISH         @"500504"  //结束权
+#define TRANSPORT_ACTION_ABORT          @"500505"   //作废权
+
+
+
 
 
 //选中的颜色

XFFruit/ViewControllers/Business/BusinessViewController.m

@@ -45,6 +45,7 @@
     [super viewDidLoad];
 
     [self setupSubviews];
+    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc]initWithTitle:@"收货单" style:UIBarButtonItemStylePlain target:self action:@selector(receiveClick:)];
     
 }
 - (void)didReceiveMemoryWarning {
@@ -209,7 +210,14 @@
             [self PushViewController:tVC animated:YES];
         }
             break;
-    //        case kFunctionPatrolPlan://巡店计划
+        case kFunctionSeeReceive://收货单
+        {
+            ReceiveViewController *tVC = [[ReceiveViewController alloc] init];
+            tVC.title = @"收货单";
+            [self PushViewController:tVC animated:YES];
+        }
+            break;
+//        case kFunctionPatrolPlan://巡店计划
 //        {
 //            ICRPatrolPlanViewController *pVC = [[ICRPatrolPlanViewController alloc] initWithStore:nil isHomeShow:YES];
 //            [self PushViewController:pVC animated:YES];
@@ -242,7 +250,11 @@
             break;
     }
 }
-
+- (void)receiveClick:(UIBarButtonItem *)item{
+    ReceiveViewController *tVC = [[ReceiveViewController alloc] init];
+    tVC.title = @"收货单";
+    [self PushViewController:tVC animated:YES];
+}
 
 //-(void)initView
 //{

XFFruit/ViewControllers/Purchase/Views/ProductBillCell.m

@@ -15,7 +15,7 @@
 #define LeftWidth 45
 #define RightWidth 30
 
-#define ShowWidth 150
+#define ShowWidth (ScreenSize.width  - LeftMargin*2 - SmallSize)/2
 #define ShowHeight 20
 
 @implementation ProductBillCell
@@ -66,7 +66,7 @@
     self.showView = [[UIView alloc]initWithFrame:CGRectMake(0, TableHeight, ScreenSize.width, 0)];
     self.showView.clipsToBounds = YES;
     
-    self.showStandLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.seqLabel.frame), 0, ShowWidth, ShowHeight))];
+    self.showStandLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.seqLabel.frame), 0, ShowWidth, ShowHeight))];
     self.showStandLabel.textAlignment = NSTextAlignmentLeft;
     self.showStandLabel.textColor = GXF_PLACEHOLDER_COLOR;
     self.showStandLabel.text = @"包装规格：1*12斤";

XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m

@@ -517,8 +517,16 @@ typedef enum : NSUInteger {
     if (_shopeArr.count==0) {
         ShowMessage(@"商品明细不能为空");
         return NO;
-
     }
+    for (NoticeProduct *billProduct in _shopeArr) {
+        if ([billProduct.quantity integerValue] <= 0 || [billProduct.qpcQuantity integerValue] <= 0) {
+            ShowMessage(@"有数量等于0的商品明细，请编辑后保存");
+            return NO;
+        }
+    }
+
+    
+    
     return YES;
 }
 - (void)saveSurvey:(NSString *)state message:(NSString *)msg

XFFruit/ViewControllers/PurchaseNotice/Controllers/SeePurchaseNoticeViewController.m

@@ -511,11 +511,11 @@ typedef enum : NSUInteger {
      Cell.YcgslLabel.text=[noticeProduct.purchasedQuantity stringValue];//已采购数量
     Cell.packageUnit.text=noticeProduct.packUnit;//包装单位
     Cell.packageQuantity.text=[NSString stringWithFormat:@"%@%@",noticeProduct.qpcQuantity,noticeProduct.packUnit];//包装数量
-    Cell.YcgslLabel.text=[noticeProduct.purchasedQuantity stringValue];//已采购数量
+    Cell.YcgslLabel.text=[NSString stringWithFormat:@"%@%@",noticeProduct.purchasedQuantity,noticeProduct.packUnit];//已采购数量
     Cell.foundationQuantity.text=[NSString stringWithFormat:@"%@%@",noticeProduct.quantity,noticeProduct.baseUnit];//基础数量
     Cell.remark.text= [NSString stringWithFormat:@"%@",noticeProduct.remark?noticeProduct.remark:@"无"];//备注
-    if (Cell.YcgslLabel.text==nil) {
-        Cell.YcgslLabel.text=@"0";//已采购数量
+    if (!noticeProduct.purchasedQuantity) {
+        Cell.YcgslLabel.text= [NSString stringWithFormat:@"0%@",noticeProduct.packUnit];//已采购数量
     }
 }
 //编辑

XFFruit/ViewControllers/Receiving/Controllers/NewReceiveProductViewController.h

+//
+//  NewReceiveProductViewController.h
+//  XFFruit
+//
+//  Created by 陈俊俊 on 15/10/15.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "ICRBaseViewController.h"
+#import "TransferPdtDetail.h"
+
+typedef void(^ChoseNoticeProduct)(TransferPdtDetail *noticeProduct,NSInteger indexTag);
+
+@interface NewReceiveProductViewController : ICRBaseViewController
+@property (nonatomic,strong)TransferPdtDetail *noticeProduct;
+@property (nonatomic,copy)ChoseNoticeProduct editReceiveProduct;
+@property (nonatomic,assign)NSInteger indexTag;
+
+@property (nonatomic,strong)NSString *navTitle;
+@end

XFFruit/ViewControllers/Receiving/Controllers/NewReceiveViewController.h

@@ -7,7 +7,8 @@
 //
 
 #import "ICRBaseViewController.h"
-
+#import "Transfer.h"
 @interface NewReceiveViewController : ICRBaseViewController
-
+@property (nonatomic,strong)Transfer *transfer;
+@property (nonatomic,assign)BOOL isNotShowEdit;
 @end

XFFruit/ViewControllers/Receiving/Controllers/ReceiveProductViewController.h

+//
+//  ReceiveProductViewController.h
+//  XFFruit
+//
+//  Created by 陈俊俊 on 15/10/15.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "ICRBaseViewController.h"
+
+@interface ReceiveProductViewController : 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/ReceiveProductViewController.m

+//
+//  ReceiveProductViewController.m
+//  XFFruit
+//
+//  Created by 陈俊俊 on 15/10/15.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "ReceiveProductViewController.h"
+#import "HeaderCell.h"
+#import "ReceiveProductCell.h"
+#import "PurchaseBillProduct.h"
+#define TableHeight 44
+#define ShowHeight  130
+
+@interface ReceiveProductViewController ()<UITableViewDataSource,UITableViewDelegate,HeaderCellDelegate>
+{
+    CGRect _tableFrame;
+    NSMutableArray *_selectRowArr;//记录当前选中的cell
+}
+@end
+
+@implementation ReceiveProductViewController
+
+- (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)setViewFrame:(CGRect)viewFrame{
+    _tableFrame = 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{
+    TransferPdtDetail *billProduct = self.productArr[btn.tag];
+    [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_EditReceiveProduct object:nil userInfo:@{@"transferPdtDetail":billProduct,@"indexPath":@(btn.tag)}];
+}
+#pragma mark - 协议方法
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return self.productArr.count;
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    static NSString *cellID = @"ReceiveProductCell";
+    ReceiveProductCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+    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.row;
+    [cell.editBtn addTarget:self action:@selector(editClick:) forControlEvents:UIControlEventTouchUpInside];
+    
+    if (self.productArr.count > 0) {
+        TransferPdtDetail *billP = self.productArr[indexPath.row];
+        [cell setBillProduct:billP row:indexPath.row defaultState:self.defaultState[indexPath.row]];
+    }
+    return cell;
+}
+- (BOOL)isHaveIndexPath:(NSIndexPath *)indexPath{
+    for (NSIndexPath *path in _selectRowArr) {
+        if (path.row == indexPath.row) {
+            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/Receiving/Controllers/ReceiveViewController.m

@@ -372,17 +372,17 @@ typedef enum : NSUInteger {
     
     if (_dataArr.count > 0) {
         Transfer *transfer = _dataArr[indexPath.row];
-        if ([transfer.state isEqualToString:TRANSPORT_STATE_INITIAL] ) {
+        
             NewReceiveViewController *nvc = [NewReceiveViewController new];
-//            nvc.transfer = transfer;
+            nvc.transfer = transfer;
+        if ([transfer.state isEqualToString:TRANSFER_STATE_UNRECEIVED] ) {
             nvc.title = @"收货单收货";
-            [self PushViewController:nvc animated:YES];
+            nvc.isNotShowEdit = NO;
         }else{
-            ReceiveDetailViewController *pvc = [ReceiveDetailViewController new];
-            pvc.title = @"查看收货单";
-//            pvc.transfer = transfer;
-            [self PushViewController:pvc animated:YES];
+            nvc.title = @"查看收货单";
+            nvc.isNotShowEdit = YES;
         }
+         [self PushViewController:nvc animated:YES];
     }
 }
 

XFFruit/ViewControllers/Receiving/Views/ReceiveProductCell.h

+//
+//  ReceiveProductCell.h
+//  XFFruit
+//
+//  Created by 陈俊俊 on 15/10/15.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "TransferPdtDetail.h"
+@interface ReceiveProductCell : UITableViewCell
+@property (nonatomic,strong)UIImageView *smallImageView;
+@property (nonatomic,strong)UIButton *editBtn;
+@property (nonatomic,strong)UILabel *seqLabel;
+@property (nonatomic,strong)UILabel *titleLabel;
+@property (nonatomic,strong)UILabel *dscountLabel;
+@property (nonatomic,strong)UILabel *yscountLabel;
+@property (nonatomic,strong)UILabel *lineLabel;
+
+@property (nonatomic,strong)UIView *showView;
+@property (nonatomic,strong)UILabel *showStandLabel;
+@property (nonatomic,strong)UILabel *showbzdwLabel;
+@property (nonatomic,strong)UILabel *showbzCountLabel;
+@property (nonatomic,strong)UILabel *showshCountLabel;
+@property (nonatomic,strong)UILabel *showjcCountLabel;
+@property (nonatomic,strong)UILabel *showshjcCountLabel;
+@property (nonatomic,strong)UILabel *showjcPriceLabel;
+@property (nonatomic,strong)UILabel *showbzPriceLabel;
+@property (nonatomic,strong)UILabel *showTotalLabel;
+@property (nonatomic,strong)UILabel *showshTotalLabel;
+
+@property (nonatomic,strong)UILabel *showNoteLabel;
+
+@property (nonatomic,assign)BOOL isShowShipping;//是否发运
+
+- (void)setBillProduct:(TransferPdtDetail *)billProduct row:(NSInteger)row defaultState:(NSString *)state;
+
+@end

XFFruit/ViewControllers/Transfer/Controllers/ChooseTransportViewController.m

@@ -47,6 +47,7 @@
     [self bulidLayout];
     [self createRefresh];
     [self getData];
+    NSLog(@"%@",@{@"AB":@"abc_123"});
 }
 - (void)initData{
     self.dataArr = [NSMutableArray array];
@@ -83,9 +84,9 @@
     NSDictionary *dict = @{
                            @"state":TRANSPORT_STATE_UNRECEIVED,
                            @"userCode":userUtil.userCode,
+                           @"fetchParts":@"pdtDetails",
                            @"pageNumber":@(_currentPage),
-                           @"pageSize":@(20),
-//                           @"fetchParts":@"products"
+                           @"pageSize":@(20)
                              };
     [[ICRHTTPController sharedController] queryTransPortWithData:dict success:succ failure:fail];
 }
@@ -107,6 +108,7 @@
                 for (NSDictionary *pdtDetailDict in purchaseBill.pdtDetails) {
                     TransportPdtDetail *tran = [TransportPdtDetail new];
                     [tran setValuesForKeysWithDictionary:pdtDetailDict];
+                    tran.purchasebillnumber = purchaseBill.billnumber;
                     [pdtArr addObject:tran];
                 }
                 purchaseBill.pdtDetails = pdtArr;

XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m

@@ -258,6 +258,16 @@ typedef enum : NSUInteger {
         ShowMessage(@"费用不能为空");
         return NO;
     }
+    for (TransferPdtDetail *billProduct in _bottomView.productVC.transferProductArr) {
+        if ([billProduct.qty integerValue] <= 0 || [billProduct.baseQty integerValue] <= 0) {
+            ShowMessage(@"有数量等于0的商品明细，请编辑后保存");
+            return NO;
+        }
+        if ([billProduct.price floatValue] <=0 || [billProduct.packprice floatValue] <= 0) {
+            ShowMessage(@"有价格未填写的商品明细，请编辑后保存");
+            return NO;
+        }
+    }
     return YES;
 }
 
@@ -277,7 +287,7 @@ typedef enum : NSUInteger {
     ChooseTransportViewController *tpv = [ChooseTransportViewController new];
     tpv.getTransferProduct = ^(NSArray *products){
         if (products.count > 0) {
-            NSMutableArray *arr = [self coverTransferProduct:products];
+            NSMutableArray *arr = [self coverTransferFromTransportProduct:products];
             [_bottomView reProduct:arr];
         }
     };
@@ -405,7 +415,31 @@ typedef enum : NSUInteger {
     }
     return transferP;
 }
-
+- (NSMutableArray *)coverTransferFromTransportProduct:(NSArray *)products{
+    NSMutableArray *transferP = [NSMutableArray new];
+    for (TransportPdtDetail *pdt in products) {
+        TransferPdtDetail *ferPdt = [TransferPdtDetail new];
+        ferPdt.uuid = pdt.uuid;
+        ferPdt.productCode = pdt.productCode;
+        ferPdt.productName = pdt.productName;
+        ferPdt.productUuid = pdt.productUuid;
+        ferPdt.sourcebillnumber = pdt.purchasebillnumber;
+        ferPdt.sourcePdtDetail = pdt.purchasePdtDetail;
+        ferPdt.sourcetype = @"transport";
+        ferPdt.qpc = pdt.qpc;
+        ferPdt.qpcStr = pdt.qpcStr;
+        ferPdt.unit = pdt.unit;
+        ferPdt.qty = pdt.qty;
+        ferPdt.price = pdt.price;
+        ferPdt.baseQty = pdt.baseQty;
+        ferPdt.packprice = pdt.packprice;
+        ferPdt.baseUnit = pdt.baseUnit;
+        ferPdt.total = pdt.total;
+        ferPdt.note = pdt.note;
+        [transferP addObject:ferPdt];
+    }
+    return transferP;
+}
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{
     if (buttonIndex == 1) {
         //提交

XFFruit/ViewControllers/Transfer/Models/TransferPdtDetail.h

@@ -26,4 +26,10 @@
 @property (nonatomic,strong)NSNumber *baseQty;          //转运的基础数量
 @property (nonatomic,strong)NSNumber *total;            //转运合计金额
 @property (nonatomic,strong)NSString *note;             //备注
+
+//新增
+@property (nonatomic,strong)NSNumber *rctBaseQty;        //收货的基础数量
+@property (nonatomic,strong)NSNumber *rctQty;            //收货数量
+@property (nonatomic,strong)NSNumber *rctTotal;          //收货金额
+
 @end

XFFruit/ViewControllers/Transfer/Views/TransferProductCell.m

@@ -15,7 +15,7 @@
 #define LeftWidth 45
 #define RightWidth 30
 
-#define ShowWidth 150
+#define ShowWidth (ScreenSize.width  - LeftMargin*2 - SmallSize)/2
 #define ShowHeight 20
 
 @implementation TransferProductCell
@@ -61,7 +61,7 @@
     self.showView = [[UIView alloc]initWithFrame:CGRectMake(0, TableHeight, ScreenSize.width, 0)];
     self.showView.clipsToBounds = YES;
     
-    self.showStandLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.seqLabel.frame), 0, ShowWidth, ShowHeight))];
+    self.showStandLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.seqLabel.frame), 0, ShowWidth, ShowHeight))];
     self.showStandLabel.textAlignment = NSTextAlignmentLeft;
     self.showStandLabel.textColor = GXF_PLACEHOLDER_COLOR;
     self.showStandLabel.font = GXF_THREETEENTH_SIZE;

XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m

@@ -255,6 +255,18 @@ typedef enum : NSUInteger {
         ShowMessage(@"费用不能为空");
         return NO;
     }
+    for (TransportPdtDetail *billProduct in _bottomView.productVC.transportProductArr) {
+        if ([billProduct.qty integerValue] <= 0 || [billProduct.baseQty integerValue] <= 0) {
+            ShowMessage(@"有数量等于0的商品明细，请编辑后保存");
+            return NO;
+        }
+        if ([billProduct.price floatValue] <=0 || [billProduct.packprice floatValue] <= 0) {
+            ShowMessage(@"有价格未填写的商品明细，请编辑后保存");
+            return NO;
+        }
+    }
+
+    
     return YES;
 }
 

XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m

@@ -223,6 +223,28 @@ typedef enum : NSUInteger {
         CGRect scrollViewFrame = _scrollView.frame;
         scrollViewFrame.size.height = ScreenSize.height - 64;
         _scrollView.frame = scrollViewFrame;
+    }else{
+        if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_ABORT] && [IBTCommon checkIsPermission:TRANSPORT_ACTION_FINISH]) {
+            _secondBtn.hidden = NO;
+            _firstBtn.hidden = NO;
+        }else{
+            if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_ABORT]) {
+                _secondBtn.hidden = YES;
+                _firstBtn.hidden = NO;
+                _firstBtn.width =  ScreenSize.width - LeftMargin*2;
+            }else if([IBTCommon checkIsPermission:TRANSPORT_ACTION_FINISH])
+            {
+                _secondBtn.hidden = NO;
+                _firstBtn.hidden = YES;
+                _secondBtn.frame = CGRectMake(LeftMargin, ScreenSize.height  - 64 - BottomHeight +5, ScreenSize.width - LeftMargin*2, 40);
+            }else{
+                _firstBtn.hidden = YES;
+                _secondBtn.hidden = YES;
+                CGRect scrollViewFrame = _scrollView.frame;
+                scrollViewFrame.size.height = ScreenSize.height - 64;
+                _scrollView.frame = scrollViewFrame;
+            }
+        }
     }
 
     

XFFruit/ViewControllers/Transport/Views/TransportPurchaseCell.m

@@ -93,6 +93,8 @@
     self.secondArr = [NSMutableArray array];
     self.selectArr = selectArr;
     [self.secondArr addObjectsFromArray:bill.pdtDetails];
+    //重要
+    [self.secondTable reloadData];
 }
 
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView

XFFruit/ViewControllers/Transport/Views/TransportPurductCell.m

@@ -15,7 +15,7 @@
 #define LeftWidth 45
 #define RightWidth 30
 
-#define ShowWidth 150
+#define ShowWidth (ScreenSize.width  - LeftMargin*2 - SmallSize)/2
 #define ShowHeight 20
 
 @implementation TransportPurductCell
@@ -67,7 +67,7 @@
     self.showView = [[UIView alloc]initWithFrame:CGRectMake(0, TableHeight, ScreenSize.width, 0)];
     self.showView.clipsToBounds = YES;
     
-    self.showStandLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.seqLabel.frame), 0, ShowWidth, ShowHeight))];
+    self.showStandLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.seqLabel.frame), 0, ShowWidth, ShowHeight))];
     self.showStandLabel.textAlignment = NSTextAlignmentLeft;
     self.showStandLabel.textColor = GXF_PLACEHOLDER_COLOR;
     self.showStandLabel.text = @"包装规格：1*12斤";