发运单详情界面增加字段创建人、创建时间、审核人、审核时间、收货人、收货时间、有效期

XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m

@@ -60,13 +60,33 @@ typedef enum : NSUInteger {
 @property (nonatomic,strong)UILabel *otherPriceLabel;
 @property (nonatomic,strong)UILabel *totalPriceLabel;
 @property (nonatomic,strong)UILabel *noteLabel;
-
+/**
+ *  创建时间
+ */
 @property (strong, nonatomic) UILabel *labelCreateTime;
+/**
+ *  审核人
+ */
 @property (strong, nonatomic) UILabel *labelInspector;
+/**
+ *  审核时间
+ */
 @property (strong, nonatomic) UILabel *labelInspectTime;
+/**
+ *  收货人
+ */
 @property (strong, nonatomic) UILabel *labelReciever;
+/**
+ *  收货时间
+ */
 @property (strong, nonatomic) UILabel *labelRecieveTime;
+/**
+ *  有效期
+ */
 @property (strong, nonatomic) UILabel *labelExpiredDate;
+/**
+ *  外部单据号
+ */
 @property (strong, nonatomic) UILabel *labelOutSideNum;
 @property (nonatomic,assign)BOOL isNotShowEdit;
 //@property (nonatomic,strong)RejectView *rejectView;

XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m

@@ -15,6 +15,7 @@
 #import "FeeAcountDetail.h"
 #import "TransportViewController.h"
 #import "ShopDetaileViewController.h"
+#import "PurchaseBill.h"
 typedef enum : NSUInteger {
     SaveTag = 7000,
     CommitTag,
@@ -36,6 +37,10 @@ typedef enum : NSUInteger {
     
 }
 @property (nonatomic,strong)NSString *state;
+/**
+ *  用户选择的第一个商品的采购单
+ */
+@property (strong, nonatomic) PurchaseBill *firstBill;
 @end
 
 @implementation NewTransportViewController
@@ -203,7 +208,6 @@ typedef enum : NSUInteger {
     for (FeeAcountDetail *fee in _bottomView.costVC.costArr) {
         [costs  addObject:[fee dictForCommit]];
     }
-//    self.state = state;
     
     NSDictionary *dict = @{@"uuid":uuidObject,
                            @"version":versionObject,
@@ -289,15 +293,37 @@ typedef enum : NSUInteger {
     return YES;
 }
 
+- (void)setFirstBill:(PurchaseBill *)firstBill {
+    _firstBill = firstBill;
+    /**
+     *  @property (nonatomic,strong)NSString *receiveWrh_uuid;//收货uuid
+     @property (nonatomic,strong)NSString *receiveWrh_code;//收货代码
+     @property (nonatomic,strong)NSString *receiveWrh_name;//收货姓名
+     *
+     */
+    _sheetView.warehouseCode = firstBill.receiveWrh_code;
+    _sheetView.warehouseName = firstBill.receiveWrh_name;
+    _sheetView.warehouseUuid = firstBill.receiveWrh_uuid;
+    _sheetView.warehouseLabel.text = [NSString stringWithFormat:@"%@[%@]",_sheetView.warehouseName,_sheetView.warehouseCode];
+    _sheetView.warehouseLabel.textColor = GXF_CONTENT_COLOR;
+}
 
 
 - (void)choseTransportPurchase{
+    __weak NewTransportViewController *weakSelf = self;
     TransportPurchaseViewController *tpv = [TransportPurchaseViewController new];
     tpv.getProchaseProduct = ^(NSArray *products){
         if (products.count > 0) {
             [_bottomView reProduct:products];
         }
     };
+    
+    tpv.blockFirstWarehouse = ^(NSArray *bills){
+        if (bills.count > 0) {
+            weakSelf.firstBill = bills[0];
+        }
+    };
+    
     [self PushViewController:tpv animated:YES];
 }
 - (void)addTransportCost:(NSNotification *)fination{

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.h

@@ -13,4 +13,5 @@ typedef void(^GetPurchaseProduct)(NSArray *products);
 @interface TransportPurchaseViewController : ICRBaseViewController
 @property (nonatomic,copy)GetPurchaseProduct getProchaseProduct;
 
+@property (nonatomic,copy)GetPurchaseProduct blockFirstWarehouse;
 @end

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m

@@ -293,6 +293,14 @@ NSInteger purchaseStockCheckNumber = 0;
                     [arr addObject:detail];
                 }
                 weakSelf.getProchaseProduct(arr);
+                for (PurchaseBill *bill in self.dataArr) {
+                    if ([array containsObject:bill.billNumber]) {
+                        if (weakSelf.blockFirstWarehouse) {
+                            weakSelf.blockFirstWarehouse(@[bill]);
+                        }
+                        break;
+                    }
+                }
             }
     }];
     

XFFruit/ViewControllers/Transport/Models/Transport.h

@@ -35,6 +35,23 @@
 
 @property (nonatomic,strong)NSArray *pdtDetails;//商品
 @property (nonatomic,strong)NSArray *accountDetails;//费用
+@property (nonatomic, strong) NSString *approv_time;//审核时间
+@property (nonatomic, strong) NSString *approv_id;//审核人id
+@property (nonatomic, strong) NSString *approv_operName;//审核人
+/*
+ receive_time
+ 收货时间
+ receive_id
+ 收货人代码
+ receive_operName
+ 收货人名称
+ expiredDate
+ 到效日期
  
+ */
+@property (strong, nonatomic) NSString *receive_time;
+@property (strong, nonatomic) NSString *receive_id;
+@property (strong, nonatomic) NSString *receive_operName;
+@property (strong, nonatomic) NSString *expiredDate;
 
 @end

XFFruit/ViewControllers/Transport/Views/TopTransportView.m

@@ -124,6 +124,9 @@
         }else if(indexPath.row == 2){
             contentLabel.text = @"选择类型";
             self.typeLabel = contentLabel;
+            self.typeLabel.text = @"普通";
+            self.typeLabel.textColor = GXF_CONTENT_COLOR;
+            self.type = GXF_Normal;
             
         }else if(indexPath.row == 5){
             contentLabel.text = @"选择预计到货时间";