Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001

Conflicts:
	XFFruit/ViewControllers/Business/BusinessViewController.m

XFFruit/Controllers/DataBaseController/GXFFunctionDBHelper.m

@@ -89,7 +89,7 @@
                              @(500101),@(500102),@(500103),
                              @(500201),
                              @(500301),@(500302),@(500303),//"采购通知",
-                             @(500401),@(500402),@(500403),@(500406),//"采购单"
+                             @(500401),@(500402),@(500403),@(500404),//"采购单"
                              @(500501),@(500502),@(500503),//"发运单"
                              @(500601),@(500602),@(500603),//"转运单"
                              @(500701),@(500702),@(500703),];//加工单
@@ -97,7 +97,7 @@
                                @"新建行情调研",@"查看行情调研",  @"查看行情调研",
                                @"填写行情反馈",
                                @"新建采购通知",@"查看采购通知",  @"查看采购通知",
-                               @"新建采购单",@"查看采购单",     @"查看采购单",  @"审核采购单【供应商】",
+                               @"新建采购单",@"查看采购单",     @"查看采购单", @"审核采购单",//【供应商】",
                                @"新建发运单",@"查看发运单",     @"查看发运单",
                                @"新增加工单",@"查看加工单",     @"查看加工单",
                                @"新建转运单", @"查看转运单",    @"查看转运单"];

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -1666,8 +1666,8 @@ acceptTypeJson:YES
                        page_size:(NSUInteger)page_size
                          success:(void (^)(id))succ
                          failure:(void (^)(id))fail{
-    
-     [self p_getDownloadWithICRHTTPAction:XFFHttp_GetVendor ClassName:@"Vendor" Page_number:page_number page_size:page_size success:succ failure:fail];
+
+ [self p_getDownloadWithICRHTTPAction:XFFHttp_GetVendor ClassName:@"Vendor" Page_number:page_number page_size:page_size success:succ failure:fail];
 }
 //仓库
 -(void)getWarehouseWithPage_number:(NSUInteger)page_number
@@ -1741,7 +1741,9 @@ acceptTypeJson:YES
             fail( error );
         }
     };
-    NSString *dateStr = [[NSDate date] httpParameterString];
+    
+#pragma 请求参数的下载时间应该有要求？？？？
+    NSString *dateStr = @"2015-05-04";//[[NSDate date] httpParameterString];//urlAction
     NSString *urlStr = [[[self class] UrlForPluginHTTPAction:urlAction] stringByAppendingFormat:@"?startDate=%@&pageNumber=%@&pageSize=%@", dateStr,@(page_number),@(page_size)];
     NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     

XFFruit/General/Categories/NSDate+FormatterAdditions.m

@@ -290,6 +290,7 @@
 }
 
 - (NSString *)httpParameterString {
+    NSString *str = [self stringWithFormatter:@"%Y-%m-%d %H:%M:%S"];
     return [self stringWithFormatter:@"%Y-%m-%d %H:%M:%S"];
 }
 - (NSString *)coverStringFromString {

XFFruit/Utilities/IBTModels/IBTModel.h

@@ -20,6 +20,7 @@
 
 // Fuctions
 - (NSDictionary *)dictForCommit;
+- (NSMutableDictionary *)mutableDictDateToStringForCommit;//把属性为日期类型的转化为string
 - (NSDictionary *)dictForLocalSave;
 - (void)praseFromJsonDict:(NSDictionary *)dict;
 - (void)praseFromLocalDict:(NSDictionary *)dict;

XFFruit/Utilities/IBTModels/IBTModel.m

@@ -418,6 +418,48 @@
     return mDict;
 }
 
+- (NSMutableDictionary *)mutableDictDateToStringForCommit {
+
+    unsigned int count;
+    objc_property_t *properties = class_copyPropertyList([self class], &count);
+    
+    if (count == 0) {
+        free(properties);
+        return nil;
+    }
+    
+    NSMutableDictionary *mDict = [NSMutableDictionary dictionary];
+    
+    NSDictionary *dictSpKeyDict = [[self class] specialKeysAndReplaceKeys];
+    NSArray *arrSpecialKeys = [dictSpKeyDict allKeys];
+    NSArray *arrCustomKeys = [[self class] customAcitonKeys];
+    NSArray *arrLocalKeys = [[self class] localKeys];
+    
+    for (unsigned int i = 0; i < count; i++) {
+        objc_property_t property = properties[i];
+        
+        NSString *key = [NSString stringWithUTF8String:property_getName(property)];
+        
+        id value = [self valueForKey:key];
+        if ([value isKindOfClass:[NSDate class]]) {
+            value = [value httpParameterString];
+            
+        }
+        if (value) {
+            if ([arrCustomKeys containsObject:key] ||
+                [arrLocalKeys containsObject:key]) {
+                continue;
+            } else if ([arrSpecialKeys containsObject:key]) {
+                [mDict addEntriesFromDictionary:@{dictSpKeyDict[key]: value}];
+            } else {
+                [mDict addEntriesFromDictionary:@{key: value}];
+            }
+        }
+    }
+    
+    free(properties);
+    return mDict;
+}
 - (NSDictionary *)dictForLocalSave {
     unsigned int count;
     objc_property_t *properties = class_copyPropertyList([self class], &count);

XFFruit/ViewControllers/Home/Controllers/GXFFunctionsViewController.m

@@ -54,7 +54,7 @@ static NSString *cellID = @"cell";
     self.navigationItem.rightBarButtonItem = rightBarBtn;
 }
 - (void)setupTableView {
-    self.f_tableView = [[UITableView alloc]initWithFrame:self.view.frame style:UITableViewStyleGrouped];
+    self.f_tableView = [[UITableView alloc]initWithFrame:CGRectMake(0, 0, self.view.width, self.view.height - 64) style:UITableViewStyleGrouped];
     self.f_tableView.dataSource = self;
     self.f_tableView.delegate = self;
     //[self.f_tableView dequeueReusableCellWithIdentifier ]

XFFruit/ViewControllers/Home/Controllers/ICRHomeViewController.m

@@ -58,7 +58,7 @@
 @end
 
 @implementation ICRHomeViewController
-static NSString *cellID = @"cell";
+static NSString *firestCellID = @"firestCell";
 static NSString *secondCellID = @"secondCell";
 static NSString *collectionCellID = @"collectionCell";
 //static CGFloat  colletionCellHeight [UIScreen mainScreen].bounds.size.width / 3.0
@@ -187,24 +187,30 @@ static NSString *collectionCellID = @"collectionCell";
     }
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+    UITableViewCell *cell; //= [tableView dequeueReusableCellWithIdentifier:cellID];
     
-    if (!cell) {
+   
+
         if (indexPath.section == 0) {
-            cell = [[GXFNoticeFunctionTableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
-            cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-            cell.textLabel.text = @"查看行情反馈-进行中";
+            cell = [tableView dequeueReusableCellWithIdentifier:firestCellID];
+            if (!cell) {
+                cell = [[GXFNoticeFunctionTableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:firestCellID];
+                cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+                cell.textLabel.text = @"查看行情反馈-进行中";
+            }
         } else {
-            cell = [[UITableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"secondCell"];
+            cell = [tableView dequeueReusableCellWithIdentifier:secondCellID];
+            if (!cell) {
+                cell = [[UITableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:secondCellID];
+               
+            } else {
+                while ([cell.contentView.subviews lastObject] != nil) {
+                    [(UIView *)[cell.contentView.subviews lastObject]removeFromSuperview];
+                }
+            }
             [cell.contentView addSubview:_f_functionBaseView];
             NSLog(@"%@",NSStringFromCGRect(cell.frame));
         }
-    } else {
-
-        while ([cell.contentView.subviews lastObject] != nil) {
-            [(UIView *)[cell.contentView.subviews lastObject] removeFromSuperview];
-        }
-    }
     
     return cell;
 }

XFFruit/ViewControllers/Home/Models/GXFDisplayFunction.h

@@ -15,6 +15,7 @@
 @property (nonatomic, copy) NSString *functionImgName; //
 @property (nonatomic, copy) NSString *functionSmallImgName;
 @property (nonatomic, assign) BOOL isSelected; //选中
+@property (nonatomic, assign) BOOL hasPermission;
 @property (nonatomic, assign) NSInteger functionItemTag;
 
 + (instancetype)initClassWithDictionary: (NSDictionary *)dict;

XFFruit/ViewControllers/Login/ICRLoginViewController.m

@@ -163,12 +163,14 @@
             }
         }
         
-        if (![[GXFFunctionDB sharedInstance]defaultdisplayFunctions]) {
+        //配置功能 不是默认配置
+        NSUserDefaults *f_default = [NSUserDefaults standardUserDefaults];
+        BOOL noDefault = [[f_default objectForKey:@"noDefault"] integerValue] > 0 ? YES : NO;
+        if (!noDefault) {
             [[GXFFunctionDB sharedInstance]defaultdisplayFunctions];
         }
         
         
-        
     };
     
     void(^fail)(id) = ^(id data) {

XFFruit/ViewControllers/Process/Controllers/GXFSeeProcessViewController.m

@@ -34,7 +34,7 @@
     [IBTLoadingView showProgressLabel:@"正在加载..."];
     ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
 
-    NSDictionary *queryOrderDict = @{@"direction":@"desc",@"field":@"billNumber"};
+    NSDictionary *queryOrderDict = @{@"direction":@"",@"field":@"billNumber"};
     NSDictionary *dict = @{
                            @"billNumberLike":@"",
                            @"state":@"",