添加用户仓库表enabled

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -1786,15 +1786,97 @@ acceptTypeJson:YES
                         success:(void (^)(id))succ
                         failure:(void (^)(id))fail{
     
-    [self p_downloadWithStartDate:stateDate ICRHTTPAction:XFFHttp_GetWarehouse ClassName:@"Warehouse" Page_number:page_number page_size:page_size success:succ failure:fail];
+//    [self p_downloadWithStartDate:stateDate ICRHTTPAction:XFFHttp_GetWarehouse ClassName:@"Warehouse" Page_number:page_number page_size:page_size success:succ failure:fail];
+    void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+        CLog(@"%@", responseObject);
+        if (IsDictObject(responseObject)) {
+            void (^complete)(void) = ^(void){
+                if (succ) {
+                    [IBTCommon runOnMainThreadWithoutDeadlocking:^{
+                        succ( responseObject );
+                    }];
+                }
+            };
+            
+            ICRDataBaseController *dbCtrl = [ICRDataBaseController sharedController];
+            [dbCtrl storageEntities:responseObject[ @"data" ][ @"records" ]
+                        objectClass:NSClassFromString(@"Warehouse") ///
+                        deleteLocal:YES
+                         handleData:NULL
+                           complete:complete
+                               fail:fail];
+        }
+        else {
+            if (fail) {
+                fail( nil );
+            }
+        }
+    };
+    void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+        CLog(@"%@", error);
+        if (fail) {
+            fail( error );
+        }
+    };
+    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_GetWarehouse] stringByAppendingFormat:@"?start_date=%@&page_number=%@&page_size=%@", stateDate,@(page_number),@(page_size)];
+    NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    [self GET:encodeUrlStr
+   parameters:NULL
+    needToken:NO
+acceptTypeJson:YES
+      success:success
+      failure:failure];
+
 }
+
 //用户仓库表
 - (void)downloadUserWarehouseWithStartDate:(NSString *)stateDate
                                Page_number:(NSUInteger)page_number
                                  page_size:(NSUInteger)page_size
                                    success:(void (^)(id))succ
                                    failure:(void (^)(id))fail{
+    
     [self p_downloadWithStartDate:stateDate ICRHTTPAction:XFFHttp_downloadUserWarehouse ClassName:@"UserWarehouse" Page_number:page_number page_size:page_size success:succ failure:fail];
+    
+//    void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+//        CLog(@"%@", responseObject);
+//        if (IsDictObject(responseObject)) {
+//            void (^complete)(void) = ^(void){
+//                if (succ) {
+//                    [IBTCommon runOnMainThreadWithoutDeadlocking:^{
+//                        succ( responseObject );
+//                    }];
+//                }
+//            };
+//            
+//            ICRDataBaseController *dbCtrl = [ICRDataBaseController sharedController];
+//            [dbCtrl storageEntities:responseObject[ @"data" ][ @"records" ]
+//                        objectClass:NSClassFromString(@"UserWarehouse") ///
+//                        deleteLocal:YES
+//                         handleData:NULL
+//                           complete:complete
+//                               fail:fail];
+//        }
+//        else {
+//            if (fail) {
+//                fail( nil );
+//            }
+//        }
+//    };
+//    void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+//        CLog(@"%@", error);
+//        if (fail) {
+//            fail( error );
+//        }
+//    };
+//    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_downloadUserWarehouse] stringByAppendingFormat:@"?start_date=%@&page_number=%@&page_size=%@", stateDate,@(page_number),@(page_size)];
+//    NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+//    [self POST:encodeUrlStr
+//    parameters:NULL
+//     needToken:NO
+//acceptTypeJson:YES
+//       success:success
+//       failure:failure];
 }
 
 

XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m

@@ -220,7 +220,7 @@
                 sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"code"];
             }
         }else if([tableStr isEqualToString:GXF_BASECLASS_UserWAREHOUSE]){
-            sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE userUuid = '%@'", tableStr,[ICRUserUtil sharedInstance].userId];//@"4028b88150a987080150a987dce5007a"
+            sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE userUuid = '%@'  AND ENABLED = 1", tableStr,[ICRUserUtil sharedInstance].userId];//@"4028b88150a987080150a987dce5007a"
         }else if([tableStr isEqualToString:GXF_BASECLASS_VENDOR]){
             if (titleStr.length > 0) {
                 sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"code"];

XFFruit/ViewControllers/Purchase/Models/UserWarehouse.h

@@ -18,4 +18,6 @@
 @property (nonatomic,strong)NSString *lastModified_time;	//最后修改时间
 @property (nonatomic,strong)NSString *lastModified_id;	//最后修改人代码
 @property (nonatomic,strong)NSString *lastModified_operName;	//最后修改人名称
+@property (nonatomic,assign)BOOL enabled;//状态
+
 @end