按照商品模糊查询采购单|转运单|发运单

XFFruit/Controllers/AppViewController/ICRAppViewControllerManager.m

@@ -133,7 +133,7 @@
     [self createSyncViewController];
     [self createSystemViewController];
     
-    
+
     if (!m_tabbarController) {
         m_tabbarController = [[IBTTabBarController alloc] init];
         m_tabbarController.delegate = self;

XFFruit/ViewControllers/Purchase/Controllers/PurchaseViewController.m

@@ -48,6 +48,8 @@ typedef enum : NSUInteger {
 @property (nonatomic,strong)NSString *vendorLike;
 @property (nonatomic,strong)NSString *state;
 @property (nonatomic,strong)NSString *billLike;
+@property (nonatomic,strong)NSString *productLike;
+
 @property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序)
 @end
 
@@ -119,6 +121,10 @@ typedef enum : NSUInteger {
     if (self.vendorLike.length > 0) {
         vendorObject = self.vendorLike;
     }
+    id productObject = [NSNull null];
+    if (self.productLike.length > 0) {
+        productObject = self.productLike;
+    }
     if (orderArr.count == 0) {
         QueryOrder *order = [QueryOrder new];
         order.field = @"billNumber";
@@ -128,6 +134,7 @@ typedef enum : NSUInteger {
     }
     NSDictionary *dict = @{
                            @"billNumberLike":billObject,
+                           @"productLike":productObject,
                            @"state":stateObject,
                            @"titleLike":titleObject,
                            @"vendorUuid":vendorObject,
@@ -263,7 +270,7 @@ typedef enum : NSUInteger {
         }else{
             [btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
             if (_boltView == nil) {
-                _boltView = [[PurchaseBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state billNumber:self.billLike titleStr:self.titleLike vendorNumber:self.vendorLike];
+                _boltView = [[PurchaseBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state billNumber:self.billLike titleStr:self.titleLike vendorNumber:self.vendorLike productNumber:self.productLike];
                 
                 _boltView.backgroundColor = XXFBgColor;
                 _boltView.delegate = self;
@@ -330,7 +337,7 @@ typedef enum : NSUInteger {
     }
 }
 - (void)checkBoltBtnColor{
-    if (self.state.length > 0 || self.titleLike.length > 0 || self.billLike.length > 0 || self.vendorLike.length > 0) {
+    if (self.state.length > 0 || self.titleLike.length > 0 || self.billLike.length > 0 || self.vendorLike.length > 0 || self.productLike.length > 0) {
         [_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
     }else{
         [_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal];
@@ -343,7 +350,7 @@ typedef enum : NSUInteger {
     [_boltView.titleFiled resignFirstResponder];
     [_boltView.billFiled resignFirstResponder];
     [_boltView.vendorFiled resignFirstResponder];
-    
+    [_boltView.productFiled resignFirstResponder];
     _currentPage = 0;
     
     //请求
@@ -382,6 +389,10 @@ typedef enum : NSUInteger {
     self.vendorLike = vendorLike;
     CLog(@"%@",vendorLike);
 }
+- (void)getproductLike:(NSString *)productLike{
+    self.productLike = productLike;
+    CLog(@"%@",productLike);
+}
 - (void)clearBoltInformation{
     //清空所有条件
     if (self.billLike.length > 0) {
@@ -396,6 +407,9 @@ typedef enum : NSUInteger {
     if (self.vendorLike.length > 0) {
         self.vendorLike = @"";
     }
+    if (self.productLike.length > 0) {
+        self.productLike = @"";
+    }
 }
 
 #pragma mark - 协议方法

XFFruit/ViewControllers/Purchase/Views/PurchaseBoltView.h

@@ -13,6 +13,7 @@
 - (void)getbillLike:(NSString *)billLike;
 - (void)gettitleLike:(NSString *)titleLike;
 - (void)getvendorLike:(NSString *)vendorLike;
+- (void)getproductLike:(NSString *)productLike;
 
 - (void)clearBoltInformation;
 @end
@@ -25,6 +26,8 @@
 @property (nonatomic,strong)UITextField *billFiled;//采购单号类似于
 @property (nonatomic,strong)UITextField *titleFiled;//通知单号类似于
 @property (nonatomic,strong)UITextField *vendorFiled;//供应商uuid类似于
+@property (nonatomic,strong)UITextField *productFiled;//商品单号类似于
 
-- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state billNumber:(NSString *)billNumber titleStr:(NSString *)titleStr vendorNumber:(NSString *)vendorNumber;
+
+- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state billNumber:(NSString *)billNumber titleStr:(NSString *)titleStr vendorNumber:(NSString *)vendorNumber productNumber:(NSString *)productNumber;
 @end

XFFruit/ViewControllers/Purchase/Views/PurchaseBoltView.m

@@ -25,18 +25,21 @@
 @property (nonatomic,strong)NSString *vendorNumber;
 
 @property (nonatomic,strong)NSString *billNumber;
+@property (nonatomic,strong)NSString *productNumber;
+
 
 @end
 
 @implementation PurchaseBoltView
 
-- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state billNumber:(NSString *)billNumber titleStr:(NSString *)titleStr vendorNumber:(NSString *)vendorNumber{
+- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state billNumber:(NSString *)billNumber titleStr:(NSString *)titleStr vendorNumber:(NSString *)vendorNumber productNumber:(NSString *)productNumber{
     self = [super initWithFrame:frame];
     if (self) {
         self.billNumber = billNumber;
         self.titleStr = titleStr;
         self.vendorNumber = vendorNumber;
         self.state = state;
+        self.productNumber = productNumber;
         [self createView];
         [self createRightView];
         [self preferData];
@@ -70,6 +73,10 @@
     if (self.vendorNumber.length > 0) {
         self.vendorFiled.text = self.vendorNumber;
     }
+    self.productFiled.hidden = YES;
+    if (self.productNumber.length > 0) {
+        self.productFiled.text = self.productNumber;
+    }
 }
 
 #pragma mark - 创建视图
@@ -77,7 +84,7 @@
 {
     _leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)];
     [self addSubview:_leftView];
-    NSArray *arr = @[@"按状态",@"采购单号",@"标题",@"供应商Uuid"];
+    NSArray *arr = @[@"按状态",@"采购单号",@"标题",@"供应商Uuid",@"商品单号"];
     for (NSInteger i = 0; i<arr.count; i++) {
         UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
         button.frame = CGRectMake(0, LeftHeight * i ,  LeftMargin ,LeftHeight);
@@ -102,7 +109,7 @@
     [self addSubview:_clearBtn];
 }
 - (void)createRightView{
-    NSArray *arr = @[@"输入类似采购单号",@"输入类似标题",@"输入类似供应商Uuid"];
+    NSArray *arr = @[@"输入类似采购单号",@"输入类似标题",@"输入类似供应商Uuid",@"输入类似商品单号"];
     UIView *contentView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)];
     contentView.backgroundColor = [UIColor whiteColor];
     [self addSubview:contentView];
@@ -128,6 +135,8 @@
             _titleFiled = contentField;
         }else if(i == 2){
             _vendorFiled = contentField;
+        }else if (i == 3){
+            _productFiled = contentField;
         }
     }
     self.tableView = [[UITableView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight) style:(UITableViewStylePlain)];
@@ -151,6 +160,7 @@
             _billFiled.hidden = YES;
             _titleFiled.hidden = YES;
             _vendorFiled.hidden = YES;
+            _productFiled.hidden = YES;
         }
             break;
         case 1002://条件二
@@ -159,6 +169,7 @@
             _billFiled.hidden = NO;
             _titleFiled.hidden = YES;
             _vendorFiled.hidden = YES;
+            _productFiled.hidden = YES;
         }
             break;
         case 1003://条件三
@@ -167,6 +178,7 @@
             _billFiled.hidden = YES;
             _titleFiled.hidden = NO;
             _vendorFiled.hidden = YES;
+            _productFiled.hidden = YES;
         }
             break;
         case 1004://条件四
@@ -175,6 +187,16 @@
             _billFiled.hidden = YES;
             _titleFiled.hidden = YES;
             _vendorFiled.hidden = NO;
+            _productFiled.hidden = YES;
+        }
+            break;
+        case 1005://条件五
+        {
+            self.tableView.hidden = YES;
+            _billFiled.hidden = YES;
+            _titleFiled.hidden = YES;
+            _vendorFiled.hidden = YES;
+            _productFiled.hidden = NO;
         }
             break;
         default:
@@ -192,6 +214,9 @@
     if (_vendorFiled.text.length > 0) {
         _vendorFiled.text = @"";
     }
+    if (_productFiled.text.length > 0) {
+        _productFiled.text = @"";
+    }
     if (_currentIndexPath) {
         _currentIndexPath = nil;
         [self.tableView reloadData];
@@ -273,6 +298,7 @@
     [self.billFiled resignFirstResponder];
     [self.titleFiled resignFirstResponder];
     [self.vendorFiled resignFirstResponder];
+    [self.productFiled resignFirstResponder];
 }
 
 - (void)textFieldDidEndEditing:(UITextField *)textField{
@@ -288,6 +314,10 @@
 //        if (self.vendorFiled.text.length > 0) {
             [self.delegate getvendorLike:self.vendorFiled.text];
 //        }
+    }else if(textField == self.productFiled){
+        //        if (self.vendorFiled.text.length > 0) {
+        [self.delegate getproductLike:self.productFiled.text];
+        //        }
     }
 }
 

XFFruit/ViewControllers/Transfer/Controllers/ChooseTransferViewController.m

@@ -82,7 +82,7 @@
     }
     NSDictionary *dict = @{
                            @"state":TRANSFER_STATE_RECEIVED,
-                           @"billNumberLike":billNumberObject,
+                           @"billNumberProductLike":billNumberObject,
                            @"queryOrders":orderArr,
                            @"userUuid":userUtil.userId,
                            @"pageNumber":@(_currentPage),
@@ -155,7 +155,7 @@
     self.selectTextFiled.textAlignment = NSTextAlignmentLeft;
     self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"];
     self.selectTextFiled.delegate = self;
-    self.selectTextFiled.placeholder = @"输入类似转运单号";
+    self.selectTextFiled.placeholder = @"类似转运和商品单号";
     self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE;
     [self.view addSubview:self.selectTextFiled];
     

XFFruit/ViewControllers/Transfer/Controllers/ChooseTransportViewController.m

@@ -84,7 +84,7 @@
     NSDictionary *dict = @{
                            @"state":TRANSPORT_STATE_RECEIVED,
                            @"userUuid":userUtil.userId,
-                           @"billNumberLike":billNumberObject,
+                           @"billNumberProductLike":billNumberObject,
                            @"queryOrders":orderArr,
                            @"fetchParts":@"pdtDetails",
                            @"pageNumber":@(_currentPage),
@@ -157,7 +157,7 @@
     self.selectTextFiled.textAlignment = NSTextAlignmentLeft;
     self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"];
     self.selectTextFiled.delegate = self;
-    self.selectTextFiled.placeholder = @"输入类似发运单号";
+    self.selectTextFiled.placeholder = @"类似发运和商品单号";
     self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE;
     [self.view addSubview:self.selectTextFiled];
     

XFFruit/ViewControllers/Transfer/Controllers/TransferViewController.m

@@ -47,6 +47,8 @@ typedef enum : NSUInteger {
 @property (nonatomic,strong)NSString *billLike;
 @property (nonatomic,strong)NSString *state;
 @property (nonatomic,strong)NSString *userLike;
+@property (nonatomic,strong)NSString *productLike;
+
 @property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序)
 @end
 
@@ -89,6 +91,10 @@ typedef enum : NSUInteger {
     if (self.userLike.length > 0) {
         userObject = self.userLike;
     }
+    id productObject = [NSNull null];
+    if (self.productLike.length > 0) {
+        productObject = self.productLike;
+    }
     id stateObject = [NSNull null];
     if (self.state.length > 0 && ![self.state isEqualToString:@"none"]) {
         stateObject = self.state;
@@ -120,6 +126,7 @@ typedef enum : NSUInteger {
     NSDictionary *dict = @{
                            @"state":stateObject,
                            @"billNumberLike":billObject,
+                           @"productLike":productObject,
                            @"creator":userObject,
                            @"queryOrders":orderArr,
                            @"userUuid":userUtil.userId,
@@ -253,7 +260,7 @@ typedef enum : NSUInteger {
         }else{
             [btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
             if (_boltView == nil) {
-                _boltView = [[TransferBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state userNumber:self.userLike billNumber:self.billLike];
+                _boltView = [[TransferBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state userNumber:self.userLike billNumber:self.billLike productNumber:self.productLike];
                 
                 _boltView.backgroundColor = XXFBgColor;
                 _boltView.delegate = self;
@@ -320,7 +327,7 @@ typedef enum : NSUInteger {
     }
 }
 - (void)checkBoltBtnColor{
-    if (self.state.length > 0 || self.billLike.length > 0 || self.userLike.length > 0) {
+    if (self.state.length > 0 || self.billLike.length > 0 || self.userLike.length > 0  || self.productLike.length > 0) {
         [_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
     }else{
         [_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal];
@@ -333,6 +340,7 @@ typedef enum : NSUInteger {
     
     [_boltView.userFiled resignFirstResponder];
     [_boltView.billFiled resignFirstResponder];
+    [_boltView.productField resignFirstResponder];
     _currentPage = 0;
     
     //请求
@@ -367,6 +375,11 @@ typedef enum : NSUInteger {
     self.billLike = billLike;
     CLog(@"%@",billLike);
 }
+
+- (void)getproductLike:(NSString *)productLike{
+    self.productLike = productLike;
+    CLog(@"%@",productLike);
+}
 - (void)clearBoltInformation{
     //清空所有条件
     if (self.userLike.length > 0) {
@@ -378,6 +391,9 @@ typedef enum : NSUInteger {
     if (self.state.length > 0) {
         self.state = @"";
     }
+    if (self.productLike.length > 0) {
+        self.productLike = @"";
+    }
 }
 
 #pragma mark - 协议方法

XFFruit/ViewControllers/Transfer/Views/TransferBoltView.h

@@ -11,6 +11,8 @@
 - (void)getBoltValueSelectRow:(NSString *)state;
 - (void)getuserLike:(NSString *)userLike;
 - (void)getbillLike:(NSString *)billLike;
+- (void)getproductLike:(NSString *)productLike;
+
 - (void)clearBoltInformation;
 @end
 
@@ -22,6 +24,8 @@
 @property (nonatomic,strong)UITextField *userFiled;//采购单号类似于
 @property (nonatomic,strong)UITextField *billFiled;//通知单号类似于
 @property (nonatomic,strong)UITextField *creatorField;//供应商uuid类似于
+@property (nonatomic,strong)UITextField *productField;//商品类似于
+
 
-- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber;
+- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber productNumber:(NSString *)productNumber;
 @end

XFFruit/ViewControllers/Transfer/Views/TransferBoltView.m

@@ -28,17 +28,19 @@
 @property (nonatomic,strong)NSString *state;
 @property (nonatomic,strong)NSString *billNumber;
 @property (nonatomic,strong)NSString *userNumber;
+@property (nonatomic,strong)NSString *productNumber;
 
 @end
 
 @implementation TransferBoltView
 
-- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber{
+- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber productNumber:(NSString *)productNumber{
     self = [super initWithFrame:frame];
     if (self) {
         self.userNumber = userNumber;
         self.billNumber = billNumber;
         self.state = state;
+        self.productNumber = productNumber;
         [self createView];
         [self createRightView];
         [self preferData];
@@ -63,6 +65,10 @@
     if (self.billNumber.length > 0) {
         self.billFiled.text = self.billNumber;
     }
+    self.productField.hidden = YES;
+    if (self.productNumber.length > 0) {
+        self.productField.text = self.productNumber;
+    }
 }
 
 #pragma mark - 创建视图
@@ -70,7 +76,7 @@
 {
     _leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)];
     [self addSubview:_leftView];
-    NSArray *arr = @[@"按状态",@"创建人代码",@"调研单号"];
+    NSArray *arr = @[@"按状态",@"创建人代码",@"调研单号",@"商品单号"];
     for (NSInteger i = 0; i<arr.count; i++) {
         UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
         button.frame = CGRectMake(0, LeftHeight * i ,  LeftMargin ,LeftHeight);
@@ -97,7 +103,7 @@
 - (void)createRightView{
     
     
-    NSArray *arr = @[@"输入类似创建人代码",@"输入类似调研单号"];
+    NSArray *arr = @[@"输入类似创建人代码",@"输入类似调研单号",@"输入类似商品单号"];
     UIView *contentView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)];
     contentView.backgroundColor = [UIColor whiteColor];
     [self addSubview:contentView];
@@ -121,6 +127,8 @@
             self.userFiled = contentField;
         }else if(i == 1){
             self.billFiled = contentField;
+        }else if(i == 2){
+            self.productField = contentField;
         }
     }
     
@@ -144,6 +152,7 @@
             self.tableView.hidden = NO;
             self.userFiled.hidden = YES;
             self.billFiled.hidden = YES;
+            self.productField.hidden = YES;
         }
             break;
         case 1002://条件二
@@ -151,6 +160,8 @@
             self.tableView.hidden = YES;
             self.userFiled.hidden = NO;
             self.billFiled.hidden = YES;
+            self.productField.hidden = YES;
+
         }
             break;
         case 1003://条件三
@@ -158,6 +169,17 @@
             self.tableView.hidden = YES;
             self.userFiled.hidden = YES;
             self.billFiled.hidden = NO;
+            self.productField.hidden = YES;
+
+        }
+            break;
+        case 1004://条件三
+        {
+            self.tableView.hidden = YES;
+            self.userFiled.hidden = YES;
+            self.billFiled.hidden = YES;
+            self.productField.hidden = NO;
+            
         }
             break;
         default:
@@ -172,6 +194,9 @@
     if (_userFiled.text.length > 0) {
         _userFiled.text = @"";
     }
+    if (_productField.text.length > 0) {
+        _productField.text = @"";
+    }
     if (_currentIndexPath) {
         _currentIndexPath = nil;
         [self.tableView reloadData];
@@ -248,6 +273,7 @@
 - (void)keyBoardHidden{
     [self.userFiled resignFirstResponder];
     [self.billFiled resignFirstResponder];
+    [self.productField resignFirstResponder];
 }
 
 - (void)textFieldDidEndEditing:(UITextField *)textField{
@@ -259,6 +285,10 @@
         //        if (self.billFiled.text.length > 0) {
         [self.delegate getbillLike:self.billFiled.text];
         //        }
+    }else if(textField == self.productField){
+        //        if (self.billFiled.text.length > 0) {
+        [self.delegate getproductLike:self.productField.text];
+        //        }
     }
 }
 

XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.m

@@ -58,12 +58,12 @@
     headCell.delegate = self;
     self.tableView.tableHeaderView = headCell;
     
-    if (!self.isHiddenEdit) {
-        FooterCell *footCell = [[FooterCell alloc]initWithFrame:CGRectMake(0, 0, _tableFrame.size.width, 50) withTitle:@"+点击添加商品明细" isTwo:self.twoTitle];
-        [self.view addSubview:footCell];
-        footCell.delegate = self;
-        self.tableView.tableFooterView = footCell;
-    }
+//    if (!self.isHiddenEdit) {
+//        FooterCell *footCell = [[FooterCell alloc]initWithFrame:CGRectMake(0, 0, _tableFrame.size.width, 50) withTitle:@"+点击添加商品明细" isTwo:self.twoTitle];
+//        [self.view addSubview:footCell];
+//        footCell.delegate = self;
+//        self.tableView.tableFooterView = footCell;
+//    }
 }
 
 #pragma mark - headCellDelegate

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m

@@ -81,9 +81,9 @@
     }
     NSDictionary *dict = @{
                            @"state":@"shipping",
-                           @"billNumberLike":billNumberObject,
                            @"queryOrders":orderArr,
                            @"userUuid":userUtil.userId,
+                           @"billNumberProductLike":billNumberObject,
                            @"fetchParts":@"products",
                            @"pageNumber":@(_currentPage),
                            @"pageSize":@(20)};
@@ -163,7 +163,7 @@
     self.selectTextFiled.textAlignment = NSTextAlignmentLeft;
     self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"];
     self.selectTextFiled.delegate = self;
-    self.selectTextFiled.placeholder = @"输入类似采购单号";
+    self.selectTextFiled.placeholder = @"类似采购和商品单号";
     self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE;
     [self.view addSubview:self.selectTextFiled];
     

XFFruit/ViewControllers/Transport/Controllers/TransportViewController.m

@@ -48,6 +48,8 @@ typedef enum : NSUInteger {
 @property (nonatomic,strong)NSString *billLike;
 @property (nonatomic,strong)NSString *state;
 @property (nonatomic,strong)NSString *userLike;
+@property (nonatomic,strong)NSString *productLike;
+
 @property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序)
 @end
 
@@ -90,6 +92,10 @@ typedef enum : NSUInteger {
     if (self.userLike.length > 0) {
         userObject = self.userLike;
     }
+    id productObject = [NSNull null];
+    if (self.productLike.length > 0) {
+        productObject = self.productLike;
+    }
     id stateObject = [NSNull null];
     if (self.state.length > 0 && ![self.state isEqualToString:@"none"]) {
         stateObject = self.state;
@@ -121,6 +127,7 @@ typedef enum : NSUInteger {
     NSDictionary *dict = @{
                            @"state":stateObject,
                            @"billNumberLike":billObject,
+                           @"productLike":productObject,
                            @"creator":userObject,
                            @"queryOrders":orderArr,
                            @"userUuid":userUtil.userId,
@@ -254,7 +261,7 @@ typedef enum : NSUInteger {
         }else{
             [btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
             if (_boltView == nil) {
-                _boltView = [[TransportBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state userNumber:self.userLike billNumber:self.billLike];
+                _boltView = [[TransportBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state userNumber:self.userLike billNumber:self.billLike productNumber:self.productLike];
                 
                 _boltView.backgroundColor = XXFBgColor;
                 _boltView.delegate = self;
@@ -321,7 +328,7 @@ typedef enum : NSUInteger {
     }
 }
 - (void)checkBoltBtnColor{
-    if (self.state.length > 0 || self.billLike.length > 0 || self.userLike.length > 0) {
+    if (self.state.length > 0 || self.billLike.length > 0 || self.userLike.length > 0 || self.productLike.length > 0) {
         [_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
     }else{
         [_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal];
@@ -334,6 +341,7 @@ typedef enum : NSUInteger {
     
     [_boltView.userFiled resignFirstResponder];
     [_boltView.billFiled resignFirstResponder];
+    [_boltView.productField resignFirstResponder];
     _currentPage = 0;
     
     //请求
@@ -368,6 +376,10 @@ typedef enum : NSUInteger {
     self.billLike = billLike;
     CLog(@"%@",billLike);
 }
+- (void)getproductLike:(NSString *)productLike{
+    self.productLike = productLike;
+    CLog(@"%@",productLike);
+}
 - (void)clearBoltInformation{
     //清空所有条件
     if (self.userLike.length > 0) {
@@ -379,6 +391,9 @@ typedef enum : NSUInteger {
     if (self.state.length > 0) {
         self.state = @"";
     }
+    if (self.productLike.length > 0) {
+        self.productLike = @"";
+    }
 }
 
 #pragma mark - 协议方法

XFFruit/ViewControllers/Transport/Views/TransportBoltView.h

@@ -11,6 +11,8 @@
 - (void)getBoltValueSelectRow:(NSString *)state;
 - (void)getuserLike:(NSString *)userLike;
 - (void)getbillLike:(NSString *)billLike;
+- (void)getproductLike:(NSString *)productLike;
+
 - (void)clearBoltInformation;
 @end
 
@@ -22,6 +24,7 @@
 @property (nonatomic,strong)UITextField *userFiled;//采购单号类似于
 @property (nonatomic,strong)UITextField *billFiled;//通知单号类似于
 @property (nonatomic,strong)UITextField *creatorField;//供应商uuid类似于
+@property (nonatomic,strong)UITextField *productField;//商品类似于
 
-- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber;
+- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber productNumber:(NSString *)productNumber;
 @end

XFFruit/ViewControllers/Transport/Views/TransportBoltView.m

@@ -27,17 +27,19 @@
 @property (nonatomic,strong)NSString *state;
 @property (nonatomic,strong)NSString *billNumber;
 @property (nonatomic,strong)NSString *userNumber;
+@property (nonatomic,strong)NSString *productNumber;
 
 @end
 
 @implementation TransportBoltView
 
-- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber{
+- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber productNumber:(NSString *)productNumber{
     self = [super initWithFrame:frame];
     if (self) {
         self.userNumber = userNumber;
         self.billNumber = billNumber;
         self.state = state;
+        self.productNumber = productNumber;
         [self createView];
         [self createRightView];
         [self preferData];
@@ -62,6 +64,10 @@
     if (self.billNumber.length > 0) {
         self.billFiled.text = self.billNumber;
     }
+    self.productField.hidden = YES;
+    if (self.productNumber.length > 0) {
+        self.productField.text = self.productNumber;
+    }
 }
 
 #pragma mark - 创建视图
@@ -69,7 +75,7 @@
 {
     _leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)];
     [self addSubview:_leftView];
-    NSArray *arr = @[@"按状态",@"创建人代码",@"调研单号"];
+    NSArray *arr = @[@"按状态",@"创建人代码",@"调研单号",@"商品单号"];
     for (NSInteger i = 0; i<arr.count; i++) {
         UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
         button.frame = CGRectMake(0, LeftHeight * i ,  LeftMargin ,LeftHeight);
@@ -96,7 +102,7 @@
 - (void)createRightView{
     
     
-    NSArray *arr = @[@"输入类似创建人代码",@"输入类似调研单号"];
+    NSArray *arr = @[@"输入类似创建人代码",@"输入类似调研单号",@"输入类似商品单号"];
     UIView *contentView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)];
     contentView.backgroundColor = [UIColor whiteColor];
     [self addSubview:contentView];
@@ -120,6 +126,8 @@
             self.userFiled = contentField;
         }else if(i == 1){
             self.billFiled = contentField;
+        }else if(i == 2){
+            self.productField = contentField;
         }
     }
 
@@ -143,6 +151,7 @@
             self.tableView.hidden = NO;
             self.userFiled.hidden = YES;
             self.billFiled.hidden = YES;
+            self.productField.hidden = YES;
         }
             break;
         case 1002://条件二
@@ -150,6 +159,7 @@
             self.tableView.hidden = YES;
             self.userFiled.hidden = NO;
             self.billFiled.hidden = YES;
+            self.productField.hidden = YES;
         }
             break;
         case 1003://条件三
@@ -157,6 +167,15 @@
             self.tableView.hidden = YES;
             self.userFiled.hidden = YES;
             self.billFiled.hidden = NO;
+            self.productField.hidden = YES;
+        }
+            break;
+        case 1004://条件四
+        {
+            self.tableView.hidden = YES;
+            self.userFiled.hidden = YES;
+            self.billFiled.hidden = YES;
+            self.productField.hidden = NO;
         }
             break;
         default:
@@ -171,6 +190,9 @@
     if (_userFiled.text.length > 0) {
         _userFiled.text = @"";
     }
+    if (_productField.text.length > 0) {
+        _productField.text = @"";
+    }
     if (_currentIndexPath) {
         _currentIndexPath = nil;
         [self.tableView reloadData];
@@ -247,6 +269,7 @@
 - (void)keyBoardHidden{
     [self.userFiled resignFirstResponder];
     [self.billFiled resignFirstResponder];
+    [self.productField resignFirstResponder];
 }
 
 - (void)textFieldDidEndEditing:(UITextField *)textField{
@@ -258,6 +281,10 @@
 //        if (self.billFiled.text.length > 0) {
             [self.delegate getbillLike:self.billFiled.text];
 //        }
+    }else if(textField == self.productField){
+        //        if (self.billFiled.text.length > 0) {
+        [self.delegate getproductLike:self.productField.text];
+        //        }
     }
 }