转运单 直接带过 发运单的车辆信息和 电话|控制用户可选仓库范围|各单据添加了提交系统处理、系统处理失败|发运单显示已转运数量

XFFruit.xcodeproj/project.pbxproj

@@ -159,6 +159,7 @@
 		728899EB1BEF4233003CC41E /* PassgerPriceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */; };
 		728899EE1BEF4A75003CC41E /* PasengerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899ED1BEF4A75003CC41E /* PasengerCell.m */; };
 		728899F11BEF4A8A003CC41E /* PassengerHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */; };
+		728F84AC1C194A05009E4A3D /* UserWarehouse.m in Sources */ = {isa = PBXBuildFile; fileRef = 728F84AB1C194A05009E4A3D /* UserWarehouse.m */; settings = {ASSET_TAGS = (); }; };
 		729735C11BFC9B5800F83CEA /* Compass.m in Sources */ = {isa = PBXBuildFile; fileRef = 729735C01BFC9B5800F83CEA /* Compass.m */; settings = {ASSET_TAGS = (); }; };
 		729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; };
 		72A8132D1BCA8BBA003631F3 /* ChooseTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */; };
@@ -758,6 +759,8 @@
 		728899ED1BEF4A75003CC41E /* PasengerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PasengerCell.m; sourceTree = "<group>"; };
 		728899EF1BEF4A8A003CC41E /* PassengerHeaderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassengerHeaderCell.h; sourceTree = "<group>"; };
 		728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PassengerHeaderCell.m; sourceTree = "<group>"; };
+		728F84AA1C194A05009E4A3D /* UserWarehouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserWarehouse.h; sourceTree = "<group>"; };
+		728F84AB1C194A05009E4A3D /* UserWarehouse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserWarehouse.m; sourceTree = "<group>"; };
 		729735BF1BFC9B5800F83CEA /* Compass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Compass.h; sourceTree = "<group>"; };
 		729735C01BFC9B5800F83CEA /* Compass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Compass.m; sourceTree = "<group>"; };
 		729A2E911BE60C0200493603 /* GeometryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryView.h; sourceTree = "<group>"; };
@@ -1613,6 +1616,8 @@
 				FE4678AF1B8D63A100B5EDA3 /* Warehouse.m */,
 				FE95FDD81B93FC12008040D0 /* PurchaseBillProduct.h */,
 				FE95FDD91B93FC12008040D0 /* PurchaseBillProduct.m */,
+				728F84AA1C194A05009E4A3D /* UserWarehouse.h */,
+				728F84AB1C194A05009E4A3D /* UserWarehouse.m */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -3146,6 +3151,7 @@
 				FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */,
 				72F9D4821BA7EC9600795A00 /* NoticeProductViewController.m in Sources */,
 				C15039221ADE39190081A686 /* IBTUIControl.m in Sources */,
+				728F84AC1C194A05009E4A3D /* UserWarehouse.m in Sources */,
 				C112BC4D1AD91CF800F75F58 /* ICRPatrolDetailViewController.m in Sources */,
 				0414FF181B94959700C7B00E /* SeePurchaseNoticeViewController.m in Sources */,
 				C142D2BC1AC3A155000109A7 /* UITableViewCell+Helper.m in Sources */,

XFFruit/Controllers/DataBaseController/ICRDataBaseController.m

@@ -27,6 +27,7 @@
 #import "Warehouse.h"
 #import "GXFProductUnit.h"
 #import "Accounttitle.h"
+#import "UserWarehouse.h"
 
 #define ICR_DB_ERROR_PARAMETER              @"Parse Error: Bad Parameter(s)"
 
@@ -98,7 +99,7 @@ static NSString *ICRDataBasePath = @"";
     [_m_dbQueue inDatabase:^(FMDatabase *db) {
         
         NSArray *tableNameArr =
-        @[ [Product class],[User class],[Survey class],[Vendor class],[Warehouse class],[GXFProductUnit class],[Accounttitle class],[ICRAnnouncement class]];
+        @[ [Product class],[User class],[Survey class],[Vendor class],[Warehouse class],[GXFProductUnit class],[Accounttitle class],[ICRAnnouncement class],[UserWarehouse class]];
         
         NSMutableArray *sqlBatch = [NSMutableArray array];
         NSString *sql = nil;

XFFruit/Controllers/HTTPController/ICRHTTPController.h

@@ -242,6 +242,14 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
                        page_size:(NSUInteger)page_size
                          success:(void (^)(id))succ
                          failure:(void (^)(id))fail;
+//4.用户仓库
+- (void)downloadUserWarehouseWithStartDate:(NSString *)stateDate
+                      Page_number:(NSUInteger)page_number
+                        page_size:(NSUInteger)page_size
+                          success:(void (^)(id))succ
+                          failure:(void (^)(id))fail;
+
+
 //5.科目账款
 - (void)getAccounttitleWithStartDate:(NSString *)stateDate
                          Page_number:(NSUInteger)page_number

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -83,6 +83,8 @@ typedef NS_ENUM(NSUInteger, ICRHTTPAction) {
     XFFHttp_GetVendor,
     //仓库
     XFFHttp_GetWarehouse,
+    //用户仓库表
+    XFFHttp_downloadUserWarehouse,
     //科目账单
     XFFHttp_GetAccounttitle,
 
@@ -197,6 +199,8 @@ static NSString * const ICRHTTPInterface[] = {
     [XFFHttp_GetVendor]                     = @"data/vendor/download",
     //仓库
     [XFFHttp_GetWarehouse]                  = @"data/warehouse/download",
+    [XFFHttp_downloadUserWarehouse]         = @"data/warehouse/downloadUserWarehouse",
+
     //科目账单
     [XFFHttp_GetAccounttitle]               = @"data/accounttitle/download",
     
@@ -1784,6 +1788,17 @@ acceptTypeJson:YES
     
     [self p_downloadWithStartDate:stateDate ICRHTTPAction:XFFHttp_GetWarehouse ClassName:@"Warehouse" Page_number:page_number page_size:page_size success:succ failure:fail];
 }
+//用户仓库表
+- (void)downloadUserWarehouseWithStartDate:(NSString *)stateDate
+                               Page_number:(NSUInteger)page_number
+                                 page_size:(NSUInteger)page_size
+                                   success:(void (^)(id))succ
+                                   failure:(void (^)(id))fail{
+    [self p_downloadWithStartDate:stateDate ICRHTTPAction:XFFHttp_downloadUserWarehouse ClassName:@"UserWarehouse" Page_number:page_number page_size:page_size success:succ failure:fail];
+}
+
+
+
 #pragma mark - 科目
 - (void)getAccounttitleWithStartDate:(NSString *)startDate
                          Page_number:(NSUInteger)page_number

XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m

@@ -219,12 +219,8 @@
             }else{
                 sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"code"];
             }
-        }else if([tableStr isEqualToString:GXF_BASECLASS_WAREHOUSE]){
-            if (titleStr.length > 0) {
-                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"code"];
-            }else{
-                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"code"];
-            }
+        }else if([tableStr isEqualToString:GXF_BASECLASS_UserWAREHOUSE]){
+            sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE userUuid = '%@'", tableStr,[ICRUserUtil sharedInstance].userId];//@"4028b88150a987080150a987dce5007a"
         }else if([tableStr isEqualToString:GXF_BASECLASS_VENDOR]){
             if (titleStr.length > 0) {
                 sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"code"];
@@ -251,16 +247,21 @@
             NSString *befortDate = @"2014-01-01";
             [self getBaseDataFromServerWithStartDate:befortDate];
         }else{
-            [strongSelf.dataArr removeAllObjects];
-            if (!self.tableView.header.lastUpdatedTime) {
-                [strongSelf.dataArr addObject:[NSDate date]];
+            if ([tableStr isEqualToString:GXF_BASECLASS_UserWAREHOUSE]) {
+                [self getWareHoseData:fetchedObjects titleStr:titleStr];
             }else{
-               [strongSelf.dataArr addObject:self.tableView.header.lastUpdatedTime];
+                [strongSelf.dataArr removeAllObjects];
+                if (!self.tableView.header.lastUpdatedTime) {
+                    [strongSelf.dataArr addObject:[NSDate date]];
+                }else{
+                    [strongSelf.dataArr addObject:self.tableView.header.lastUpdatedTime];
+                }
+                
+                [strongSelf.dataArr addObjectsFromArray:fetchedObjects];
+                
+                [self tableViewRefresh:titleStr];
+
             }
-            
-            [strongSelf.dataArr addObjectsFromArray:fetchedObjects];
-            
-            [self tableViewRefresh:titleStr];
         }
         
     };
@@ -269,6 +270,49 @@
                   fetchBlock:fetchBlk
            fetchResultsBlock:fetchResultsBlk];
 }
+
+- (void)getWareHoseData:(NSArray *)arr titleStr:(NSString *)titleStr{
+    if (arr.count > 0) {
+        
+        NSMutableString *parms = [NSMutableString string];
+        for (int i = 0; i < arr.count; i++) {
+            UserWarehouse *userW = arr[i];
+            if (i == arr.count - 1) {
+                [parms appendFormat:@"'%@'",userW.warehouseUuid];
+            }else{
+                [parms appendFormat:@"'%@',",userW.warehouseUuid];
+            }
+        }
+        ICRDatabaseFetchBlock fetchBlk = ^FMResultSet *(FMDatabase *db) {
+            NSString * sql = @"";
+            if (titleStr.length > 0) {
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE  (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 AND uuid in (%@) ORDER BY %@", GXF_BASECLASS_WAREHOUSE,titleStr,titleStr, parms,@"code"];
+            }else{
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 AND uuid in (%@) ORDER BY %@", GXF_BASECLASS_WAREHOUSE,parms, @"code"];
+            }
+            CLog(@"=========%@",sql);
+            return [db executeQuery:sql];
+        };
+        __weak typeof(self)weakSelf = self;
+        ICRDatabaseFetchResultsBlock fetchResultsBlk = ^(NSArray *fetchedObjects) {
+            __strong __typeof(weakSelf)strongSelf = weakSelf;
+            [strongSelf.dataArr removeAllObjects];
+            if (!self.tableView.header.lastUpdatedTime) {
+                [strongSelf.dataArr addObject:[NSDate date]];
+            }else{
+                [strongSelf.dataArr addObject:self.tableView.header.lastUpdatedTime];
+            }
+            [strongSelf.dataArr addObjectsFromArray:fetchedObjects];
+            [self tableViewRefresh:titleStr];
+        };
+        ICRDataBaseController *dbCtrl = [ICRDataBaseController sharedController];
+        [dbCtrl runFetchForClass:NSClassFromString(GXF_BASECLASS_WAREHOUSE)
+                      fetchBlock:fetchBlk
+               fetchResultsBlock:fetchResultsBlk];
+
+    }
+}
+
 #pragma mark -成功
 - (void)sureClick{
     if (self.isMoreChose) {

XFFruit/Macro/ICRAppMacro.h

@@ -52,7 +52,7 @@
 #import "Vendor.h"
 #import "Warehouse.h"
 #import "Accounttitle.h"
-
+#import "UserWarehouse.h"
 
 
 

XFFruit/Utilities/IBTUIKit/IBTConstants.h

@@ -107,6 +107,7 @@
 #define GXF_LEFTSIX_COLOR       HexColor(@"666666")
 #define GXF_PopView_COLOR       RGBA(24,164,219,1)
 
+#define GXF_ELEVTEEN_SIZE       FontSize(11)
 #define GXF_TWELVETEEN_SIZE     FontSize(12)
 #define GXF_THREETEENTH_SIZE    FontSize(13)
 #define GXF_FOURTEENTH_SIZE     FontSize(14)
@@ -146,8 +147,8 @@
 #define PURCHASE_STATE_SHIPPING                 @"shipping" //已审批  发运中
 #define PURCHASE_STATE_FINISHED                 @"finished" //已完成
 #define PURCHASE_STATE_ABORTED                  @"aborted"  //已作废
-
-
+#define PURCHASE_STATE_PROCESS                  @"process"//提交系统处理
+#define PURCHASE_STATE_PROCESSFAIL              @"processFail"//系统处理失败
 //采购单操作
 #define PURCHASE_ACTION_REJECT                  @"reject"
 #define PURCHASE_ACTION_APPROVE                 @"approve"
@@ -176,6 +177,7 @@
 #define GXF_BASECLASS_PRODUCTUNIT               @"GXFProductUnit"
 #define GXF_BASECLASS_USER                      @"User"
 #define GXF_BASECLASS_ACCOUNTTITLE              @"Accounttitle"
+#define GXF_BASECLASS_UserWAREHOUSE             @"UserWarehouse"
 
 
 //发运单状态
@@ -184,7 +186,8 @@
 #define TRANSPORT_STATE_RECEIVED                @"received" //已收货
 #define TRANSPORT_STATE_ABORTED                 @"aborted" //已废用
 #define TRANSPORT_STATE_FINISHED                @"finished" //已完成
-
+#define TRANSPORT_STATE_PROCESS                  @"process"//提交系统处理
+#define TRANSPORT_STATE_PROCESSFAIL              @"processFail"//系统处理失败
 //采购通知单状态
 //initial("未提交"), notAccepted("未接受"), purchasing("采购中"), finished("已完成")
 #define PURCHASENOTICE_STATE_INITIAL            @"initial"
@@ -197,6 +200,8 @@
 #define TRANSFER_STATE_UNRECEIVED               @"unreceived"//待收货
 #define TRANSFER_STATE_RECEIVED                 @"received"  //已收货
 #define TRANSFER_STATE_ABORTED                  @"aborted"   //已废用
+#define TRANSFER_STATE_PROCESS                  @"process"//提交系统处理
+#define TRANSFER_STATE_PROCESSFAIL              @"processFail"//系统处理失败
 //收货单
 #define RECEIVE_STATE_SAVE                      @"save"      //保存
 #define RECEIVE_STATE_RECEIVE                   @"receive"   //收货

XFFruit/ViewControllers/ChooseViewController/ChooseWarehouseViewController.m

@@ -22,7 +22,7 @@
     //记录更新时间
     self.tableView.header.lastUpdatedTimeKey = ChooseWarehouseUpdateDate;
     self.title = @"选择仓库";
-    [self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE];
+    [self fetchDataList:@"" tableStr:GXF_BASECLASS_UserWAREHOUSE];
 }
 
 -(void)getBaseDataFromServerWithStartDate:(NSString *)startDate{
@@ -51,7 +51,9 @@
         if (pageCount <= self.currentPage) {
             [self endRefreshing];
             [IBTLoadingView hideHUDWithText:nil];
-            [self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE];
+//            [self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE];
+            self.currentPage = 0;
+            [self getUserWareHouseFromServer:self.startDate];
         }else{
             self.currentPage++;
             [self getBaseDataFromServerWithStartDate:self.startDate];
@@ -60,7 +62,41 @@
         [IBTLoadingView hideHUDWithText:nil];
         [IBTLoadingView showTips:data];
     }
-    
+}
+
+- (void)getUserWareHouseFromServer:(NSString *)startDate{
+    __weak typeof(self)weakSelf = self;
+    void(^succ)(id) = ^(id data) {
+        __strong __typeof(weakSelf)strongSelf = weakSelf;
+        //请求成功之后
+        strongSelf.startDate = startDate;
+        [strongSelf getLastUWDataFromServer:data];
+    };
+    void(^fail)(id) = ^(id data) {
+        [IBTLoadingView hideHUDWithText:nil];
+        [IBTLoadingView showTips:data];
+        [self endRefreshing];
+    };
+    [[ICRHTTPController sharedController] downloadUserWarehouseWithStartDate:startDate  Page_number:self.currentPage page_size:100 success:succ failure:fail];
+}
+
+- (void)getLastUWDataFromServer:(id)data
+{
+    if (data) {
+        NSDictionary *pageDict = data[ @"data" ][ @"paging" ];
+        NSInteger pageCount = [pageDict[@"pageCount"] integerValue];
+        if (pageCount <= self.currentPage) {
+            [self endRefreshing];
+            [IBTLoadingView hideHUDWithText:nil];
+            [self fetchDataList:@"" tableStr:GXF_BASECLASS_UserWAREHOUSE];
+        }else{
+            self.currentPage++;
+            [self getUserWareHouseFromServer:self.startDate];
+        }
+    }else{
+        [IBTLoadingView hideHUDWithText:nil];
+        [IBTLoadingView showTips:data];
+    }
 }
 #pragma mark - 协议方法
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {

XFFruit/ViewControllers/Purchase/Controllers/ProductBillViewController.m

@@ -50,7 +50,7 @@
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     [self.view addSubview:self.tableView];
     
-    NSArray *arr = @[@"商品",@"单价",@"包装数量",@"已发运"];
+    NSArray *arr = @[@"商品",@"单价",@"包装数量",@"已发运数"];
     
     HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenEdit];
     [self.view addSubview:headCell];

XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m

@@ -178,6 +178,8 @@ typedef enum : NSUInteger {
         }
     }else if([self.bill.state isEqualToString:PURCHASE_STATE_ABORTED]){//已作废
         [self hiddenTwoBtn];
+    }else{
+         [self hiddenTwoBtn];
     }
 }
 

XFFruit/ViewControllers/Purchase/Models/UserWarehouse.h

+//
+//  UserWarehouse.h
+//  XFFruit
+//
+//  Created by 陈俊俊 on 15/12/10.
+//  Copyright © 2015年 Xummer. All rights reserved.
+//
+
+#import "IBTModel.h"
+
+@interface UserWarehouse : IBTModel
+@property (nonatomic,strong)NSString *uuid;//	id
+@property (nonatomic,strong)NSString *userUuid;	//用户标识
+@property (nonatomic,strong)NSString *warehouseUuid;	//仓库唯一标识
+@property (nonatomic,strong)NSString *create_time;	//创建时间
+@property (nonatomic,strong)NSString *create_id;	//创建人代码
+@property (nonatomic,strong)NSString *create_operName;	//创建人名称
+@property (nonatomic,strong)NSString *lastModified_time;	//最后修改时间
+@property (nonatomic,strong)NSString *lastModified_id;	//最后修改人代码
+@property (nonatomic,strong)NSString *lastModified_operName;	//最后修改人名称
+@end

XFFruit/ViewControllers/Purchase/Models/UserWarehouse.m

+//
+//  UserWarehouse.m
+//  XFFruit
+//
+//  Created by 陈俊俊 on 15/12/10.
+//  Copyright © 2015年 Xummer. All rights reserved.
+//
+
+#import "UserWarehouse.h"
+
+@implementation UserWarehouse
++ (NSDictionary *)specialKeysAndReplaceKeys {
+    return @{ @"uwID" : [[self class] PrimaryKey], };
+}
+
++ (NSString *)PrimaryKey {
+    return @"uuid";
+}
+@end

XFFruit/ViewControllers/Purchase/Views/PurchaseCell.m

@@ -29,6 +29,8 @@
     self.stateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
     self.stateBtn.titleLabel.font = GXF_FOURTEENTH_SIZE;
+//    self.stateBtn.backgroundColor = [UIColor redColor];
+
     [self.stateBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     self.stateBtn.enabled = NO;
     
@@ -74,28 +76,45 @@
     self.createOperNameLabel.text = [NSString stringWithFormat:@"创建人：%@",purchaseBill.create_operName] ;
     self.createTimeLabel.text =[NSString stringWithFormat:@"创建时间：%@",purchaseBill.create_time];
     NSString *stateStr = @"";
+//    if ([purchaseBill.vendor_code isEqualToString:@"0000"]) {
+//        purchaseBill.state = PURCHASE_STATE_PROCESS;
+//    }
     if ([purchaseBill.state isEqualToString:PURCHASE_STATE_INITIAL]) {
+        self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
         stateStr = @"未提交";
         [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"]  forState:UIControlStateDisabled];
     }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_SUBMITTED]) {
+         self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
         stateStr = @"未审批";
         [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
     }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_REJECTED]) {
+         self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
         stateStr = @"已拒绝";
         [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled];
         
     }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_SHIPPING]) {
+         self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
         stateStr = @"发运中";
         [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
-        
     }
     else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_FINISHED]) {
+         self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
         stateStr = @"已完成";
         [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
     }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_ABORTED]) {
+         self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
         stateStr = @"已作废";
         [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+    }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_PROCESS]) {
+//         self.stateBtn.frame = CGRectMake(0 , TopMargin, LeftMargin - TopMargin, 20);
+        stateStr = @"提交系统处理";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+    }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_PROCESSFAIL]) {
+//         self.stateBtn.frame = CGRectMake(0 , TopMargin, LeftMargin - TopMargin, 20);
+        stateStr = @"系统处理失败";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
     }
+    
     [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
 }
 

XFFruit/ViewControllers/Transfer/Controllers/ChooseTransferViewController.m

@@ -109,6 +109,8 @@
                     TransferPdtDetail *tran = [TransferPdtDetail new];
                     [tran setValuesForKeysWithDictionary:pdtDetailDict];
                     tran.sourcebillnumber = purchaseBill.billnumber;
+                    tran.carnumber = purchaseBill.carnumber;
+                    tran.carphone = purchaseBill.carphone;
                     [pdtArr addObject:tran];
                 }
                 purchaseBill.pdtDetails = pdtArr;

XFFruit/ViewControllers/Transfer/Controllers/ChooseTransportViewController.m

@@ -111,6 +111,8 @@
                     TransportPdtDetail *tran = [TransportPdtDetail new];
                     [tran setValuesForKeysWithDictionary:pdtDetailDict];
                     tran.purchasebillnumber = purchaseBill.billnumber;
+                    tran.carnumber = purchaseBill.carnumber;
+                    tran.carphone = purchaseBill.carphone;
                     [pdtArr addObject:tran];
                 }
                 purchaseBill.pdtDetails = pdtArr;

XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m

@@ -298,6 +298,8 @@ typedef enum : NSUInteger {
         if (products.count > 0) {
             NSMutableArray *arr = [self coverTransferFromTransportProduct:products];
             [_bottomView reProduct:arr];
+            TransferPdtDetail *pdt = arr[0];
+            [self setPhoneAndCar:pdt.carnumber phone:pdt.carphone];
         }
     };
     [self PushViewController:tpv animated:YES];
@@ -308,11 +310,23 @@ typedef enum : NSUInteger {
     ctv.chooseTransferProduct = ^(NSArray *products){
         if (products.count > 0) {
             [_bottomView reProduct:products];
+            TransferPdtDetail *pdt = products[0];
+            [self setPhoneAndCar:pdt.carnumber phone:pdt.carphone];
         }
     };
     [self PushViewController:ctv animated:YES];
 }
 
+#pragma mark - 从发运单和转运单带过来手机和车辆信息
+- (void)setPhoneAndCar:(NSString *)carNumber phone:(NSString *)carphone{
+    if (_sheetView.carTextFiled.text.length < 1) {
+        _sheetView.carTextFiled.text = carNumber;
+    }
+    if (_sheetView.phoneTextFiled.text.length < 1) {
+        _sheetView.phoneTextFiled.text = carphone;
+    }
+}
+
 
 - (void)addTransferCost:(NSNotification *)fination{
     
@@ -460,6 +474,8 @@ typedef enum : NSUInteger {
         ferPdt.baseUnit = pdt.baseUnit;
         ferPdt.total = pdt.total;
         ferPdt.note = pdt.note;
+        ferPdt.carphone = pdt.carphone;
+        ferPdt.carnumber = pdt.carnumber;
         [transferP addObject:ferPdt];
     }
     return transferP;

XFFruit/ViewControllers/Transfer/Models/TransferPdtDetail.h

@@ -32,4 +32,9 @@
 @property (nonatomic,strong)NSNumber *rctQty;            //收货数量
 @property (nonatomic,strong)NSNumber *rctTotal;          //收货金额
 
+//新增手机和车辆信息
+@property (nonatomic,strong)NSString *carphone;         //司机电话
+@property (nonatomic,strong)NSString *carnumber;	    //车牌号
+
+
 @end

XFFruit/ViewControllers/Transfer/Views/TransferCell.m

@@ -97,6 +97,12 @@
         stateStr = @"已作废";
         [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
         
+    }else if ([transfer.state isEqualToString:TRANSFER_STATE_PROCESS]) {
+        stateStr = @"提交系统处理";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+    }else if ([transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) {
+        stateStr = @"系统处理失败";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
     }
     [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
 }

XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m

@@ -257,6 +257,8 @@ typedef enum : NSUInteger {
         }else{
             [self createBtnWithArr:arr];
         }
+    }else{
+        [self hiddenAllBtn];
     }
     NSArray *leftArr = @[@"单号:",@"采购单:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"预计到货时间:",@"备注:"];
     

XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.m

@@ -15,7 +15,7 @@
 #import "GXFPopView.h"
 
 #define TableHeight 44
-#define ShowHeight  110
+#define ShowHeight  130
 
 @interface TransportProductViewController ()
 <UITableViewDataSource,UITableViewDelegate,FooterCellDelegate,HeaderCellDelegate,GXFPopViewDelegate>
@@ -51,7 +51,7 @@
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     [self.view addSubview:self.tableView];
     
-    NSArray *arr = @[@"商品",@"单价",@"包装数量"];
+    NSArray *arr = @[@"商品",@"单价",@"包装数量",@"已转运数"];
     
     HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenEdit];
     [self.view addSubview:headCell];

XFFruit/ViewControllers/Transport/Models/TransportPdtDetail.h

@@ -24,6 +24,13 @@
 @property (nonatomic,strong)NSString *baseUnit;//规格单位
 @property (nonatomic,strong)NSNumber *baseQty;//发运的基础数量
 @property (nonatomic,strong)NSNumber *total;//发运合计金额
+@property (nonatomic,strong)NSNumber *transferBaseQty;//已转运基础数量
+@property (nonatomic,strong)NSNumber *transferQty;//已转运数量
 @property (nonatomic,strong)NSString *note;//备注
 
+//新增手机和车辆信息
+@property (nonatomic,strong)NSString *carphone;         //司机电话
+@property (nonatomic,strong)NSString *carnumber;	    //车牌号
+
+
 @end

XFFruit/ViewControllers/Transport/Views/TransportCell.m

@@ -90,6 +90,12 @@
     }else if ([transport.state isEqualToString:TRANSPORT_STATE_FINISHED]) {
         stateStr = @"已完成";
         [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+    }else if ([transport.state isEqualToString:TRANSPORT_STATE_PROCESS]) {
+        stateStr = @"提交系统处理";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+    }else if ([transport.state isEqualToString:TRANSPORT_STATE_PROCESSFAIL]) {
+        stateStr = @"系统处理失败";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
     }
     [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
 }

XFFruit/ViewControllers/Transport/Views/TransportPurductCell.h

@@ -15,6 +15,7 @@
 @property (nonatomic,strong)UILabel *titleLabel;
 @property (nonatomic,strong)UILabel *priceLabel;
 @property (nonatomic,strong)UILabel *countLabel;
+@property (nonatomic,strong)UILabel *shippedQtyLabel;
 @property (nonatomic,strong)UILabel *lineLabel;
 
 @property (nonatomic,strong)UIView *showView;
@@ -26,6 +27,11 @@
 @property (nonatomic,strong)UILabel *showTotalLabel;
 @property (nonatomic,strong)UILabel *showNoteLabel;
 @property (nonatomic,strong)UILabel *showPurchaseLabel;
+@property (nonatomic,strong)UILabel *showShippedQty;//转运包装数量
+@property (nonatomic,strong)UILabel *showShippedBaseQty;//转运基础数量
+
+
+
 @property (nonatomic,strong)NSString *rightImageName;
 
 - (void)setPdtDetail:(TransportPdtDetail *)pdtDetail row:(NSInteger)row;

XFFruit/ViewControllers/Transport/Views/TransportPurductCell.m

@@ -34,7 +34,7 @@
 
 - (void)bulidLayout
 {
-    CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (3 -1))/3;
+    CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (4 -1))/4;
     
     self.smallImageView = [[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - SmallSize)/2 , SmallSize, SmallSize)];
     self.smallImageView.image = [UIImage imageNamed:@"arrowright"];
@@ -63,6 +63,12 @@
     self.countLabel.textColor = GXF_CONTENT_COLOR;
     self.countLabel.font = GXF_SIXTEENTEH_SIZE;
     
+    self.shippedQtyLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.countLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+    self.shippedQtyLabel.textAlignment = NSTextAlignmentCenter;
+    self.shippedQtyLabel.textColor = GXF_CONTENT_COLOR;
+    self.shippedQtyLabel.font = GXF_SIXTEENTEH_SIZE;
+    
+
     
     self.showView = [[UIView alloc]initWithFrame:CGRectMake(0, TableHeight, ScreenSize.width, 0)];
     self.showView.clipsToBounds = YES;
@@ -111,13 +117,31 @@
     self.showNoteLabel.text = @"备注：1000";
     self.showNoteLabel.font = GXF_THREETEENTH_SIZE;
     
-    self.showPurchaseLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth+ 100, ShowHeight))];
+    
+    
+    self.showShippedQty = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth, ShowHeight))];
+    self.showShippedQty.textAlignment = NSTextAlignmentLeft;
+    self.showShippedQty.textColor = GXF_PLACEHOLDER_COLOR;
+    self.showShippedQty.text = @"转运运包装数量：";
+    self.showShippedQty.font = GXF_THREETEENTH_SIZE;
+    
+    self.showShippedBaseQty = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showCountLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth, ShowHeight))];
+    self.showShippedBaseQty.textAlignment = NSTextAlignmentLeft;
+    self.showShippedBaseQty.textColor = GXF_PLACEHOLDER_COLOR;
+    self.showShippedBaseQty.text = @"转运基础数量：";
+    self.showShippedBaseQty.font = GXF_THREETEENTH_SIZE;
+
+    
+    self.showPurchaseLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showShippedQty.frame), ShowWidth+ 100, ShowHeight))];
     self.showPurchaseLabel.textAlignment = NSTextAlignmentLeft;
     self.showPurchaseLabel.textColor = GXF_PLACEHOLDER_COLOR;
     self.showPurchaseLabel.text = @"采购单号：1000";
     self.showPurchaseLabel.font = GXF_THREETEENTH_SIZE;
     
     
+    
+    
+    
     self.editBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     [self.editBtn setImage:[UIImage imageNamed:self.rightImageName] forState:UIControlStateNormal];
     self.editBtn.frame = CGRectMake(ScreenSize.width - LeftWidth, 0, LeftWidth , TableHeight);
@@ -131,6 +155,7 @@
     [self.contentView addSubview:self.titleLabel];
     [self.contentView addSubview:self.priceLabel];
     [self.contentView addSubview:self.countLabel];
+    [self.contentView addSubview:self.shippedQtyLabel];
     [self.contentView addSubview:self.editBtn];
     [self.contentView addSubview:self.showView];
     
@@ -141,7 +166,11 @@
     [self.showView addSubview:self.showPriceLabel];
     [self.showView addSubview:self.showPurchaseLabel];
     [self.showView addSubview:self.showTotalLabel];
-    
+    [self.showView addSubview:self.showShippedBaseQty];
+    [self.showView addSubview:self.showShippedQty];
+
+    [self.showView addSubview:self.showTotalLabel];
+
     [self.showView addSubview:self.showNoteLabel];
     [self.contentView addSubview:self.lineLabel];
     
@@ -152,6 +181,8 @@
     self.titleLabel.text = pdtDetail.productName;
     self.priceLabel.text =  [NSString stringWithFormat:@"%.2f元",[pdtDetail.price floatValue]];
     self.countLabel.text = [NSString stringWithFormat:@"%@%@",[pdtDetail.qty stringValue],pdtDetail.unit];
+     self.shippedQtyLabel.text = [NSString stringWithFormat:@"%@%@",pdtDetail.transferBaseQty ? [pdtDetail.transferBaseQty stringValue]:@"0",pdtDetail.unit];
+    
      self.showNameLabel.text = [NSString stringWithFormat:@"商品：%@[%@]",pdtDetail.productName,pdtDetail.productCode];
     self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",[pdtDetail.qpc stringValue],pdtDetail.baseUnit];
     self.showCountLabel.text = [NSString stringWithFormat:@"包装数量：%@%@",[pdtDetail.qty stringValue],pdtDetail.unit];
@@ -159,7 +190,8 @@
     self.showPriceLabel.text = [NSString stringWithFormat:@"包装单价：%.2f元",[pdtDetail.packprice floatValue]];
     self.showPurchaseLabel.text = [NSString stringWithFormat:@"采购单号：%@",pdtDetail.purchasebillnumber.length > 0 ? pdtDetail.purchasebillnumber: @"无"];
     self.showTotalLabel.text = [NSString stringWithFormat:@"总金额：%.2f元",[pdtDetail.total floatValue]];
-
+    self.showShippedBaseQty.text = [NSString stringWithFormat:@"转运包装数量：%@%@",pdtDetail.transferQty ? [pdtDetail.transferQty stringValue]:@"0",pdtDetail.unit];
+    self.showShippedQty.text = [NSString stringWithFormat:@"转运运基础数量：%@%@",pdtDetail.transferBaseQty ? [pdtDetail.transferBaseQty stringValue]:@"0",pdtDetail.baseUnit];
     self.showNoteLabel.text =[NSString stringWithFormat:@"备注：%@",pdtDetail.note ? pdtDetail.note :@"无"];
 }