bug fix

XFFruit/ViewControllers/Login/ICRLoginViewController.m

@@ -119,7 +119,12 @@
     label.text = [NSString stringWithFormat:@"上海海鼎信息工程股份有限公司  V%@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]];
     [self.view addSubview:label];
 #else
-    
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, ScreenSize.height - 34, ScreenSize.width, 20)];
+    label.textColor = [UIColor whiteColor];
+    label.font = [UIFont systemFontOfSize:15];
+    label.textAlignment = NSTextAlignmentCenter;
+    label.text = [NSString stringWithFormat:@"V%@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]];
+    [self.view addSubview:label];
 #endif
 }
 

XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m

@@ -357,13 +357,13 @@ typedef enum : NSUInteger {
             NSString *message = data[@"message"];
             if (success == 1) {
                 //是wms且非产品中心仓，审核时同时收货
-                if (self.isWms && self.isCenter == NO && [action isEqualToString:PURCHASE_ACTION_APPROVE]) {
-                    [self getDataFromServer];
-                }else{
+//                if (self.isWms && self.isCenter == NO && [action isEqualToString:PURCHASE_ACTION_APPROVE]) {
+//                    [self getDataFromServer];
+//                }else{
                 
                     [ICRUserUtil sharedInstance].needFresh = YES;
                     [self PopViewControllerAnimated:YES];
-                }
+//                }
             }else{
                 [IBTLoadingView showTips:message];
             }
@@ -556,10 +556,10 @@ typedef enum : NSUInteger {
         _pvc.productArr = productArr;
         [_pvc.tableView reloadData];
         
-        //如果是wms，非中心仓，则审核完加载详情的时候自动收货
-        if (self.isWms && self.isCenter == NO && [self.bill.state isEqualToString:PURCHASE_STATE_WAITE_RECIEVE]) {
-            [self httpRecieve];
-        }
+//        //如果是wms，非中心仓，则审核完加载详情的时候自动收货
+//        if (self.isWms && self.isCenter == NO && [self.bill.state isEqualToString:PURCHASE_STATE_WAITE_RECIEVE]) {
+//            [self httpRecieve];
+//        }
         
     }else{
         
@@ -609,6 +609,10 @@ typedef enum : NSUInteger {
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{
     if (alertView.tag == CancleTag) {
         if (buttonIndex == 1) {
+            if (self.isWms) {
+                ShowMessage(@"wms仓不允许作废！");
+                return;
+            }
             [self dealByAction:PURCHASE_ACTION_ABORT];//作废
         }
     }else if (alertView.tag == EndTag){

XFFruit/ViewControllers/Purchase/Controllers/PurchaseViewController.m

@@ -289,7 +289,7 @@ typedef enum : NSUInteger {
                 _boltView.backgroundColor = XXFBgColor;
                 _boltView.delegate = self;
                 //initial(未提交)submitted(已提交)rejected(已拒绝)approved(已审批)shipping(发运中)finished(已完成)
-                _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"未提交",@"未审批",@"已拒绝" ,@"发运中",@"已作废",@"已完成",@"提交系统处理",@"系统处理失败",nil];
+                _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"全部",@"未提交",@"未审批",@"提交系统处理",@"系统处理失败",@"已拒绝", @"待收货",@"发运中",@"已完成",@"已作废",@"已收货",nil];
                 [_maskView addSubview:_boltView];
                 [UIView animateWithDuration:0.25 animations:^{
                     CGRect sortFrame = _boltView.frame;

XFFruit/ViewControllers/Purchase/Views/PurchaseBoltView.m

@@ -269,25 +269,36 @@
     _currentIndexPath = indexPath;
     
     //initial(未提交)submitted(已提交)rejected(已拒绝)approved(已审批)shipping(发运中)finished(已完成)
-    
+    NSString *string = self.dataArr[indexPath.row];
     NSString *stateStr = @"";
-    if (indexPath.row == 0) {
+    
+    if ([string isEqualToString:@"未提交"]) {
         stateStr = PURCHASE_STATE_INITIAL;
-    }else if(indexPath.row == 1){
+    }else if ([string isEqualToString:@"未审批"]){
         stateStr = PURCHASE_STATE_SUBMITTED;
-    }else if(indexPath.row == 2){
+    }else if ([string isEqualToString:@"提交系统处理"]){
+        stateStr = PURCHASE_STATE_PROCESS;
+    }else if ([string isEqualToString:@"系统处理失败"]){
+        stateStr = PURCHASE_STATE_PROCESSFAIL;
+    }else if ([string isEqualToString:@"已拒绝"]){
         stateStr = PURCHASE_STATE_REJECTED;
-    }else if(indexPath.row == 3){
+    }else if ([string isEqualToString:@"发运中"]){
         stateStr = PURCHASE_STATE_SHIPPING;
-    }else if(indexPath.row == 4){
-        stateStr = PURCHASE_STATE_ABORTED;
-    }else if(indexPath.row == 5){
+    }else if ([string isEqualToString:@"已完成"]){
         stateStr = PURCHASE_STATE_FINISHED;
-    }else if(indexPath.row == 6){
-        stateStr = PURCHASE_STATE_PROCESS;
-    }else if(indexPath.row == 7){
-        stateStr = PURCHASE_STATE_PROCESSFAIL;
+    }else if ([string isEqualToString:@"已作废"]){
+        stateStr = PURCHASE_STATE_ABORTED;
+    }else if ([string isEqualToString:@"供应商确认"]){
+        stateStr = PURCHASE_ACTION_VENDORCONFIRM;
+    }else if ([string isEqualToString:@"已收货"]){
+        stateStr = PURCHASE_STATE_RECEIVED;
+    }else if ([string isEqualToString:@"待收货"]){
+        stateStr = PURCHASE_STATE_WAITE_RECIEVE;
+    }else if ([string isEqualToString:@"全部"]){
+        stateStr = @"";
     }
+    
+    
     [self.delegate getBoltValueSelectRow:stateStr];
 }
 

XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m

@@ -513,6 +513,10 @@ typedef enum : NSUInteger {
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{
     if (alertView.tag == AbortTag) {
         if (buttonIndex == 1) {
+            if (self.isWms) {
+                ShowMessage(@"wms仓不允许作废！");
+                return;
+            }
             [self dealByAction:TRANSPORT_STATE_ABORTED];//作废
         }
     }else if (alertView.tag == EndTag){

XFFruit/ViewControllers/Transport/Controllers/TransportViewController.m

@@ -280,7 +280,7 @@ typedef enum : NSUInteger {
                 _boltView.backgroundColor = XXFBgColor;
                 _boltView.delegate = self;
                 
-                _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"未提交",@"待收货",@"已收货",@"已作废",@"提交系统处理",@"系统处理失败",nil];
+                _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"全部",@"未提交",@"提交系统处理",@"系统处理失败", @"待收货",@"已收货",@"已完成",@"已作废",nil];
                 [_maskView addSubview:_boltView];
                 [UIView animateWithDuration:0.25 animations:^{
                     CGRect sortFrame = _boltView.frame;

XFFruit/ViewControllers/Transport/Views/TransportBoltView.m

@@ -245,20 +245,27 @@
     _currentIndexPath = indexPath;
     
     //initial(未提交)submitted(已提交)rejected(已拒绝)approved(已审批)shipping(发运中)finished(已完成)
-    
+    NSString *string = self.dataArr[indexPath.row];
     NSString *stateStr = @"";
-    if (indexPath.row == 0) {
+    
+    if ([string isEqualToString:@"未提交"]) {
         stateStr = TRANSPORT_STATE_INITIAL;
-    }else if(indexPath.row == 1){
-        stateStr = TRANSPORT_STATE_UNRECEIVED;
-    }else if(indexPath.row == 2){
-        stateStr = TRANSPORT_STATE_RECEIVED;
-    }else if(indexPath.row == 3){
-        stateStr = TRANSPORT_STATE_ABORTED;
-    }else if(indexPath.row == 4){
+    }else if ([string isEqualToString:@"未审批"]){
+    }else if ([string isEqualToString:@"提交系统处理"]){
         stateStr = TRANSPORT_STATE_PROCESS;
-    }else if(indexPath.row == 5){
+    }else if ([string isEqualToString:@"系统处理失败"]){
         stateStr = TRANSPORT_STATE_PROCESSFAIL;
+    }else if ([string isEqualToString:@"已拒绝"]){
+    }else if ([string isEqualToString:@"发运中"]){
+    }else if ([string isEqualToString:@"已完成"]){
+    }else if ([string isEqualToString:@"已作废"]){
+        stateStr = TRANSPORT_STATE_ABORTED;
+    }else if ([string isEqualToString:@"已收货"]){
+        stateStr = TRANSPORT_STATE_RECEIVED;
+    }else if ([string isEqualToString:@"待收货"]){
+        stateStr = TRANSPORT_STATE_UNRECEIVED;
+    }else if ([string isEqualToString:@"全部"]){
+        stateStr = @"";
     }
     
     [self.delegate getBoltValueSelectRow:stateStr];