Skip to content

T
total
Commit 5073603b authored by 曹云霄's avatar 曹云霄
Browse files
Options

订配收，增加确认选项

parent 41ec2a23
Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 233 deletions
total/GTOApp/Business/NewObtainViewController.m
View file @ 5073603b
...@@ -1107,36 +1107,38 @@ ...@@ -1107,36 +1107,38 @@
- (void)commitRecevieOrder - (void)commitRecevieOrder
{ {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self saveReceiveOrder:^(NSString *uuidString) { [self showAlertViewController:@"确定提交该收油单吗？" withCompleted:^{
[weakSelf saveReceiveOrder:^(NSString *uuidString) {
RsOperateInfo *user = [[RsOperateInfo alloc]init];
user.operName = [ICRUserUtil sharedInstance].f_user_name;
user.operId = [ICRUserUtil sharedInstance].f_user_uuid;
user.enterprise = [ICRUserUtil sharedInstance].f_enterprise_uuid;
user.time = [GTOCommonTools GetCurrenttime];
[IBTLoadingView showProgressLabel:@"提交中..."];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/receiveBill/submit/%@",HTTP_REST_API_BASE_URL,uuidString] withRequestType:ZERO withParameter:[user toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) { RsOperateInfo *user = [[RsOperateInfo alloc]init];
[IBTLoadingView hideHUDWithText:@"提交成功"]; user.operName = [ICRUserUtil sharedInstance].f_user_name;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ user.operId = [ICRUserUtil sharedInstance].f_user_uuid;
SeeObtainViewController *orderBill = [weakSelf.storyboard instantiateViewControllerWithIdentifier:@"SeeObtainViewController"]; user.enterprise = [ICRUserUtil sharedInstance].f_enterprise_uuid;
orderBill.orderUUIDString = uuidString; user.time = [GTOCommonTools GetCurrenttime];
orderBill.isReturnRootVC = YES; [IBTLoadingView showProgressLabel:@"提交中..."];
orderBill.storeDict = weakSelf.recordSelectGasStation; [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/receiveBill/submit/%@",HTTP_REST_API_BASE_URL,uuidString] withRequestType:ZERO withParameter:[user toDictionary] withSuccess:^(id returnValue) {
[weakSelf PushViewController:orderBill animated:YES];
});
} else { if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:returnValue[@"message"]]; [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 = uuidString;
orderBill.isReturnRootVC = YES;
orderBill.storeDict = weakSelf.recordSelectGasStation;
[weakSelf PushViewController:orderBill animated:YES];
});
} else {
[IBTLoadingView hideHUDWithText:returnValue[@"message"]];
}
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:@"提交失败"];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
} withFailed:^(NSError *failed) { } isPushDetails:NO];
[IBTLoadingView hideHUDWithText:@"提交失败"]; }];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
} isPushDetails:NO];
} }
......
total/GTOApp/Business/NewOrderViewController.m
View file @ 5073603b
...@@ -454,33 +454,35 @@ ...@@ -454,33 +454,35 @@
- (void)saveOrderRequest:(NSDictionary *)dict orderDetails:(OrderBill *)order - (void)saveOrderRequest:(NSDictionary *)dict orderDetails:(OrderBill *)order
{ {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[IBTLoadingView showProgressLabel:@"正在提交..."]; [self showAlertViewController:@"确定提交该订油单吗？" withCompleted:^{
ICRUserUtil *user = [ICRUserUtil sharedInstance]; [IBTLoadingView showProgressLabel:@"正在提交..."];
RsOperateInfo *commit = [[RsOperateInfo alloc]init]; ICRUserUtil *user = [ICRUserUtil sharedInstance];
commit.operId = user.f_user_uuid; RsOperateInfo *commit = [[RsOperateInfo alloc]init];
commit.operName = user.f_user_name; commit.operId = user.f_user_uuid;
commit.time = [GTOCommonTools GetCurrenttime]; commit.operName = user.f_user_name;
commit.enterprise = user.f_enterprise_uuid; commit.time = [GTOCommonTools GetCurrenttime];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/orderBill/submit/%@",HTTP_REST_API_BASE_URL,dict[@"uuid"]] withRequestType:ZERO withParameter:[commit toDictionary] withSuccess:^(id returnValue) { commit.enterprise = user.f_enterprise_uuid;
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/orderBill/submit/%@",HTTP_REST_API_BASE_URL,dict[@"uuid"]] withRequestType:ZERO withParameter:[commit toDictionary] withSuccess:^(id returnValue) {
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.boolValue = YES;
orderDetail.title = @"订油单详情";
[weakSelf PushViewController:orderDetail animated:YES];
});
} else { if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:returnValue[@"message"]]; [IBTLoadingView hideHUDWithText:@"提交成功"];
[weakSelf gotoOrderDetail:dict[@"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 = dict[@"uuid"];
} withFailed:^(NSError *failed) { orderDetail.boolValue = YES;
[IBTLoadingView hideHUDWithText:@"提交失败"]; orderDetail.title = @"订油单详情";
[IBTLoadingView showTextOnly:failed.localizedDescription]; [weakSelf PushViewController:orderDetail animated:YES];
});
} else {
[IBTLoadingView hideHUDWithText:returnValue[@"message"]];
[weakSelf gotoOrderDetail:dict[@"uuid"]];
}
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:@"提交失败"];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
}]; }];
} }
......
total/GTOApp/Business/NewRequestViewController.m
View file @ 5073603b
...@@ -621,35 +621,38 @@ ...@@ -621,35 +621,38 @@
- (void)commitOrder - (void)commitOrder
{ {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self saveOrderBill:NO returnSaveSateBlock:^(NSDictionary *dict, DepotRequestBill *orderbBill) { [self showAlertViewController:@"确定提交该建仓申请单吗?" withCompleted:^{
[IBTLoadingView showProgressLabel:@"提交中..."]; [weakSelf saveOrderBill:NO returnSaveSateBlock:^(NSDictionary *dict, DepotRequestBill *orderbBill) {
RsOperateInfo *submitOrder = [[RsOperateInfo alloc]init];
ICRUserUtil *user = [ICRUserUtil sharedInstance];
submitOrder.operId = user.f_user_uuid;
submitOrder.operName = user.f_user_name;
submitOrder.time = [GTOCommonTools GetCurrenttime];
submitOrder.enterprise = user.f_enterprise_uuid;
NSLog(@"%@",[submitOrder toDictionary]);
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/depotRequest/submit/%@",HTTP_REST_API_BASE_URL,dict[@"uuid"]] withRequestType:ZERO withParameter:[submitOrder toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) { [IBTLoadingView showProgressLabel:@"提交中..."];
[IBTLoadingView hideHUDWithText:@"提交成功"]; RsOperateInfo *submitOrder = [[RsOperateInfo alloc]init];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ ICRUserUtil *user = [ICRUserUtil sharedInstance];
SeeRequestViewController *details = [weakSelf.storyboard instantiateViewControllerWithIdentifier:@"SeeRequestViewController"]; submitOrder.operId = user.f_user_uuid;
details.orderUUID = dict[@"uuid"]; submitOrder.operName = user.f_user_name;
details.title = @"查看建仓单详情"; submitOrder.time = [GTOCommonTools GetCurrenttime];
details.boolValue = YES; submitOrder.enterprise = user.f_enterprise_uuid;
[weakSelf PushViewController:details animated:YES]; NSLog(@"%@",[submitOrder toDictionary]);
}); [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/depotRequest/submit/%@",HTTP_REST_API_BASE_URL,dict[@"uuid"]] withRequestType:ZERO withParameter:[submitOrder toDictionary] withSuccess:^(id returnValue) {
} else { if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:returnValue[@"message"]]; [IBTLoadingView hideHUDWithText:@"提交成功"];
[weakSelf saveOrderSuccess:dict[@"uuid"]]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
} SeeRequestViewController *details = [weakSelf.storyboard instantiateViewControllerWithIdentifier:@"SeeRequestViewController"];
} withFailed:^(NSError *failed) { details.orderUUID = dict[@"uuid"];
[IBTLoadingView hideHUDWithText:nil]; details.title = @"查看建仓单详情";
[IBTLoadingView showTextOnly:failed.localizedDescription]; details.boolValue = YES;
[weakSelf PushViewController:details animated:YES];
});
} else {
[IBTLoadingView hideHUDWithText:returnValue[@"message"]];
[weakSelf saveOrderSuccess:dict[@"uuid"]];
}
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
}]; }];
}]; }];
} }
......
total/GTOApp/Business/OrderDetailsViewController.m
View file @ 5073603b
...@@ -460,29 +460,32 @@ ...@@ -460,29 +460,32 @@
- (void)saveOrderRequest:(NSDictionary *)dict orderDetails:(OrderBill *)order - (void)saveOrderRequest:(NSDictionary *)dict orderDetails:(OrderBill *)order
{ {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[IBTLoadingView showProgressLabel:@"正在提交..."]; [self showAlertViewController:@"确定提交该订油单吗？" withCompleted:^{
ICRUserUtil *user = [ICRUserUtil sharedInstance]; [IBTLoadingView showProgressLabel:@"正在提交..."];
RsOperateInfo *commit = [[RsOperateInfo alloc]init]; ICRUserUtil *user = [ICRUserUtil sharedInstance];
commit.operId = user.f_user_uuid; RsOperateInfo *commit = [[RsOperateInfo alloc]init];
commit.operName = user.f_user_name; commit.operId = user.f_user_uuid;
commit.time = [GTOCommonTools GetCurrenttime]; commit.operName = user.f_user_name;
commit.enterprise = user.f_enterprise_uuid; commit.time = [GTOCommonTools GetCurrenttime];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/orderBill/submit/%@",HTTP_REST_API_BASE_URL,dict[@"uuid"]] withRequestType:ZERO withParameter:[commit toDictionary] withSuccess:^(id returnValue) { commit.enterprise = user.f_enterprise_uuid;
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/orderBill/submit/%@",HTTP_REST_API_BASE_URL,dict[@"uuid"]] withRequestType:ZERO withParameter:[commit toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:@"提交成功"];
[weakSelf gotoOrderDetail:dict[@"uuid"]];
} else { if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:returnValue[@"message"]]; [IBTLoadingView hideHUDWithText:@"提交成功"];
[weakSelf gotoOrderDetail:dict[@"uuid"]]; [weakSelf gotoOrderDetail:dict[@"uuid"]];
}
} else {
} withFailed:^(NSError *failed) { [IBTLoadingView hideHUDWithText:returnValue[@"message"]];
[IBTLoadingView hideHUDWithText:@"提交失败"]; [weakSelf gotoOrderDetail:dict[@"uuid"]];
[IBTLoadingView showTextOnly:failed.localizedDescription]; }
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:@"提交失败"];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
}]; }];
} }
#pragma mark - 订油量输入 #pragma mark - 订油量输入
- (void)textFieldEndEditing:(UITextField *)textField - (void)textFieldEndEditing:(UITextField *)textField
{ {
...@@ -511,35 +514,37 @@ ...@@ -511,35 +514,37 @@
- (void)deleteOrderBill - (void)deleteOrderBill
{ {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self userSureDeleteOrCancelOperation:@"删除" returnBlock:^{ [self showAlertViewController:@"确定删除该订油单吗？" withCompleted:^{
[weakSelf userSureDeleteOrCancelOperation:@"删除" returnBlock:^{
[IBTLoadingView showProgressLabel:@"删除中..."];
ICRUserUtil *user = [ICRUserUtil sharedInstance];
//操作人信息
RsOperateInfo *info = [[RsOperateInfo alloc]init];
info.operId = user.f_user_uuid;
info.time = [GTOCommonTools GetCurrenttime];
info.operName = user.f_user_name;
info.enterprise = user.f_enterprise_uuid;
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/orderBill/remove/%@",HTTP_REST_API_BASE_URL,self.orderDetails.uuid] withRequestType:ZERO withParameter:[info toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) { [IBTLoadingView showProgressLabel:@"删除中..."];
[IBTLoadingView hideHUDWithText:@"删除成功"]; ICRUserUtil *user = [ICRUserUtil sharedInstance];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ //操作人信息
if (weakSelf.boolValue) { RsOperateInfo *info = [[RsOperateInfo alloc]init];
[weakSelf PopToRootViewControllerAnimated:YES]; info.operId = user.f_user_uuid;
} else { info.time = [GTOCommonTools GetCurrenttime];
[weakSelf returnUUIDsingAfterDeleteOrCancel:YES]; info.operName = user.f_user_name;
[weakSelf PopViewControllerAnimated:YES]; info.enterprise = user.f_enterprise_uuid;
} [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/orderBill/remove/%@",HTTP_REST_API_BASE_URL,weakSelf.orderDetails.uuid] withRequestType:ZERO withParameter:[info toDictionary] withSuccess:^(id returnValue) {
});
} else { if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:@"删除成功"];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (weakSelf.boolValue) {
[weakSelf PopToRootViewControllerAnimated:YES];
} else {
[weakSelf returnUUIDsingAfterDeleteOrCancel:YES];
[weakSelf PopViewControllerAnimated:YES];
}
});
} else {
[IBTLoadingView hideHUDWithText:@"删除失败"];
}
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:@"删除失败"]; [IBTLoadingView hideHUDWithText:@"删除失败"];
} [IBTLoadingView showTextOnly:failed.localizedDescription];
}];
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:@"删除失败"];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}]; }];
}]; }];
} }
......
total/GTOApp/Business/SeeObtainViewController.m
View file @ 5073603b
...@@ -1027,35 +1027,38 @@ ...@@ -1027,35 +1027,38 @@
- (void)commitRecevieOrder - (void)commitRecevieOrder
{ {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self saveReceiveOrder:^(NSString *uuidString) { [self showAlertViewController:@"确定提交该收油单吗？" withCompleted:^{
RsOperateInfo *user = [[RsOperateInfo alloc]init]; [weakSelf saveReceiveOrder:^(NSString *uuidString) {
user.operName = [ICRUserUtil sharedInstance].f_user_name; RsOperateInfo *user = [[RsOperateInfo alloc]init];
user.operId = [ICRUserUtil sharedInstance].f_user_uuid; user.operName = [ICRUserUtil sharedInstance].f_user_name;
user.enterprise = [ICRUserUtil sharedInstance].f_enterprise_uuid; user.operId = [ICRUserUtil sharedInstance].f_user_uuid;
user.time = [GTOCommonTools GetCurrenttime]; user.enterprise = [ICRUserUtil sharedInstance].f_enterprise_uuid;
[IBTLoadingView showProgressLabel:@"提交中..."]; user.time = [GTOCommonTools GetCurrenttime];
[IBTLoadingView showProgressLabel:@"提交中..."];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/receiveBill/submit/%@",HTTP_REST_API_BASE_URL,uuidString] withRequestType:ZERO withParameter:[user toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) { [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/receiveBill/submit/%@",HTTP_REST_API_BASE_URL,uuidString] withRequestType:ZERO withParameter:[user toDictionary] withSuccess:^(id returnValue) {
[IBTLoadingView hideHUDWithText:@"提交成功"]; if ([returnValue[@"success"] isEqualToNumber:@1]) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [IBTLoadingView hideHUDWithText:@"提交成功"];
SeeObtainViewController *orderBill = [weakSelf.storyboard instantiateViewControllerWithIdentifier:@"SeeObtainViewController"]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
orderBill.orderUUIDString = uuidString; SeeObtainViewController *orderBill = [weakSelf.storyboard instantiateViewControllerWithIdentifier:@"SeeObtainViewController"];
orderBill.isReturnRootVC = YES; orderBill.orderUUIDString = uuidString;
orderBill.storeDict = self.storeDict;//油站 orderBill.isReturnRootVC = YES;
[weakSelf PushViewController:orderBill animated:YES]; orderBill.storeDict = weakSelf.storeDict;//油站
}); [weakSelf PushViewController:orderBill animated:YES];
});
} else {
[IBTLoadingView hideHUDWithText:returnValue[@"message"]];
[weakSelf saveOrderSuccess:uuidString];
}
} else { } withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:returnValue[@"message"]]; [IBTLoadingView showTextOnly:failed.localizedDescription];
[weakSelf saveOrderSuccess:uuidString]; }];
}
} withFailed:^(NSError *failed) { } isPushDetails:NO];
[IBTLoadingView showTextOnly:failed.localizedDescription]; }];
}];
} isPushDetails:NO];
} }
#pragma mark -保存收油单成功 #pragma mark -保存收油单成功
...@@ -1138,35 +1141,37 @@ ...@@ -1138,35 +1141,37 @@
- (void)deleteOrder - (void)deleteOrder
{ {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self userSureDeleteOrCancelOperation:@"删除" returnBlock:^{ [self showAlertViewController:@"确定删除该收油单吗？" withCompleted:^{
[IBTLoadingView showProgressLabel:@"删除中..."]; [weakSelf userSureDeleteOrCancelOperation:@"删除" returnBlock:^{
ICRUserUtil *user = [ICRUserUtil sharedInstance]; [IBTLoadingView showProgressLabel:@"删除中..."];
//操作人信息 ICRUserUtil *user = [ICRUserUtil sharedInstance];
RsOperateInfo *info = [[RsOperateInfo alloc]init]; //操作人信息
info.operId = user.f_user_uuid; RsOperateInfo *info = [[RsOperateInfo alloc]init];
info.time = [GTOCommonTools GetCurrenttime]; info.operId = user.f_user_uuid;
info.operName = user.f_user_name; info.time = [GTOCommonTools GetCurrenttime];
info.enterprise = user.f_enterprise_uuid; info.operName = user.f_user_name;
info.enterprise = user.f_enterprise_uuid;
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/receiveBill/remove/%@",HTTP_REST_API_BASE_URL,self.orderDetails.uuid] withRequestType:ZERO withParameter:[info toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) { [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/receiveBill/remove/%@",HTTP_REST_API_BASE_URL,weakSelf.orderDetails.uuid] withRequestType:ZERO withParameter:[info toDictionary] withSuccess:^(id returnValue) {
[IBTLoadingView hideHUDWithText:@"删除成功"];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ if ([returnValue[@"success"] isEqualToNumber:@1]) {
if (weakSelf.orderStateBoolValue) { [IBTLoadingView hideHUDWithText:@"删除成功"];
[weakSelf PopToRootViewControllerAnimated:YES]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
} else { if (weakSelf.orderStateBoolValue) {
[weakSelf returnUUIDsingAfterDeleteOrCancel:YES]; [weakSelf PopToRootViewControllerAnimated:YES];
[weakSelf PopViewControllerAnimated:YES]; } else {
} [weakSelf returnUUIDsingAfterDeleteOrCancel:YES];
}); [weakSelf PopViewControllerAnimated:YES];
} else { }
});
} else {
[IBTLoadingView hideHUDWithText:@"删除失败"];
}
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:@"删除失败"]; [IBTLoadingView hideHUDWithText:@"删除失败"];
} [IBTLoadingView showTextOnly:failed.localizedDescription];
}];
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:@"删除失败"];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}]; }];
}]; }];
} }
......
total/GTOApp/Business/SeeRequestViewController.m
View file @ 5073603b
...@@ -228,32 +228,34 @@ ...@@ -228,32 +228,34 @@
- (void)cancelOrder - (void)cancelOrder
{ {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self userSureDeleteOrCancelOperation:@"作废" returnBlock:^{ [self showAlertViewController:@"确定作废该建仓申请单吗？" withCompleted:^{
[IBTLoadingView showProgressLabel:@"作废中..."]; [weakSelf userSureDeleteOrCancelOperation:@"作废" returnBlock:^{
//操作人 [IBTLoadingView showProgressLabel:@"作废中..."];
RsOperateInfo *infomation = [[RsOperateInfo alloc]init]; //操作人
ICRUserUtil *user = [ICRUserUtil sharedInstance]; RsOperateInfo *infomation = [[RsOperateInfo alloc]init];
infomation.operId = user.f_user_uuid; ICRUserUtil *user = [ICRUserUtil sharedInstance];
infomation.operName = user.f_user_name; infomation.operId = user.f_user_uuid;
infomation.enterprise = user.f_enterprise_uuid; infomation.operName = user.f_user_name;
infomation.time = [GTOCommonTools GetCurrenttime]; infomation.enterprise = user.f_enterprise_uuid;
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/depotRequest/cancel/%@",HTTP_REST_API_BASE_URL,self.orderUUID] withRequestType:ZERO withParameter:[infomation toDictionary] withSuccess:^(id returnValue) { infomation.time = [GTOCommonTools GetCurrenttime];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/depotRequest/cancel/%@",HTTP_REST_API_BASE_URL,weakSelf.orderUUID] withRequestType:ZERO withParameter:[infomation toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:@"作废成功"]; if ([returnValue[@"success"] isEqualToNumber:@1]) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [IBTLoadingView hideHUDWithText:@"作废成功"];
weakSelf.boolValue?[weakSelf PopToRootViewControllerAnimated:YES]:[weakSelf PopViewControllerAnimated:YES]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[weakSelf returnUUIDsingAfterDeleteOrCancel:NO]; weakSelf.boolValue?[weakSelf PopToRootViewControllerAnimated:YES]:[weakSelf PopViewControllerAnimated:YES];
}); [weakSelf returnUUIDsingAfterDeleteOrCancel:NO];
});
} else {
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTextOnly:returnValue[@"message"]];
}
} else { } withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:nil]; [IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTextOnly:returnValue[@"message"]]; [IBTLoadingView showTextOnly:failed.localizedDescription];
} }];
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}]; }];
}]; }];
} }
...@@ -262,35 +264,36 @@ ...@@ -262,35 +264,36 @@
- (void)deleteOrder - (void)deleteOrder
{ {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self userSureDeleteOrCancelOperation:@"删除" returnBlock:^{ [self showAlertViewController:@"确定删除该建仓申请单吗？" withCompleted:^{
[IBTLoadingView showProgressLabel:@"删除中..."]; [weakSelf userSureDeleteOrCancelOperation:@"删除" returnBlock:^{
//操作人 [IBTLoadingView showProgressLabel:@"删除中..."];
RsOperateInfo *infomation = [[RsOperateInfo alloc]init]; //操作人
ICRUserUtil *user = [ICRUserUtil sharedInstance]; RsOperateInfo *infomation = [[RsOperateInfo alloc]init];
infomation.operId = user.f_user_uuid; ICRUserUtil *user = [ICRUserUtil sharedInstance];
infomation.operName = user.f_user_name; infomation.operId = user.f_user_uuid;
infomation.enterprise = user.f_enterprise_uuid; infomation.operName = user.f_user_name;
infomation.time = [GTOCommonTools GetCurrenttime]; infomation.enterprise = user.f_enterprise_uuid;
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/depotRequest/remove/%@",HTTP_REST_API_BASE_URL,self.orderUUID] withRequestType:ZERO withParameter:[infomation toDictionary] withSuccess:^(id returnValue) { infomation.time = [GTOCommonTools GetCurrenttime];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/depotRequest/remove/%@",HTTP_REST_API_BASE_URL,weakSelf.orderUUID] withRequestType:ZERO withParameter:[infomation toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:@"删除成功"];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
weakSelf.boolValue?[weakSelf PopToRootViewControllerAnimated:YES]:[weakSelf PopViewControllerAnimated:YES];
[weakSelf returnUUIDsingAfterDeleteOrCancel:YES];
});
} else { if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:@"删除成功"];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
weakSelf.boolValue?[weakSelf PopToRootViewControllerAnimated:YES]:[weakSelf PopViewControllerAnimated:YES];
[weakSelf returnUUIDsingAfterDeleteOrCancel:YES];
});
} else {
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTextOnly:returnValue[@"message"]];
}
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:nil]; [IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTextOnly:returnValue[@"message"]]; [IBTLoadingView showTextOnly:failed.localizedDescription];
} }];
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}]; }];
}]; }];
} }
......
total/GTOApp/UserUtil/BaseViewController.h
View file @ 5073603b
...@@ -10,4 +10,13 @@ ...@@ -10,4 +10,13 @@
@interface BaseViewController : UIViewController @interface BaseViewController : UIViewController
/**
* UIAlertView
*
* @param message 提示信息
* @param completed 完成回调
*/
- (void)showAlertViewController:(NSString *)message withCompleted:(void(^)())completed;
@end @end
total/GTOApp/UserUtil/BaseViewController.m
View file @ 5073603b
...@@ -45,6 +45,28 @@ ...@@ -45,6 +45,28 @@
} }
} }
#pragma mark -UIAlertView
- (void)showAlertViewController:(NSString *)message withCompleted:(void(^)())completed
{
UIAlertController *alertVc = [UIAlertController alertControllerWithTitle:@"提示" message:message preferredStyle:UIAlertControllerStyleAlert];
[alertVc addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil]];
[alertVc addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
if (completed) {
completed();
}
}]];
[self presentViewController:alertVc animated:YES completion:nil];
}
#pragma mark -设置共用属性 #pragma mark -设置共用属性
- (void)uiConfigAction - (void)uiConfigAction
{ {
......
total/Macro/GTOAppMacro.h
View file @ 5073603b
...@@ -84,12 +84,12 @@ ...@@ -84,12 +84,12 @@
//#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:7080" //#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_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.39.77:8180"
//开发环境 //开发环境
#define HTTP_LOCAL_BASE_URL @"http://139.196.195.30:8093" //#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_REST_API_BASE_URL @"http://139.196.195.30:8093/total-server/rest"
#define HTTP_WEATHER_URL @"http://apis.baidu.com/heweather/weather/free" #define HTTP_WEATHER_URL @"http://apis.baidu.com/heweather/weather/free"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment