正式版2.0.6

XFFruit/Controllers/DataBaseController/GXFFunctionDB.m

@@ -38,6 +38,10 @@
         dbPath = [path stringByAppendingString:@"function.db"];
     }
     
+    if ([[NSFileManager defaultManager] fileExistsAtPath:dbPath]) {
+        [[NSFileManager defaultManager] removeItemAtPath:dbPath error:nil];
+    }
+    
     self.dataBase = [FMDatabase databaseWithPath:dbPath];
     CLog(@"dbPath = %@",dbPath);
     BOOL isOpen = [_dataBase open];

XFFruit/Controllers/DataBaseController/GXFFunctionDBHelper.m

@@ -100,8 +100,8 @@
                                @"新建采购通知",@"查看采购通知",  @"查看采购通知",
                                @"新建采购单",@"查看采购单",     @"查看采购单", @"供应商确认采购单",//【供应商】",
                                @"新建发运单",@"查看发运单",     @"查看发运单",
-                               @"新建加工单",@"查看加工单",     @"查看加工单",
                                @"新建转运单", @"查看转运单",    @"查看转运单",
+                               @"新建加工单",@"查看加工单",     @"查看加工单",
                                @"查看收货单",    @"查看收货单"];
     
 #ifdef Demonstrate
@@ -133,8 +133,8 @@
                                  @(4),@(5),@(5),//"采购通知",
                                  @(6),@(7),@(7),@(8),//"采购单"
                                  @(9),@(10),@(10),//"发运单"
-                                 @(11),@(12),@(12),//"转运单"
                                  @(13),@(14),@(14),//加工单
+                                 @(11),@(12),@(12),//"转运单"
                                  @(15),@(15),];//收货单
     if ((functionsId.count != functionsName.count) ||(functionsId.count != functionsImageName.count)||(functionsName.count != functionsImageName.count)) {
         NSLog(@"展现功能界面：插入的数据不是一一对应的");

XFFruit/Macro/ICRAppMacro.h

@@ -33,6 +33,7 @@
 //********开发环境********
 #define HTTP_REST_API_BASE_URL  @"http://gomoredev:8090/cruiser-server/rest"
 #define HTTP_REST_REPORT_BASE_URL @"http://gomoredev:8090"
+
 #else
 
 //********测试环境********

XFFruit/ViewControllers/Login/ICRLoginViewController.m

@@ -102,7 +102,7 @@
     }
     
 #ifdef DEBUG
-    self.m_containerView.m_cCodeTextF.text = @"923";
+    self.m_containerView.m_cCodeTextF.text = @"211534962";
     self.m_containerView.m_userNameTextF.text = @"admin";
     self.m_containerView.m_passwordTextF.text = @"thoradmin";
 #else
@@ -138,7 +138,7 @@
 
 - (void)onLoginTapped:(__unused id)sender
 {
-
+//    [[GXFFunctionDB sharedInstance] deleteTables];
 #if 0
     ICRAppViewControllerManager *mgr =
     [ICRAppViewControllerManager getAppViewControllerManager];
@@ -162,7 +162,8 @@
         
 #pragma 可以开新线程 ，待优化
         //当登陆成功时就建立功能数据表
-        //        [[GXFFunctionDB sharedInstance] deleteTables];
+        [[GXFFunctionDB sharedInstance] deleteTables];
+
         [[GXFFunctionDB sharedInstance] createTables];
 
         //完成对初始化数据书库的操作