修改项说明：debug

total/GTOApp/Business/NewObtainViewController.m

@@ -1047,10 +1047,10 @@
     [HttpRequestManager requestNetworkwithURL:string withRequestType:ZERO withParameter:[orderBill toDictionary] withSuccess:^(id returnValue) {
         
         if ([returnValue[@"success"] isEqualToNumber:@1]) {
-            [IBTLoadingView hideHUDWithText:@"保存成功"];
             if (!boolValue) {
                 block(returnValue[@"data"][@"uuid"]);return;
             }
+            [IBTLoadingView hideHUDWithText:@"保存成功"];
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 SeeObtainViewController *orderBill = [weakSelf.storyboard instantiateViewControllerWithIdentifier:@"SeeObtainViewController"];
                 orderBill.orderUUIDString = returnValue[@"data"][@"uuid"];

total/GTOApp/Business/NewOrderViewController.m

@@ -368,7 +368,7 @@
     //油站经营类型
     order.operatingType = self.recordSelectGasStation[@"operatingType"];
     //订单状态
-    order.state = boolValue?@"initial":@"submit";
+    order.state = @"initial";
     //所属业主公司
     UCN *company = [[UCN alloc]init];
     company.code = user.orgCode;
@@ -416,14 +416,7 @@
             [IBTLoadingView hideHUDWithText:@"保存成功"];
             saveSuccess(returnValue[@"data"],order);
             if (!boolValue) return;//提交调用保存时不需要跳转到详情
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                OrderDetailsViewController *orderDetail = [self.storyboard instantiateViewControllerWithIdentifier:@"OrderDetailsViewController"];
-                orderDetail.orderUUIDString = returnValue[@"data"][@"uuid"];
-                orderDetail.oilTypeListDatasArray = self.oilTypeListDatasArray;
-                orderDetail.title = @"订油单详情";
-                orderDetail.boolValue = YES;
-                [weakSelf PushViewController:orderDetail animated:YES];
-            });
+            [weakSelf gotoOrderDetail:returnValue[@"data"][@"uuid"]];
         } else {
             [IBTLoadingView hideHUDWithText:returnValue[@"message"]];
         }
@@ -434,6 +427,18 @@
     }];
 }
 
+#pragma mark -订单详情
+- (void)gotoOrderDetail:(NSString *)uuid
+{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        OrderDetailsViewController *orderDetail = [self.storyboard instantiateViewControllerWithIdentifier:@"OrderDetailsViewController"];
+        orderDetail.orderUUIDString = uuid;
+        orderDetail.oilTypeListDatasArray = self.oilTypeListDatasArray;
+        orderDetail.title = @"订油单详情";
+        orderDetail.boolValue = YES;
+        [self PushViewController:orderDetail animated:YES];
+    });
+}
 
 #pragma mark -提交订油单
 - (void)commitOilOrder
@@ -470,6 +475,7 @@
             
         } else {
             [IBTLoadingView hideHUDWithText:returnValue[@"message"]];
+            [weakSelf gotoOrderDetail:dict[@"uuid"]];
         }
         
     } withFailed:^(NSError *failed) {

total/GTOApp/Business/NewRequestViewController.m

@@ -270,6 +270,16 @@
         {
             TypeTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"TypeTableViewCell" forIndexPath:indexPath];
             cell.titleLabe.text = @"配送区域:";
+            //只有一个配送区域情况
+            if (self.distributionArray.count == 1) {
+                self.distributionDict = [self.distributionArray firstObject];
+                cell.contentLabe.text = self.distributionDict[@"name"];
+            }
+            //无配送区域情况
+            if (!self.distributionArray.count) {
+                cell.contentLabe.text = @"无";
+            }
+            cell.userInteractionEnabled = self.distributionArray.count > 1;
             if (self.isSaveDetails) {
                 cell.contentLabe.text = self.orderDetails.deliveryArea.name;
             }
@@ -380,7 +390,11 @@
             break;
         case 1://配送区域
         {
+
             TypeTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+            if (![ICRUserUtil sharedInstance].storeArray.count) {
+                [IBTLoadingView showTextOnly:@"当前用户没有所属油站，不能选择配送区域"];return;
+            }
             PromptTableViewController *selectArea = [[PromptTableViewController alloc]init];
             selectArea.title = @"选择配送区域";
             NSMutableArray *tempArray = [NSMutableArray array];
@@ -467,7 +481,7 @@
 #pragma mark -UITextField监听
 - (void)changeTextfieldString:(UITextField *)textField
 {
-    if (!self.oilPrice) {
+    if (!self.oilPrice.records.count) {
         [IBTLoadingView showTextOnly:@"油品价格异常"];
         textField.text = nil;
         return;
@@ -509,6 +523,7 @@
     }
     TimeSelectTableViewCell *cell = [self.createWarehouseTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:2 inSection:0]];
     DepotRequestBill *orderBill = [[DepotRequestBill alloc]init];
+    orderBill.version = self.orderDetails.version;
     ICRUserUtil *user = [ICRUserUtil sharedInstance];
     //状态
     orderBill.state = @"initial";
@@ -551,13 +566,13 @@
     time.endDateTime = [NSString stringWithFormat:@"%@ 23:59:59",[cell.endTimeButton currentTitle]];
     orderBill.deliveryTime = time;
     //申请价格
-    orderBill.reqPrice = [NSNumber numberWithFloat:[[self.oilPrice.records firstObject][@"salePrice"] doubleValue]];
+    orderBill.reqPrice = [NSNumber numberWithDouble:[[self.oilPrice.records firstObject][@"salePrice"] doubleValue]];
     NumberTableViewCell *numberCell = [self.createWarehouseTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:5 inSection:0]];
     if ([orderBill.reqPrice isEqualToNumber:@0]) {
         [IBTLoadingView showTextOnly:@"价格异常"];return;
     }
     //申请数量
-    orderBill.quantity = [NSNumber numberWithFloat:[numberCell.createNumberField.text doubleValue]];
+    orderBill.quantity = [NSNumber numberWithDouble:[numberCell.createNumberField.text doubleValue]];
     if ([orderBill.quantity isEqualToNumber:@0]) {
         [IBTLoadingView showTextOnly:@"数量异常"];return;
     }
@@ -571,18 +586,12 @@
     [HttpRequestManager requestNetworkwithURL:string withRequestType:ZERO withParameter:[orderBill toDictionary] withSuccess:^(id returnValue) {
         
         if ([returnValue[@"success"] isEqualToNumber:@1]) {
+            if (!isPushDetails) {
+                [IBTLoadingView hideHUDWithText:nil];
+                block(returnValue[@"data"],orderBill);return;
+            }
             [IBTLoadingView hideHUDWithText:@"保存成功"];
-            block(returnValue[@"data"],orderBill);
-            if (!isPushDetails) return;//是否需要跳转太详情页
-                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    NewRequestViewController *details = [weakSelf.storyboard instantiateViewControllerWithIdentifier:@"NewRequestViewController"];
-                    details.orderUUID = returnValue[@"data"][@"uuid"];
-                    details.isSaveDetails = YES;
-                    details.title = @"修改建仓单";
-                    details.oilTypeDict = weakSelf.oilTypeDict;
-                    details.distributionDict = weakSelf.distributionDict;
-                    [weakSelf PushViewController:details animated:YES];
-                });
+            [weakSelf saveOrderSuccess:returnValue[@"data"][@"uuid"]];
         }
         else {
             [IBTLoadingView hideHUDWithText:returnValue[@"message"]];
@@ -594,6 +603,20 @@
     }];
 }
 
+#pragma mark -保存成功
+- (void)saveOrderSuccess:(NSString *)uuidString
+{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        NewRequestViewController *details = [self.storyboard instantiateViewControllerWithIdentifier:@"NewRequestViewController"];
+        details.orderUUID = uuidString;
+        details.isSaveDetails = YES;
+        details.title = @"建仓申请单明细";
+        details.oilTypeDict = self.oilTypeDict;
+        details.distributionDict = self.distributionDict;
+        [self PushViewController:details animated:YES];
+    });
+}
+
 #pragma mark -提交建仓单
 - (void)commitOrder
 {
@@ -622,6 +645,7 @@
                 
             } else {
                  [IBTLoadingView hideHUDWithText:returnValue[@"message"]];
+                [weakSelf saveOrderSuccess:dict[@"uuid"]];
             }
         } withFailed:^(NSError *failed) {
             [IBTLoadingView hideHUDWithText:nil];

total/GTOApp/Business/OrderDetailsViewController.m

@@ -368,7 +368,7 @@
     //油站经营类型
     order.operatingType = self.orderDetails.operatingType;
     //订单状态
-    order.state = boolValue?@"initial":@"submit";
+    order.state = @"initial";
     order.version = self.orderDetails.version;
     order.uuid = self.orderDetails.uuid;
     order.billnumber = self.orderDetails.billnumber;
@@ -415,17 +415,13 @@
     NSDictionary *orderDict = [order toDictionary];
     [HttpRequestManager requestNetworkwithURL:string withRequestType:ZERO withParameter:orderDict  withSuccess:^(id returnValue) {
         if ([returnValue[@"success"] isEqualToNumber:@1]) {
+            
+            if (!boolValue) {
+                [IBTLoadingView hideHUDWithText:nil];
+                saveSuccess(returnValue[@"data"],order);return;
+            }
             [IBTLoadingView hideHUDWithText:@"保存成功"];
-            saveSuccess(returnValue[@"data"],order);
-            if (!boolValue) return;//提交调用保存时不需要跳转到详情
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                OrderDetailsViewController *orderDetail = [self.storyboard instantiateViewControllerWithIdentifier:@"OrderDetailsViewController"];
-                orderDetail.orderUUIDString = returnValue[@"data"][@"uuid"];
-                orderDetail.oilTypeListDatasArray = self.oilTypeListDatasArray;
-                orderDetail.title = @"订油单详情";
-                orderDetail.boolValue = YES;
-                [weakSelf PushViewController:orderDetail animated:YES];
-            });
+            [weakSelf gotoOrderDetail:returnValue[@"data"][@"uuid"]];
         }else
         {
             [IBTLoadingView hideHUDWithText:returnValue[@"message"]];
@@ -436,6 +432,19 @@
     }];
 }
 
+#pragma mark -订单详情
+- (void)gotoOrderDetail:(NSString *)uuid
+{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        OrderDetailsViewController *orderDetail = [self.storyboard instantiateViewControllerWithIdentifier:@"OrderDetailsViewController"];
+        orderDetail.orderUUIDString = uuid;
+        orderDetail.oilTypeListDatasArray = self.oilTypeListDatasArray;
+        orderDetail.title = @"订油单详情";
+        orderDetail.boolValue = YES;
+        [self PushViewController:orderDetail animated:YES];
+    });
+}
+
 
 #pragma mark -提交订油单
 - (void)commitOilOrder
@@ -462,17 +471,11 @@
         
         if ([returnValue[@"success"] isEqualToNumber:@1]) {
             [IBTLoadingView hideHUDWithText:@"提交成功"];
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                OrderDetailsViewController *orderDetail = [self.storyboard instantiateViewControllerWithIdentifier:@"OrderDetailsViewController"];
-                orderDetail.orderUUIDString = dict[@"uuid"];
-                 orderDetail.oilTypeListDatasArray = self.oilTypeListDatasArray;
-                orderDetail.title = @"订油单详情";
-                orderDetail.boolValue = YES;
-                [weakSelf PushViewController:orderDetail animated:YES];
-            });
+            [weakSelf gotoOrderDetail:dict[@"uuid"]];
             
         } else {
             [IBTLoadingView hideHUDWithText:returnValue[@"message"]];
+            [weakSelf gotoOrderDetail:dict[@"uuid"]];
         }
         
     } withFailed:^(NSError *failed) {

total/GTOApp/Business/SeeObtainViewController.m

@@ -1003,22 +1003,16 @@
     self.orderDetails.remark = self.userInputArray[ONE][9];
     NSString *urlString = [NSString stringWithFormat:@"%@/receiveBill/save?operId=%@&operName=%@&time=%@",HTTP_REST_API_BASE_URL,user.f_user_uuid,user.f_user_name,[GTOCommonTools GetCurrenttime]];
     NSString *string = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    NSLog(@"%@",[self.orderDetails toDictionary]);
     [IBTLoadingView showProgressLabel:@"保存中..."];
     [HttpRequestManager requestNetworkwithURL:string withRequestType:ZERO withParameter:[self.orderDetails toDictionary] withSuccess:^(id returnValue) {
         
         if ([returnValue[@"success"] isEqualToNumber:@1]) {
-            [IBTLoadingView hideHUDWithText:@"保存成功"];
             if (!boolValue) {
+                [IBTLoadingView hideHUDWithText:nil];
                 bolck(returnValue[@"data"][@"uuid"]);return;
             }
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                SeeObtainViewController *orderBill = [weakSelf.storyboard instantiateViewControllerWithIdentifier:@"SeeObtainViewController"];
-                orderBill.orderUUIDString = returnValue[@"data"][@"uuid"];
-                orderBill.storeDict = self.storeDict;//油站
-                orderBill.isReturnRootVC = YES;
-                [weakSelf PushViewController:orderBill animated:YES];
-            });
+            [IBTLoadingView hideHUDWithText:@"保存成功"];
+            [weakSelf saveOrderSuccess:returnValue[@"data"][@"uuid"]];
         } else {
             [IBTLoadingView hideHUDWithText:returnValue[@"message"]];
         }
@@ -1053,6 +1047,7 @@
                 
             } else {
                 [IBTLoadingView hideHUDWithText:returnValue[@"message"]];
+                [weakSelf saveOrderSuccess:uuidString];
             }
             
         } withFailed:^(NSError *failed) {
@@ -1063,6 +1058,18 @@
     } isPushDetails:NO];
 }
 
+#pragma mark -保存收油单成功
+- (void)saveOrderSuccess:(NSString *)uuidString
+{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        SeeObtainViewController *orderBill = [self.storyboard instantiateViewControllerWithIdentifier:@"SeeObtainViewController"];
+        orderBill.orderUUIDString = uuidString;
+        orderBill.storeDict = self.storeDict;//油站
+        orderBill.isReturnRootVC = YES;
+        [self PushViewController:orderBill animated:YES];
+    });
+}
+
 
 #pragma mark -返回提示信息
 - (NSString *)returnPromptInformation:(NSInteger)index

total/GTOApp/Business/SeeOrderViewController.m

@@ -319,7 +319,7 @@ typedef enum : NSUInteger {
             NewRequestViewController *details = [self.storyboard instantiateViewControllerWithIdentifier:@"NewRequestViewController"];
             details.orderUUID = dict[@"uuid"];
             details.isSaveDetails = YES;
-            details.title = @"修改建仓单";
+            details.title = @"建仓申请单明细";
             details.oilTypeDict = dict[@"item"];
             details.distributionDict = dict[@"deliveryArea"];
             [self PushViewController:details animated:YES];

total/GTOApp/Business/SeePriceViewController.m

@@ -114,6 +114,7 @@
     self.seePriceTableview.delegate = self;
     self.seePriceTableview.dataSource = self;
     self.seePriceTableview.tableFooterView = [UIView new];
+    self.seePriceTableview.userInteractionEnabled = [ICRUserUtil sharedInstance].storeArray.count;
 }
 
 #pragma mark -获取配送区域数据、获取行政区域数据

total/GTOApp/Business/SeeRequestViewController.m

@@ -192,7 +192,7 @@
             cell.establishWarehouseUnitLabe.text = self.orderDetails.org.name;
             cell.establishName.text = self.orderDetails.createInfo.operator.operName;
             cell.establishDate.text = self.orderDetails.createInfo.time;
-            if ([self.orderDetails.state isEqualToString:@"general"]) {
+            if ([self.orderDetails.type isEqualToString:@"general"]) {
                cell.typeLabe.text = @"普通";
             }
             cell.distributionLabe.text = self.orderDetails.deliveryArea.name;
@@ -324,8 +324,6 @@
                                                            options:WYPopoverAnimationOptionFadeWithScale];
 }
 
-
-
 #pragma mark -删除或者作废后返回此订单UUID
 - (void)returnUUIDsingAfterDeleteOrCancel:(BOOL)isDelete
 {

total/GTOApp/UserUtil/PromptTableViewController.m

@@ -93,12 +93,12 @@
 #pragma mark -确定
 - (void)completeButtonClick:(UIBarButtonItem *)item
 {
+    [self dismissViewControllerAnimated:YES completion:nil];
     if (self.selectTitle || self.currentTitle) {
         if (self.selectCellTitle) {
             self.selectCellTitle(self.selectTitle?self.selectTitle:self.currentTitle,self.indexpathSelect.row);
         }
     }
-    [self dismissViewControllerAnimated:YES completion:nil];
 }
 
 

total/Macro/GTOAppMacro.h

@@ -84,12 +84,12 @@
 //#define HTTP_LOCAL_BASE_URL    @"http://139.196.39.77:7080"
 
 //测试环境
-//#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:8180/total-server/rest"
-//#define HTTP_LOCAL_BASE_URL    @"http://139.196.39.77:8180"
+#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:8180/total-server/rest"
+#define HTTP_LOCAL_BASE_URL    @"http://139.196.39.77:8180"
 
 //开发环境
-#define HTTP_LOCAL_BASE_URL    @"http://139.196.195.30:8093"
-#define HTTP_REST_API_BASE_URL        @"http://139.196.195.30:8093/total-server/rest"
+//#define HTTP_LOCAL_BASE_URL    @"http://139.196.195.30:8093"
+//#define HTTP_REST_API_BASE_URL        @"http://139.196.195.30:8093/total-server/rest"
 
 #define    HTTP_WEATHER_URL @"http://apis.baidu.com/heweather/weather/free"