收货单查看显示收货人和收货时间 Sandy

XFFruit/ViewControllers/Business/BusinessViewController.m

@@ -33,6 +33,21 @@
 #import "GXFFunctionDB.h"
 #import "GXFNewProcessViewController.h"
 #import "GXFListProcessViewController.h"
+#import "GXFNewProcessViewController.h"
+#import "GXFFunctionsViewController.h"
+#import "GXFDisplayFunction.h"
+#import "GXFFunction.h"
+#import "GXFNoticeFunctionTableViewCell.h"
+#import "GXFFunctionCollectionViewCell.h"
+#import "GXFListProcessViewController.h"
+#import "GXFFunctionDB.h"
+#import "WriteFeedbackViewController.h"
+#import "MarketSurveyViewController.h"
+#import "ReceiveViewController.h"
+#import "TransportViewController.h"
+#import "NewTransferViewController.h"
+#import "TransferViewController.h"
+#import "NewTransportViewController.h"
 @interface BusinessViewController ()<ICRFunctionBaseViewDelegate,UITableViewDataSource,UITableViewDelegate>
 @property (nonatomic, strong) ICRFunctionBaseView *c_functionBaseView;
 @property (nonatomic, strong) UITableView *c_tableView;
@@ -134,6 +149,16 @@
             [self PushViewController:svc animated:YES];
         }
             break;
+        case  kFunctionFeedBackSurvey:   //填写行情反馈3
+        {
+            MarketSurveyViewController *marketSurveyVC = [[MarketSurveyViewController alloc] init];
+            marketSurveyVC.title = @"调研中";
+            
+            //WriteFeedbackViewController *svc = [[WriteFeedbackViewController alloc] init];
+            
+            [self PushViewController:marketSurveyVC animated:YES];
+        }
+            break;
         case kFunctionSeeSurvey://查看行情
         {
             SurveyViewController *svc = [[SurveyViewController alloc] init];
@@ -187,7 +212,8 @@
             [self PushViewController:tVC animated:YES];
         }
             break;
-        case kFunctionExaminePurchase:
+            
+        case kFunctionExaminePurchase://供应商确认采购单
         {
             PurchaseViewController *tVC = [[PurchaseViewController alloc] init];
             tVC.title = @"供应商确认采购单";

XFFruit/ViewControllers/Home/Controllers/ICRHomeViewController.m

@@ -36,6 +36,11 @@
 #import "GXFFunctionDB.h"
 #import "WriteFeedbackViewController.h"
 #import "MarketSurveyViewController.h"
+#import "ReceiveViewController.h"
+#import "NewTransportViewController.h"
+#import "TransportViewController.h"
+#import "NewTransferViewController.h"
+#import "TransferViewController.h"
 #define ICRFUNCTION_IMG_TOP_PADDING   (25)
 #define ICRFUNCTION_IMG_WIDTH         (65)
 #define ICRFUNCTION_LABEL_HEIGHT      (15)
@@ -220,6 +225,7 @@ static NSString *collectionCellID = @"collectionCell";
 #pragma ICRFunctionBaseViewDelegate
 
 - (void)ICRFunctionBaseView:(ICRFunctionItemControl *)imageView {
+    CLog(@"%ld", (long)imageView.tag);
     switch (imageView.tag) {
         case kFunctionNotice://公告
         {
@@ -230,7 +236,7 @@ static NSString *collectionCellID = @"collectionCell";
         case kFunctionNewSurvey://新建行情
         {
             NewSurveyViewController *svc = [[NewSurveyViewController alloc] init];
-            svc.title = [IBTCommon localizableString:@"AddSurvey"];
+            svc.navTitle = @"新建行情调研";
             [self PushViewController:svc animated:YES];
         }
             break;
@@ -243,6 +249,7 @@ static NSString *collectionCellID = @"collectionCell";
         }
             break;
             
+            
         case  kFunctionFeedBackSurvey:   //填写行情反馈3
         {
             MarketSurveyViewController *marketSurveyVC = [[MarketSurveyViewController alloc] init];
@@ -253,6 +260,28 @@ static NSString *collectionCellID = @"collectionCell";
             [self PushViewController:marketSurveyVC animated:YES];
         }
             break;
+        case kFunctionExaminePurchase://供应商确认采购单
+        {
+            PurchaseViewController *tVC = [[PurchaseViewController alloc] init];
+            tVC.title = @"供应商确认采购单";
+            tVC.assessorVendor = [ICRUserUtil sharedInstance].userId;
+            [self PushViewController:tVC animated:YES];
+        }
+            break;
+        case kFunctionNewShipment://任务管理
+        {
+            NewTransportViewController *tVC = [[NewTransportViewController alloc] init];
+            tVC.title = @"新建发运单";
+            [self PushViewController:tVC animated:YES];
+        }
+            break;
+        case kFunctionSeeShipment://任务管理
+        {
+            TransportViewController *tVC = [[TransportViewController alloc] init];
+            tVC.title = @"发运单";
+            [self PushViewController:tVC animated:YES];
+        }
+            break;
         case kFunctionNewPurchaseNotice://新建采购通知单
         {
             NewPurchaseNoticeViewController *svc = [[NewPurchaseNoticeViewController alloc] init];
@@ -290,11 +319,31 @@ static NSString *collectionCellID = @"collectionCell";
             [self PushViewController:pvc animated:YES];
         }
             break;
+        case kFunctionNewTransfer://新建转运单
+        {
+            NewTransferViewController *tVC = [[NewTransferViewController alloc] init];
+            tVC.title = @"新建转运单";
+            [self PushViewController:tVC animated:YES];
+        }
+            break;
+        case kFunctionSeeTransfer://转运单列表
+        {
+            TransferViewController *tVC = [[TransferViewController alloc] init];
+            tVC.title = @"转运单";
+            [self PushViewController:tVC animated:YES];
+        }
+            break;
         case kFunctionSeeProcessing:{
             GXFListProcessViewController *seeProcessVC= [[GXFListProcessViewController alloc]init];
             [self PushViewController:seeProcessVC animated:YES];
         }
             break;
+        case kFunctionSeeReceive:{
+            ReceiveViewController *tVC = [[ReceiveViewController alloc] init];
+            tVC.title = @"收货单";
+            [self PushViewController:tVC animated:YES];
+        }
+            break;
         default:
             return;
             break;

XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m

@@ -387,7 +387,7 @@ typedef enum : NSUInteger {
     self.lastModifyNameLabel.text = [IBTCommon checkString:self.bill.lastModify_operName];
     NSString *type = [self.bill.type isEqualToString:GXF_Critical] ? @"紧急" : @"普通";
     self.typeLabel.text = type;
-    self.purchaserLabel.text = self.bill.purchaserName;
+    self.purchaserLabel.text = [NSString stringWithFormat:@"%@[%@]",self.bill.purchaserName, self.bill.purchaserCode];
     self.vendorIsSureLabel.text = (self.bill.vendorConfirmTime.length > 0 && self.bill.vendorConfirmTime)? @"是":@"否";
     self.warehouseLabel.text = [IBTCommon checkString:self.bill.receiveWrh_name];
     self.otherPriceLabel.text = [self.bill.charge stringValue];

XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h

@@ -35,6 +35,7 @@
 @property (nonatomic,strong)NSString *lastModify_operName;//最后修改人名称
 @property (nonatomic,strong)NSString *type;//类型
 @property (nonatomic, strong) NSString *purchaserName;//采购员名字
+@property (nonatomic, strong) NSString *purchaserCode;//采购员代码
 
 @property (nonatomic,strong)NSArray  *products;
 @end

XFFruit/ViewControllers/Receiving/Controllers/NewReceiveViewController.m

@@ -43,8 +43,11 @@ typedef enum : NSUInteger {
 @property (nonatomic,strong)UILabel *carhoneLabel;
 @property (nonatomic,strong)UILabel *createOperLabel;
 @property (nonatomic,strong)UILabel *noteLabel;
+@property (nonatomic, strong) UILabel *receiverNameLabel;
+@property (nonatomic, strong) UILabel *receiveTimeLabel;
 @property (nonatomic,strong)NSMutableArray *defalutState;
 @property (nonatomic,strong)NSString *state;
+@property (nonatomic, strong) NSArray *leftArr;
 @end
 
 @implementation NewReceiveViewController
@@ -129,6 +132,8 @@ typedef enum : NSUInteger {
 
     }
     
+    self.receiverNameLabel.text = self.transfer.lastModify_operName;
+    self.receiveTimeLabel.text = self.transfer.lastModify_time;
     self.purchaseLabel.text = [NSString stringWithFormat:@"转运单%@",self.transfer.billnumber];
     self.warehouseLabel.text = [IBTCommon checkString:self.transfer.warehouseName];
     self.rwarehouseLabel.text = [IBTCommon checkString:self.transfer.rwarehouseName];
@@ -151,15 +156,15 @@ typedef enum : NSUInteger {
     noteFrame.size.height = height;
     self.noteLabel.frame = noteFrame;
     
-    CGFloat totalHeight = height + LeftHeight*9;
-        CGRect purchaseFrame = _transportView.frame;
-        purchaseFrame.size.height = totalHeight + LeftMargin;
-        _transportView.frame = purchaseFrame;
+    CGFloat totalHeight = height + LeftHeight*_leftArr.count;
+    CGRect purchaseFrame = _transportView.frame;
+    purchaseFrame.size.height = totalHeight + LeftMargin;
+    _transportView.frame = purchaseFrame;
     
     
-        CGRect bottomFrame = _bottomView.frame;
-        bottomFrame.origin.y = CGRectGetMaxY(_transportView.frame) + TopMargin;
-        _bottomView.frame = bottomFrame;
+    CGRect bottomFrame = _bottomView.frame;
+    bottomFrame.origin.y = CGRectGetMaxY(_transportView.frame) + TopMargin;
+    _bottomView.frame = bottomFrame;
     
     _scrollView.contentSize = CGSizeMake(ScreenSize.width, totalHeight + CGRectGetHeight(_bottomView.frame) + TopMargin*2);
 }
@@ -219,9 +224,26 @@ typedef enum : NSUInteger {
         [self hiddenBottom];
     }
     
-    NSArray *leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"备注"];
+    NSArray *leftArr;
+    
+    if ([self.transfer.state isEqualToString:TRANSFER_STATE_RECEIVED]) {//已收货
+        leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",
+                    @"收货人:",
+                    @"收货时间:",
+                    @"备注"];
+    }else if([self.transfer.state isEqualToString:TRANSFER_STATE_ABORTED]){
+        leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",
+                    @"最后修改人:",
+                    @"备注"];
+    }else{
+        leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",
+                    @"备注"];
+    }
+    
+    _leftArr = leftArr;
     
     _transportView= [[UIView alloc]initWithFrame:CGRectMake(0, TopMargin, ScreenSize.width, LeftHeight*leftArr.count +LeftMargin)];
+    NSLog(@">>>>>>>>>>>>>>>>>>>>>>>>>>%f", _transportView.frame.size.height);
     _transportView.backgroundColor = [UIColor whiteColor];
     [_scrollView addSubview:_transportView];
     
@@ -253,7 +275,13 @@ typedef enum : NSUInteger {
             self.carhoneLabel = rightLabel;
         }else if(i == 7){
             self.createOperLabel = rightLabel;
-        }else if(i == leftArr.count - 1){
+        }
+        else if(i == 8){
+            self.receiverNameLabel = rightLabel;
+        }else if (i == 9){
+            self.receiveTimeLabel = rightLabel;
+        }
+        else if(i == leftArr.count - 1){
             rightLabel.numberOfLines = 0;
             self.noteLabel = rightLabel;
         }
@@ -262,7 +290,7 @@ typedef enum : NSUInteger {
     [self createBottomView];
 }
 - (void)createBottomView{
-    _bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_transportView.frame) + TopMargin, ScreenSize.width, 300)];
+    _bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, _transportView.bottom + TopMargin, ScreenSize.width, 300)];
     _bottomView.backgroundColor = [UIColor whiteColor];
     
     [_scrollView addSubview:_bottomView];
@@ -272,6 +300,8 @@ typedef enum : NSUInteger {
     _pvc.isHiddenAdd = YES;
     _pvc.isHiddenEdit = self.isNotShowEdit;
     [_bottomView addSubview:_pvc.view];
+    
+    NSLog(@">>>>>>>>>>>>>>>>>>>>>>>>>>%f", _transportView.bottom);
 }
 
 

XFFruit/ViewControllers/Transfer/Models/Transfer.h

@@ -32,6 +32,9 @@
 @property (nonatomic,strong)NSString *arriveDate;//新增预计到达时
 @property (nonatomic,strong)NSArray *pdtDetails;//商品
 @property (nonatomic,strong)NSArray *accountDetails;//费用
+@property (nonatomic,strong)NSString *lastModify_time;//最后修改时间
+@property (nonatomic,strong)NSString *lastModify_id;	//最后修改人代码
+@property (nonatomic,strong)NSString *lastModify_operName;//最后修改人名称
 
 
 @end