Skip to content

T
total
Commit 2c9621f9 authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：修复油价显示问题、建仓申请切换接口增加时间控制

parent 07989fcf
Hide whitespace changes
Inline Side-by-side
Showing with 860 additions and 663 deletions
total.xcodeproj/project.pbxproj
View file @ 2c9621f9
......@@ -2592,6 +2592,7 @@
3506ECBD1BA00E3400897EBE = {
CreatedOnToolsVersion = 6.4;
DevelopmentTeam = W54V2VB863;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
......@@ -3123,8 +3124,9 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
......@@ -3140,7 +3142,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = 1;
......@@ -3154,8 +3157,9 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
......@@ -3171,7 +3175,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
......
total/GTOApp/Business/BusinessStoryBoard.storyboard
View file @ 2c9621f9
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
<!--Business View Controller-->
......@@ -145,30 +145,6 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="油品" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="STi-k1-UK0">
<rect key="frame" x="8" y="48" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="国牌价" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0vm-4M-0st">
<rect key="frame" x="127" y="48" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.50588235290000005" green="0.76862745099999996" blue="0.21960784310000001" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="批发价" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="sKo-43-958">
<rect key="frame" x="247" y="48" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.10980392160000001" green="0.50196078430000002" blue="0.91764705879999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="CTb-5w-Zn4">
<rect key="frame" x="8" y="83" width="359" height="216"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
......@@ -204,6 +180,51 @@
</collectionViewCell>
</cells>
</collectionView>
<view contentMode="scaleToFill" id="TU0-OB-sCQ">
<rect key="frame" x="8" y="48" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="油品" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="STi-k1-UK0">
<rect key="frame" x="0.0" y="0.0" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
</view>
<view contentMode="scaleToFill" id="2qR-c5-wFZ">
<rect key="frame" x="127" y="48" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="国牌价" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="CG7-2D-14f">
<rect key="frame" x="0.0" y="0.0" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.50588235290000005" green="0.76862745099999996" blue="0.21960784310000001" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.51372549019607838" green="0.76078431372549016" blue="0.2627450980392157" alpha="1" colorSpace="calibratedRGB"/>
</view>
<view contentMode="scaleToFill" id="qN4-Up-uYI">
<rect key="frame" x="247" y="48" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="批发价" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uGn-ip-5af">
<rect key="frame" x="0.0" y="0.0" width="120" height="35"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.10980392160000001" green="0.50196078430000002" blue="0.91764705879999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.14901960784313725" green="0.51372549019607838" blue="0.90588235294117647" alpha="1" colorSpace="calibratedRGB"/>
</view>
</subviews>
</tableViewCellContentView>
<connections>
......
total/GTOApp/Business/NewRequestViewController.m
View file @ 2c9621f9
......@@ -31,7 +31,7 @@
/**
* 配送区域数据源
*/
@property (nonatomic,strong) NSArray *distributionArray;
@property (nonatomic,strong) NSMutableArray *distributionArray;
/**
* 油品列表信息
......@@ -88,20 +88,28 @@
dispatch_queue_t queue = dispatch_queue_create("顺序执行", DISPATCH_QUEUE_SERIAL);
dispatch_group_t group = dispatch_group_create();
//任务1->获取配送区域
dispatch_group_async(group, queue, ^{
dispatch_suspend(queue);
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@%@",HTTP_REST_API_BASE_URL,DISTRIBUTION] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) {
weakSelf.distributionArray = returnValue[@"data"];
} else {
[IBTLoadingView showTextOnly:returnValue[@"message"]];
}
dispatch_resume(queue);
} withFailed:^(NSError *failed) {
dispatch_resume(queue);
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
});
if (![[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
dispatch_group_async(group, queue, ^{
dispatch_suspend(queue);
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@%@",HTTP_REST_API_BASE_URL,DISTRIBUTION] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) {
weakSelf.distributionArray = returnValue[@"data"];
} else {
[IBTLoadingView showTextOnly:returnValue[@"message"]];
}
dispatch_resume(queue);
} withFailed:^(NSError *failed) {
dispatch_resume(queue);
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
});
}else {
self.distributionArray = [NSMutableArray array];
for (NSDictionary *dict in [ICRUserUtil sharedInstance].storeArray) {
[self.distributionArray addObject:dict[@"deliveryArea"]];
}
}
//任务二->获得油品信息
dispatch_group_async(group, queue, ^{
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@%@",HTTP_REST_API_BASE_URL,OILTYPE] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
......@@ -146,8 +154,20 @@
QueryCondition *priceCategory = [[QueryCondition alloc]init];
priceCategory.operation = @"categoryEquals";
priceCategory.parameters = @[@"generalTradePrice"];
query.conditions = (NSArray<QueryCondition> *)@[condition,oilType,priceCategory];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@%@",HTTP_REST_API_BASE_URL,OILPRICE] withRequestType:ZERO withParameter:[query toDictionary] withSuccess:^(id returnValue) {
TimeSelectTableViewCell *timeCell = [self.createWarehouseTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:2 inSection:0]];
//开始时间
QueryCondition *beginDate = [[QueryCondition alloc]init];
beginDate.operation = @"effectiveStartTimeLess";
beginDate.parameters = @[[NSString stringWithFormat:@"%@ 00:00:00",timeCell.beginTimeButton.currentTitle]];
//结束时间
QueryCondition *endDate = [[QueryCondition alloc]init];
endDate.operation = @"effectiveEndTimeMore";
endDate.parameters = @[[NSString stringWithFormat:@"%@ 23:59:59",timeCell.endTimeButton.currentTitle]];
query.conditions = (NSArray<QueryCondition> *)@[condition,oilType,priceCategory,beginDate,endDate];
NSLog(@"%@",[query toDictionary]);
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@%@",HTTP_REST_API_BASE_URL,DEPOTREQUEST] withRequestType:ZERO withParameter:[query toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) {
weakSelf.oilPrice = [[QueryResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
......
total/GTOApp/Business/SeePriceDetailsTableViewCell.h
View file @ 2c9621f9
......@@ -38,4 +38,8 @@
*/
@property (weak, nonatomic) IBOutlet UIImageView *storeImageView;
@property (weak, nonatomic) IBOutlet UILabel *oilLabel;
@end
total/GTOApp/Business/SeePriceDetailsTableViewCell.m
View file @ 2c9621f9
......@@ -34,9 +34,19 @@
NSArray *array = _datasResult.records;
[self.datasArray removeAllObjects];
for (NSDictionary *dict in array) {
[self.datasArray addObject:[[dict objectForKey:@"item"] objectForKey:@"name"]];
[self.datasArray addObject:[[dict objectForKey:@"guidancePrice"] stringValue]];
[self.datasArray addObject:[[dict objectForKey:@"salePrice"] stringValue]];
for (NSDictionary *dict2 in array) {
if ([dict[@"item"][@"name"] isEqualToString:dict2[@"item"][@"name"]]) {
if (([dict[@"category"] isEqualToString:@"salePrice"] && [dict2[@"category"] isEqualToString:@"generalTradePrice"]) || ([dict2[@"category"] isEqualToString:@"salePrice"] && [dict[@"category"] isEqualToString:@"generalTradePrice"])) {
NSString *name = [[dict objectForKey:@"item"] objectForKey:@"name"];
if ([self.datasArray containsObject:name]) {
break;
}
[self.datasArray addObject:name];
[self.datasArray addObject:[[dict objectForKey:@"guidancePrice"] stringValue]];
[self.datasArray addObject:[[dict2 objectForKey:@"salePrice"] stringValue]];break;
}
}
}
}
[self.priceDetailsCollectionView reloadData];
}
......@@ -65,7 +75,6 @@
}
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
......
total/GTOApp/Business/SeePriceViewController.m
View file @ 2c9621f9
......@@ -24,7 +24,7 @@
/**
* 行政区域数据源
*/
@property (nonatomic,strong) NSArray *administrativeArray;
@property (nonatomic,strong) NSMutableArray *administrativeArray;
/**
* 弹出框
......@@ -39,7 +39,7 @@
/**
* 配送区域数据源
*/
@property (nonatomic,strong) NSArray *distributionArray;
@property (nonatomic,strong) NSMutableArray *distributionArray;
/**
* 记录选择配送区
......@@ -51,17 +51,13 @@
*/
@property (nonatomic,strong) NSDictionary *administrativeArea;
/**
* 油站列表信息
*/
@property (nonatomic,strong) NSArray *oilListDatas;
@end
@implementation SeePriceViewController
#pragma mark - lazy
- (NSArray *)titleArray
{
if (!_titleArray) {
......@@ -70,13 +66,40 @@
return _titleArray;
}
- (NSMutableArray *)administrativeArray
{
if (!_administrativeArray) {
_administrativeArray = [NSMutableArray array];
for (NSDictionary *dict in [ICRUserUtil sharedInstance].storeArray) {
if (![_administrativeArray containsObject:dict[@"area"]]) {
[_administrativeArray addObject:dict[@"area"]];
}
}
}
return _administrativeArray;
}
- (NSMutableArray *)distributionArray
{
if (!_distributionArray) {
_distributionArray = [NSMutableArray array];
for (NSDictionary *dict in [ICRUserUtil sharedInstance].storeArray) {
if (![_distributionArray containsObject:dict[@"deliveryArea"]]) {
[_distributionArray addObject:dict[@"deliveryArea"]];
}
}
}
return _distributionArray;
}
- (void)viewDidLoad {
[super viewDidLoad];
[self uiConfigAction];
[self netWorkRequest];
if (![[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
[self netWorkRequest];
}
}
#pragma mark -UI
......@@ -92,6 +115,8 @@
#pragma mark -获取配送区域数据、获取行政区域数据
- (void)netWorkRequest
{
[self.administrativeArray removeAllObjects];
[self.distributionArray removeAllObjects];
WS(weakSelf);
[IBTLoadingView showProgressLabel:@"正在加载..."];
dispatch_queue_t aQueue = dispatch_queue_create("顺序执行", DISPATCH_QUEUE_SERIAL);
......@@ -115,6 +140,7 @@
dispatch_suspend(aQueue);
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@%@",HTTP_REST_API_BASE_URL,ADMINISTRATIVE] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
dispatch_resume(aQueue);
[IBTLoadingView hideHUDWithText:nil];
if ([returnValue[@"success"] isEqualToNumber:@1]) {
NSArray *array = returnValue[@"data"];
NSMutableArray *tempArray = [NSMutableArray array];
......@@ -128,47 +154,33 @@
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
});
//任务3->获取油站列表
dispatch_group_async(queueGroup, aQueue, ^{
dispatch_suspend(aQueue);
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/store/getsByUser/%@",HTTP_REST_API_BASE_URL,[ICRUserUtil sharedInstance].f_user_uuid] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
dispatch_resume(aQueue);
if ([returnValue[@"success"] isEqualToNumber:@1]) {
weakSelf.oilListDatas = returnValue[@"data"];
[weakSelf.seePriceTableview reloadData];
}
} withFailed:^(NSError *failed) {
dispatch_resume(aQueue);
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
});
//任务4->获取油价列表/默认加载全部
dispatch_group_async(queueGroup, aQueue, ^{
NSDictionary *queryDictionary = nil;
if ([[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
queryDictionary = @{@"pageSize" : @0,
@"orders" : @[@{@"field" : @"string",
@"direction" : @"asc"}],
@"conditions" : @[
@{@"operation":@"userId",
@"parameters":@[[ICRUserUtil sharedInstance].f_user_uuid]
}
],
@"pageNumber" : @0};
}else
{
queryDictionary = @{@"pageSize" : @0,
@"orders" : @[@{@"field" : @"string",
@"direction" : @"asc"}],
@"conditions" : @[
@{@"operation":[NSNull null],
@"parameters":[NSNull null]
}
],
@"pageNumber" : @0};
}
[self getOilPriceDatas:queryDictionary];
});
// //任务4->获取油价列表/默认加载全部
// dispatch_group_async(queueGroup, aQueue, ^{
// NSDictionary *queryDictionary = nil;
// if ([[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
// queryDictionary = @{@"pageSize" : @0,
// @"orders" : @[@{@"field" : @"string",
// @"direction" : @"asc"}],
// @"conditions" : @[
// @{@"operation":@"userId",
// @"parameters":@[[ICRUserUtil sharedInstance].f_user_uuid]
// }
// ],
// @"pageNumber" : @0};
// }else
// {
// queryDictionary = @{@"pageSize" : @0,
// @"orders" : @[@{@"field" : @"string",
// @"direction" : @"asc"}],
// @"conditions" : @[
// @{@"operation":[NSNull null],
// @"parameters":[NSNull null]
// }
// ],
// @"pageNumber" : @0};
// }
// [self getOilPriceDatas:queryDictionary];
// });
}
#pragma mark -获取油价数据
......@@ -194,13 +206,14 @@
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
ICRUserUtil *user = [ICRUserUtil sharedInstance];
if (indexPath.row == 3) {
SeePriceDetailsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"SeePriceDetailsTableViewCell" forIndexPath:indexPath];
cell.separatorInset = UIEdgeInsetsMake(0, ScreenSize.width, 0, 0);
cell.selectionStyle = UITableViewCellSelectionStyleNone;
cell.storeName.text = [self.oilListDatas firstObject][@"name"];
cell.storeImageView.hidden = self.oilListDatas.count > 1;
cell.storeName.hidden = self.oilListDatas.count > 1;
cell.storeName.text = [user.storeArray firstObject][@"name"];
cell.storeImageView.hidden = user.storeArray.count > 1;
cell.storeName.hidden = user.storeArray.count > 1;
cell.datasResult = self.oilPriceObjec;
return cell;
}else {
......@@ -216,17 +229,16 @@
cell.backgroundColor = RGBA(251, 244, 228, 1);
cell.distributionAreaContent.text = [GTOCommonTools GetCurrenttime];
cell.distributionAreaContent.font = [UIFont systemFontOfSize:17];
}else
{
}else{
cell.backgroundColor = [UIColor whiteColor];
}
//区分是否是油站经理调用
if (self.oilListDatas.count == 1 && [[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
if (user.storeArray.count == 1 && [[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
if (indexPath.row == 0) {
cell.distributionAreaContent.text = self.oilListDatas[0][@"deliveryArea"][@"name"];
cell.distributionAreaContent.text = user.storeArray[0][@"deliveryArea"][@"name"];
}
if (indexPath.row == 1) {
cell.distributionAreaContent.text = [NSString stringWithFormat:@"[%@]%@",self.oilListDatas[0][@"area"][@"uuid"],self.oilListDatas[0][@"area"][@"name"]];
cell.distributionAreaContent.text = [NSString stringWithFormat:@"[%@]%@",user.storeArray[0][@"area"][@"uuid"],user.storeArray[0][@"area"][@"name"]];
}
cell.userInteractionEnabled = NO;
}
......@@ -255,6 +267,7 @@
if (indexPath.row == 0) {
PromptTableViewController *selectArea = [[PromptTableViewController alloc]init];
selectArea.title = @"选择配送区域";
selectArea.currentTitle = [cell.distributionAreaContent.text isEqualToString:@"请选择"]?nil:cell.distributionAreaContent.text;
NSMutableArray *tempArray = [NSMutableArray array];
for (NSDictionary *dict in self.distributionArray) {
[tempArray addObject:dict[@"name"]];
......@@ -275,21 +288,46 @@
}
if (indexPath.row == 1) {
CustomSelectCityViewController *selectCity = [[CustomSelectCityViewController alloc]init];
//选择行政区域后回调
[selectCity setCompleteSelectCityBlock:^(NSArray *array) {
weakSelf.administrativeArea = [array lastObject];
cell.distributionAreaContent.text = [NSString stringWithFormat:@"[%@]%@[%@]%@",[array[0] objectForKey:@"uuid"],[array[0] objectForKey:@"name"],[array[1] objectForKey:@"code"],[array[1] objectForKey:@"name"]];
[weakSelf getQueryDictionary]?[IBTLoadingView showProgressLabel:@"查询中..."]:nil;
[weakSelf getQueryDictionary]?[weakSelf getOilPriceDatas:[weakSelf getQueryDictionary]]:nil;
}];
selectCity.preferredContentSize = CGSizeMake(ScreenSize.width, 200);
selectCity.datasArray = self.administrativeArray;
self.settingsPopoverController = [[WYPopoverController alloc] initWithContentViewController:selectCity];
self.settingsPopoverController.popoverLayoutMargins = UIEdgeInsetsMake(10, 20, 10, 20);
self.settingsPopoverController.wantsDefaultContentAppearance = NO;
[self.settingsPopoverController presentPopoverAsDialogAnimated:YES
options:WYPopoverAnimationOptionFadeWithScale];
if ([[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
PromptTableViewController *selectArea = [[PromptTableViewController alloc]init];
selectArea.title = @"选择行政区域";
selectArea.currentTitle = [cell.distributionAreaContent.text isEqualToString:@"请选择"]?nil:cell.distributionAreaContent.text;
NSMutableArray *tempArray = [NSMutableArray array];
for (NSDictionary *dict in self.administrativeArray) {
[tempArray addObject:dict[@"name"]];
}
selectArea.datasArray = tempArray;
[selectArea setSelectCellTitle:^(NSString *title,NSInteger cellindex) {
cell.distributionAreaContent.text = title?title:@"请选择";
weakSelf.administrativeArea = [weakSelf.administrativeArray objectAtIndex:cellindex];
[weakSelf getQueryDictionary]?[IBTLoadingView showProgressLabel:@"查询中..."]:nil;
[weakSelf getQueryDictionary]?[weakSelf getOilPriceDatas:[weakSelf getQueryDictionary]]:nil;
[weakSelf dismissViewControllerAnimated:YES completion:nil];
}];
IBTUINavigationController *nav = [[IBTUINavigationController alloc]initWithRootViewController:selectArea];
dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf presentViewController:nav animated:YES completion:nil];
});
}else {
CustomSelectCityViewController *selectCity = [[CustomSelectCityViewController alloc]init];
//选择行政区域后回调
[selectCity setCompleteSelectCityBlock:^(NSArray *array) {
weakSelf.administrativeArea = [array lastObject];
cell.distributionAreaContent.text = [NSString stringWithFormat:@"[%@]%@[%@]%@",[array[0] objectForKey:@"uuid"],[array[0] objectForKey:@"name"],[array[1] objectForKey:@"code"],[array[1] objectForKey:@"name"]];
[weakSelf getQueryDictionary]?[IBTLoadingView showProgressLabel:@"查询中..."]:nil;
[weakSelf getQueryDictionary]?[weakSelf getOilPriceDatas:[weakSelf getQueryDictionary]]:nil;
}];
selectCity.preferredContentSize = CGSizeMake(ScreenSize.width, 200);
selectCity.datasArray = self.administrativeArray;
self.settingsPopoverController = [[WYPopoverController alloc] initWithContentViewController:selectCity];
self.settingsPopoverController.popoverLayoutMargins = UIEdgeInsetsMake(10, 20, 10, 20);
self.settingsPopoverController.wantsDefaultContentAppearance = NO;
[self.settingsPopoverController presentPopoverAsDialogAnimated:YES
options:WYPopoverAnimationOptionFadeWithScale];
}
}
}
......
total/GTOApp/UserUtil/PromptTableViewController.m
View file @ 2c9621f9
......@@ -93,13 +93,14 @@
#pragma mark -确定
- (void)completeButtonClick:(UIBarButtonItem *)item
{
if (self.selectCellTitle) {
self.selectCellTitle(self.selectTitle?self.selectTitle:self.currentTitle,self.indexpathSelect.row);
if (self.selectTitle || self.currentTitle) {
if (self.selectCellTitle) {
self.selectCellTitle(self.selectTitle?self.selectTitle:self.currentTitle,self.indexpathSelect.row);
}
}
}
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
......
total/GTOApp/UserUtil/total_objc_json_client.h
View file @ 2c9621f9
......@@ -3,6 +3,28 @@
#import "JSONModel.h"
/**
* 合约状态。
*
* @author Debenson
* @since 0.1
*/
/**
* 保存
*/
extern NSString * const CONTRACTSTATE_SAVE;
/**
* 已提交
*/
extern NSString * const CONTRACTSTATE_SUBMIT;
/**
* 已关闭
*/
extern NSString * const CONTRACTSTATE_CLOSE;
/**
* 单据状态
*
......@@ -21,24 +43,28 @@ extern NSString * const BILLSTATE_SUBMIT;
* 已完成
*/
extern NSString * const BILLSTATE_ACCOMPLISHED;
/**
* 已作废
*/
extern NSString * const BILLSTATE_CANCEL;
/**
* 合约状态。
* 修改数量类型。
*
* @author Debenson
* @since 0.1
*/
/**
* 增加
* 账面余额
*/
extern NSString * const CONTRACTLOGACTIONTYPE_ADD;
extern NSString * const CONTRACTLOGQUANTITYTYPE_VIRTUAL;
/**
* 减少
* 实际余额
*/
extern NSString * const CONTRACTLOGACTIONTYPE_SUB;
extern NSString * const CONTRACTLOGQUANTITYTYPE_REAL;
......@@ -57,24 +83,28 @@ extern NSString * const CONTRACTLOGSOURCETYPE_PICKINGBILL;
* 收油单
*/
extern NSString * const CONTRACTLOGSOURCETYPE_RECEIVEBILL;
/**
* 合约单
*/
extern NSString * const CONTRACTLOGSOURCETYPE_CONTRACT;
/**
* 修改数量类型。
* 合约状态。
*
* @author Debenson
* @since 0.1
*/
/**
* 账面余额
* 增加
*/
extern NSString * const CONTRACTLOGQUANTITYTYPE_VIRTUAL;
extern NSString * const CONTRACTLOGACTIONTYPE_ADD;
/**
* 实际余额
* 减少
*/
extern NSString * const CONTRACTLOGQUANTITYTYPE_REAL;
extern NSString * const CONTRACTLOGACTIONTYPE_SUB;
......@@ -132,23 +162,31 @@ extern NSString * const PAYMETHOD_TRANSFER;
/**
* 合约状态。
* 申请状态
*
* @author wsx
*
* @author Debenson
* @since 0.1
*/
/**
* 保存
* 未提交
*/
extern NSString * const CONTRACTSTATE_SAVE;
extern NSString * const DEPOTREQUESTBILLSTATE_INITIAL;
/**
* 已提交
*/
extern NSString * const CONTRACTSTATE_SUBMIT;
extern NSString * const DEPOTREQUESTBILLSTATE_SUBMIT;
/**
* 已关闭
* 已取消
*/
extern NSString * const CONTRACTSTATE_CLOSE;
extern NSString * const DEPOTREQUESTBILLSTATE_CANCELED;
/**
* 已生效
*/
extern NSString * const DEPOTREQUESTBILLSTATE_EFFECTIVED;
/**
* 已完成
*/
extern NSString * const DEPOTREQUESTBILLSTATE_ACCOMPLISHED;
......@@ -171,36 +209,6 @@ extern NSString * const DEPOTTYPE_SPECIAL;
/**
* 申请状态
*
* @author wsx
*
*/
/**
* 未提交
*/
extern NSString * const DEPOTREQUESTBILLSTATE_INITIAL;
/**
* 已提交
*/
extern NSString * const DEPOTREQUESTBILLSTATE_SUBMIT;
/**
* 已取消
*/
extern NSString * const DEPOTREQUESTBILLSTATE_CANCELED;
/**
* 已生效
*/
extern NSString * const DEPOTREQUESTBILLSTATE_EFFECTIVED;
/**
* 已完成
*/
extern NSString * const DEPOTREQUESTBILLSTATE_ACCOMPLISHED;
/**
* (no documentation provided)
*/
......@@ -274,6 +282,28 @@ extern NSString * const STORESTATE_INVALID;
/**
* 订油单明细状态
*
* @author Debenson
* @since 0.1
*/
/**
* 未配送
*/
extern NSString * const ORDERBILLDTLSTATE_INITIAL;
/**
* 配送中
*/
extern NSString * const ORDERBILLDTLSTATE_SHIPPING;
/**
* 已完成
*/
extern NSString * const ORDERBILLDTLSTATE_ACCOMPLISHED;
/**
* 订油单状态
*
......@@ -331,49 +361,49 @@ extern NSString * const PICKINGBILLSTATE_ACCOMPLISHED;
/**
* 订油单明细状态
* 配油单状态
*
* @author wsx
*
* @author Debenson
* @since 0.1
*/
/**
* 未配送
*/
extern NSString * const ORDERBILLDTLSTATE_INITIAL;
/**
* 配送中
* 已保存
*/
extern NSString * const ORDERBILLDTLSTATE_SHIPPING;
extern NSString * const FUELPRICESTATE_INITIAL;
/**
* 已完成
* 已提交
*/
extern NSString * const ORDERBILLDTLSTATE_ACCOMPLISHED;
extern NSString * const FUELPRICESTATE_SUBMIT;
/**
* 油价类别。
* 收油单状态。
*
* @author Debenson
* @since 0.1
*/
/**
* 售价
* 未导出
*/
extern NSString * const PRICECATEGORY_SALEPRICE;
extern NSString * const RECEIVEBILLEXPOTSTATE_NOEXPOT;
/**
* 普通建仓批发价
* 已导出库存入库单
*/
extern NSString * const PRICECATEGORY_GENERALTRADEPRICE;
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVIN;
/**
* 特殊建仓批发价
* 已导出销售订单
*/
extern NSString * const PRICECATEGORY_SPECTRADEPRICE;
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTSALE;
/**
* 内部配送价
* 已导出发货单
*/
extern NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE;
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTPICKING;
/**
* 已导出库存出库单
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVOUT;
......@@ -392,68 +422,50 @@ extern NSString * const RECEIVEBILLSTATE_INITIAL;
* 已提交
*/
extern NSString * const RECEIVEBILLSTATE_SUBMIT;
/**
* 已作废
*/
extern NSString * const RECEIVEBILLSTATE_CANCEL;
/**
* 收油单状态。
* 提醒类型。
*
* @author Debenson
* @since 0.1
*/
/**
* 未导出
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_NOEXPOT;
/**
* 已导出库存入库单
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVIN;
/**
* 已导出销售订单
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTSALE;
/**
* 已导出发货单
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTPICKING;
/**
* 已导出库存出库单
* 合约数量
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVOUT;
extern NSString * const REMINDTYPE_CONTRACTNUMBER;
/**
* 提醒类型。
* 油价类别。
*
* @author Debenson
* @since 0.1
*/
/**
* 合约数量
* 售价
*/
extern NSString * const REMINDTYPE_CONTRACTNUMBER;
extern NSString * const PRICECATEGORY_SALEPRICE;
/**
* 配油单状态
*
* @author wsx
*
* 普通建仓批发价
*/
extern NSString * const PRICECATEGORY_GENERALTRADEPRICE;
/**
* 已保存
* 特殊建仓批发价
*/
extern NSString * const FUELPRICESTATE_INITIAL;
extern NSString * const PRICECATEGORY_SPECTRADEPRICE;
/**
* 已提交
* 内部配送价
*/
extern NSString * const FUELPRICESTATE_SUBMIT;
extern NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE;
......@@ -513,30 +525,31 @@ extern NSString * const POSITIONTYPE_NONE;
@class QueryDefinition;
@class GasMeasureValue;
@class POperateInfo;
@class RsOperateInfo;
@class OperateInfo2;
@class RsOperateInfo;
@class Entity;
@class BeanOperateInfo;
@class GasDepot;
@class GasFueler;
@class GasTransInfo;
@class Area;
@class DeliveryArea;
@class Carrier;
@class GasDepot;
@class BasicBillDtl;
@class StandardEntity2;
@class Area;
@class ChangePasswordLog;
@class PStandardEntity;
@class GasItem;
@class GasTank;
@class StandardEntity;
@class OrderBillDtl;
@class FuelPrice;
@class ReceiveTankDtl;
@class PEnterpriseEntity;
@class FuelPrice;
@class DepotBillPayDtl;
@class DepotPickingDtl;
@class EnterpriseEntity2;
@class Role;
@class DepotBillPayDtl;
@class EnterpriseEntity2;
@class PEnterpriseEntity;
@class EnterpriseEntity;
@class Store;
@class BasicEnterpriseBill2;
......@@ -546,8 +559,8 @@ extern NSString * const POSITIONTYPE_NONE;
@class PickingBill;
@class ReceiveBill;
@class Remind;
@class RemindLog;
@class TotalOption;
@class RemindLog;
@class POBill;
@class OrderBill;
@class CarryInfo;
......@@ -574,30 +587,31 @@ extern NSString * const POSITIONTYPE_NONE;
@protocol QueryDefinition @end
@protocol GasMeasureValue @end
@protocol POperateInfo @end
@protocol RsOperateInfo @end
@protocol OperateInfo2 @end
@protocol RsOperateInfo @end
@protocol Entity @end
@protocol BeanOperateInfo @end
@protocol GasDepot @end
@protocol GasFueler @end
@protocol GasTransInfo @end
@protocol Area @end
@protocol DeliveryArea @end
@protocol Carrier @end
@protocol GasDepot @end
@protocol BasicBillDtl @end
@protocol StandardEntity2 @end
@protocol Area @end
@protocol ChangePasswordLog @end
@protocol PStandardEntity @end
@protocol GasItem @end
@protocol GasTank @end
@protocol StandardEntity @end
@protocol OrderBillDtl @end
@protocol FuelPrice @end
@protocol ReceiveTankDtl @end
@protocol PEnterpriseEntity @end
@protocol FuelPrice @end
@protocol DepotBillPayDtl @end
@protocol DepotPickingDtl @end
@protocol EnterpriseEntity2 @end
@protocol Role @end
@protocol DepotBillPayDtl @end
@protocol EnterpriseEntity2 @end
@protocol PEnterpriseEntity @end
@protocol EnterpriseEntity @end
@protocol Store @end
@protocol BasicEnterpriseBill2 @end
......@@ -607,8 +621,8 @@ extern NSString * const POSITIONTYPE_NONE;
@protocol PickingBill @end
@protocol ReceiveBill @end
@protocol Remind @end
@protocol RemindLog @end
@protocol TotalOption @end
@protocol RemindLog @end
@protocol POBill @end
@protocol OrderBill @end
@protocol CarryInfo @end
......@@ -629,13 +643,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *operId;
@property (nonatomic, copy) NSString *operName;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *operName;
@property (nonatomic, copy) NSString *operId;
@end /* interface BeanOperator */
......@@ -649,19 +663,19 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *time;
@property (nonatomic, copy) NSString *enterprise;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) Operator *operator;
@property (nonatomic, copy) NSString *time;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *enterprise;
@property (nonatomic, strong) Operator *operator;
@end /* interface OperateInfo */
......@@ -675,13 +689,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *operName;
@property (nonatomic, copy) NSString *fid;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *fid;
@property (nonatomic, copy) NSString *operName;
@end /* interface Operator */
......@@ -735,13 +749,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *operName;
@property (nonatomic, copy) NSString *fid;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *fid;
@property (nonatomic, copy) NSString *operName;
@end /* interface POperator */
......@@ -761,13 +775,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *operation;
@property (nonatomic, strong) NSObject *parameter;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSObject *parameter;
@property (nonatomic, copy) NSString *operation;
@end /* interface QueryCondition */
......@@ -779,15 +793,15 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* (no documentation provided)
*
*
* 取值: QUERYORDERDIRECTION_ASC, QUERYORDERDIRECTION_DESC,
*/
@property (nonatomic, copy) NSString *field;
@property (nonatomic, copy) NSString *direction;
/**
* (no documentation provided)
*
* 取值: QUERYORDERDIRECTION_ASC, QUERYORDERDIRECTION_DESC,
*
*/
@property (nonatomic, copy) NSString *direction;
@property (nonatomic, copy) NSString *field;
@end /* interface QueryOrder */
......@@ -801,19 +815,19 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, assign) NSInteger page;
@property (nonatomic, strong) QueryResultPaging *paging;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) QueryResultPaging *paging;
@property (nonatomic, assign) NSInteger page;
/**
* (no documentation provided)
*
* @see NSObject
*
*/
@property (nonatomic, assign) NSInteger pageCount;
@property (nonatomic, strong) NSArray<NSObject> *records;
/**
* (no documentation provided)
*
......@@ -822,16 +836,16 @@ extern NSString * const POSITIONTYPE_NONE;
@property (nonatomic, assign) long long recordCount;
/**
* (no documentation provided)
* @see NSObject
*
*
*/
@property (nonatomic, strong) NSArray<NSObject> *records;
@property (nonatomic, assign) NSInteger pageSize;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger pageSize;
@property (nonatomic, assign) NSInteger pageCount;
@end /* interface QueryResult */
......@@ -842,22 +856,22 @@ extern NSString * const POSITIONTYPE_NONE;
@interface QueryDefinition2 : JSONModel
/**
* (no documentation provided)
* @see QueryCondition
* @see QueryOrder
*
*/
@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
@property (nonatomic, strong) NSArray<QueryOrder> *orders;
/**
* (no documentation provided)
*
* @see QueryCondition
*
*/
@property (nonatomic, assign) NSInteger pageNumber;
@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
/**
* (no documentation provided)
* @see QueryOrder
*
*
*/
@property (nonatomic, strong) NSArray<QueryOrder> *orders;
@property (nonatomic, assign) NSInteger pageNumber;
/**
* (no documentation provided)
*
......@@ -925,25 +939,25 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, assign) NSInteger page;
@property (nonatomic, assign) NSInteger pageSize;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger pageSize;
@property (nonatomic, assign) NSInteger pageCount;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) long long recordCount;
@property (nonatomic, assign) NSInteger page;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger pageCount;
@property (nonatomic, assign) long long recordCount;
@end /* interface QueryResultPaging */
......@@ -954,10 +968,10 @@ extern NSString * const POSITIONTYPE_NONE;
@interface QueryDefinition : JSONModel
/**
* (no documentation provided)
*
* @see QueryCondition
*
*/
@property (nonatomic, assign) NSInteger limit;
@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
/**
* (no documentation provided)
* @see QueryOrder
......@@ -972,10 +986,10 @@ extern NSString * const POSITIONTYPE_NONE;
@property (nonatomic, assign) NSInteger offset;
/**
* (no documentation provided)
* @see QueryCondition
*
*
*/
@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
@property (nonatomic, assign) NSInteger limit;
@end /* interface QueryDefinition */
......@@ -993,25 +1007,25 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *capacity;
@property (nonatomic, strong) NSDecimalNumber *capacity;
/**
* 质量，单位公斤
*
*
*/
@property (nonatomic, strong) NSNumber *quality;
@property (nonatomic, strong) NSDecimalNumber *quality;
/**
* 密度
*
*
*/
@property (nonatomic, strong) NSNumber *density;
@property (nonatomic, strong) NSDecimalNumber *density;
/**
* 标准体积
*
*
*/
@property (nonatomic, strong) NSNumber *volume;
@property (nonatomic, strong) NSDecimalNumber *volume;
@end /* interface GasMeasureValue */
......@@ -1036,6 +1050,30 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 操作上下文。
@author Debenson
@since 0.1
*/
@interface OperateInfo2 : JSONModel
/**
* 操作时间
*
*
*/
@property (nonatomic, copy) NSString *time;
/**
* 操作人信息
*
*
*/
@property (nonatomic, strong) Operator *operator;
@end /* interface OperateInfo2 */
/**
* 操作人信息。
......@@ -1076,30 +1114,6 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 操作上下文。
@author Debenson
@since 0.1
*/
@interface OperateInfo2 : JSONModel
/**
* 操作时间
*
*
*/
@property (nonatomic, copy) NSString *time;
/**
* 操作人信息
*
*
*/
@property (nonatomic, strong) Operator *operator;
@end /* interface OperateInfo2 */
/**
* (no documentation provided)
*/
......@@ -1123,13 +1137,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *time;
@property (nonatomic, strong) BeanOperator *operator;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) BeanOperator *operator;
@property (nonatomic, copy) NSString *time;
/**
* (no documentation provided)
*
......@@ -1140,6 +1154,48 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 油库
@author cyy24
@since 0.1
*/
@interface GasDepot : Entity
/**
* 油库代码
*
*
*/
@property (nonatomic, copy) NSString *code;
/**
* 油库代码
*
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 经度
*
*
*/
@property (nonatomic, copy) NSString *longitude;
/**
* 纬度
*
*
*/
@property (nonatomic, copy) NSString *latitude;
/**
* sap编码
*
*
*/
@property (nonatomic, copy) NSString *sapCode;
@end /* interface GasDepot */
/**
* 发油商
......@@ -1160,6 +1216,12 @@ extern NSString * const POSITIONTYPE_NONE;
*
*/
@property (nonatomic, copy) NSString *name;
/**
* sap编码
*
*
*/
@property (nonatomic, copy) NSString *sapCode;
@end /* interface GasFueler */
......@@ -1219,50 +1281,50 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 配送区域
* 行政区域。
@author wsx
@author Debenson
@since 0.1
*/
@interface DeliveryArea : Entity
@interface Area : Entity
/**
* 编码
* 区域编码
*
*
*/
@property (nonatomic, copy) NSString *code;
/**
* 名称
* 区域名称
*
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface DeliveryArea */
@end /* interface Area */
/**
* 油库
* 配送区域
@author cyy24
@author Debenson
@since 0.1
*/
@interface Carrier : Entity
@interface DeliveryArea : Entity
/**
* 油库代码
* 编码
*
*
*/
@property (nonatomic, copy) NSString *code;
/**
* 油库代码
* 名称
*
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface Carrier */
@end /* interface DeliveryArea */
......@@ -1273,7 +1335,7 @@ extern NSString * const POSITIONTYPE_NONE;
@since 0.1
*/
@interface GasDepot : Entity
@interface Carrier : Entity
/**
* 油库代码
*
......@@ -1286,19 +1348,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 经度
*
*
*/
@property (nonatomic, copy) NSString *longitude;
/**
* 纬度
*
*
*/
@property (nonatomic, copy) NSString *latitude;
@end /* interface GasDepot */
@end /* interface Carrier */
......@@ -1357,26 +1407,32 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 行政区域。
@author wsx
* 合约日志
@author cyy24
@since 0.1
*/
@interface Area : Entity
@interface ChangePasswordLog : Entity
/**
* 区域编码
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *code;
@property (nonatomic, copy) NSString *userUuid;
/**
* 区域名称
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface Area */
@property (nonatomic, copy) NSString *userName;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *changeDate;
@end /* interface ChangePasswordLog */
......@@ -1438,6 +1494,12 @@ extern NSString * const POSITIONTYPE_NONE;
*
*/
@property (nonatomic, assign) double maxDensity;
/**
* sap编码
*
*
*/
@property (nonatomic, copy) NSString *sapCode;
@end /* interface GasItem */
......@@ -1493,13 +1555,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) OperateInfo *createInfo;
@property (nonatomic, assign) long long version;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) long long version;
@property (nonatomic, strong) OperateInfo *createInfo;
/**
* (no documentation provided)
*
......@@ -1526,36 +1588,90 @@ extern NSString * const POSITIONTYPE_NONE;
*/
@property (nonatomic, strong) UCN *item;
/**
* 数量
* 数量
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 明细状态
*
* 取值: ORDERBILLDTLSTATE_INITIAL, ORDERBILLDTLSTATE_SHIPPING, ORDERBILLDTLSTATE_ACCOMPLISHED,
*/
@property (nonatomic, copy) NSString *state;
/**
* 配送单号
*
*
*/
@property (nonatomic, copy) NSString *pickingBillNumber;
/**
* 配送时间
*
*
*/
@property (nonatomic, copy) NSString *pickedTime;
/**
* 要求到油时间
*
*
*/
@property (nonatomic, copy) NSString *receiveTime;
@end /* interface OrderBillDtl */
/**
* 收油单油罐明细
@author wsx
*/
@interface ReceiveTankDtl : BasicBillDtl
/**
* 油罐
*
*
*/
@property (nonatomic, strong) UCN *tank;
/**
* 卸油前的测液位计量数
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureBeforeUnload;
/**
* 卸油后的测液位计量数
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) GasMeasureValue *measureAfterUnload;
/**
* 明细状态
* 期间销售计量数
*
*
* 取值: ORDERBILLDTLSTATE_INITIAL, ORDERBILLDTLSTATE_SHIPPING, ORDERBILLDTLSTATE_ACCOMPLISHED,
*/
@property (nonatomic, copy) NSString *state;
@property (nonatomic, strong) GasMeasureValue *measureOnSale;
/**
* 配送单号
* 计算测量值
*
*
*/
@property (nonatomic, copy) NSString *pickingBillNumber;
@property (nonatomic, strong) GasMeasureValue *measureCalc;
/**
* 配送时间
* 配送单计量数
*
*
*/
@property (nonatomic, copy) NSString *pickedTime;
@property (nonatomic, strong) GasMeasureValue *measureBill;
/**
* 要求到油时间
* 实际配送数
*
*
*/
@property (nonatomic, copy) NSString *receiveTime;
@end /* interface OrderBillDtl */
@property (nonatomic, strong) GasMeasureValue *measureRealDelivery;
@end /* interface ReceiveTankDtl */
......@@ -1593,7 +1709,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *guidancePrice;
@property (nonatomic, strong) NSDecimalNumber *guidancePrice;
/**
* 售价
* <p>
......@@ -1626,7 +1742,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *salePrice;
@property (nonatomic, strong) NSDecimalNumber *salePrice;
/**
* 生效时间
*
......@@ -1660,70 +1776,50 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 收油单油罐明细
@author wsx
* 建仓单付款明细。
@author Debenson
@since 0.1
*/
@interface ReceiveTankDtl : BasicBillDtl
/**
* 油罐
*
*
*/
@property (nonatomic, strong) UCN *tank;
/**
* 卸油前的测液位计量数
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureBeforeUnload;
@interface DepotBillPayDtl : BasicBillDtl
/**
* 卸油后的测液位计量数
*
* 付款方式
*
* 取值: PAYMETHOD_CASH, PAYMETHOD_CHEQUE, PAYMETHOD_TRANSFER,
*/
@property (nonatomic, strong) GasMeasureValue *measureAfterUnload;
@property (nonatomic, copy) NSString *payMethod;
/**
* 期间销售计量数
* 付款金额
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureOnSale;
@property (nonatomic, strong) NSDecimalNumber *total;
/**
* 计算测量值
* 付款凭证
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureCalc;
@property (nonatomic, copy) NSString *payTicket;
/**
* 配送单计量数
* 付款时间
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureBill;
@property (nonatomic, copy) NSString *payTime;
/**
* 实际配送数
* 备注
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureRealDelivery;
@end /* interface ReceiveTankDtl */
/**
* (no documentation provided)
*/
@interface PEnterpriseEntity : PStandardEntity
@property (nonatomic, copy) NSString *remark;
/**
* (no documentation provided)
* 是否已生效
*
*
*/
@property (nonatomic, copy) NSString *enterprise;
@end /* interface PEnterpriseEntity */
@property (nonatomic, assign) BOOL effectived;
@end /* interface DepotBillPayDtl */
......@@ -1740,13 +1836,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *qty;
@property (nonatomic, strong) NSDecimalNumber *qty;
/**
* 配油金额（元）
*
*
*/
@property (nonatomic, strong) NSNumber *amount;
@property (nonatomic, strong) NSDecimalNumber *amount;
/**
* 配油单号
*
......@@ -1769,24 +1865,6 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 带企业字段的entity
@author Administrator
*/
@interface EnterpriseEntity2 : StandardEntity2
/**
* 企业标识
*
*
*/
@property (nonatomic, copy) NSString *enterprise;
@end /* interface EnterpriseEntity2 */
/**
* (no documentation provided)
*/
......@@ -1802,50 +1880,34 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 建仓单付款明细。
* 带企业字段的entity
@author Administrator
@author Debenson
@since 0.1
*/
@interface DepotBillPayDtl : BasicBillDtl
/**
* 付款方式
*
* 取值: PAYMETHOD_CASH, PAYMETHOD_CHEQUE, PAYMETHOD_TRANSFER,
*/
@property (nonatomic, copy) NSString *payMethod;
/**
* 付款金额
*
*
*/
@property (nonatomic, strong) NSNumber *total;
/**
* 付款凭证
*
*
*/
@property (nonatomic, copy) NSString *payTicket;
@interface EnterpriseEntity2 : StandardEntity2
/**
* 付款时间
* 企业标识
*
*
*/
@property (nonatomic, copy) NSString *payTime;
@property (nonatomic, copy) NSString *enterprise;
@end /* interface EnterpriseEntity2 */
/**
* 备注
*
*
* (no documentation provided)
*/
@property (nonatomic, copy) NSString *remark;
@interface PEnterpriseEntity : PStandardEntity
/**
* 是否已生效
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) BOOL effectived;
@end /* interface DepotBillPayDtl */
@property (nonatomic, copy) NSString *enterprise;
@end /* interface PEnterpriseEntity */
......@@ -2032,55 +2094,55 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *state;
@property (nonatomic, copy) NSString *businessType;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) Organization *belongOrg;
@property (nonatomic, copy) NSString *remark;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *businessType;
@property (nonatomic, assign) BOOL enabled;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *password;
/**
* (no documentation provided)
*
* @see Organization
*
*/
@property (nonatomic, copy) NSString *login;
@property (nonatomic, strong) NSArray<Organization> *organizations;
/**
* (no documentation provided)
*
* @see Role
*
*/
@property (nonatomic, copy) NSString *password;
@property (nonatomic, strong) NSArray<Role> *roles;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *address;
@property (nonatomic, copy) NSString *login;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *remark;
@property (nonatomic, copy) NSString *name;
/**
* (no documentation provided)
*
* 取值: POSITIONTYPE_MANAGER, POSITIONTYPE_INSPECTOR, POSITIONTYPE_STORER, POSITIONTYPE_ENGINEER, POSITIONTYPE_PURCHASEMAN, POSITIONTYPE_PURCHASER, POSITIONTYPE_VENDOR, POSITIONTYPE_NONE,
*
*/
@property (nonatomic, copy) NSString *position;
@property (nonatomic, copy) NSString *email;
/**
* (no documentation provided)
*
......@@ -2090,27 +2152,27 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* (no documentation provided)
*
*
* 取值: POSITIONTYPE_MANAGER, POSITIONTYPE_INSPECTOR, POSITIONTYPE_STORER, POSITIONTYPE_ENGINEER, POSITIONTYPE_PURCHASEMAN, POSITIONTYPE_PURCHASER, POSITIONTYPE_VENDOR, POSITIONTYPE_NONE,
*/
@property (nonatomic, copy) NSString *email;
@property (nonatomic, copy) NSString *position;
/**
* (no documentation provided)
* @see Role
*
*
*/
@property (nonatomic, strong) NSArray<Role> *roles;
@property (nonatomic, copy) NSString *state;
/**
* (no documentation provided)
* @see Organization
*
*
*/
@property (nonatomic, strong) NSArray<Organization> *organizations;
@property (nonatomic, strong) Organization *belongOrg;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) BOOL enabled;
@property (nonatomic, copy) NSString *address;
@end /* interface User */
......@@ -2124,37 +2186,37 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *orgType;
@property (nonatomic, assign) BOOL enabled;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *shortName;
@property (nonatomic, copy) NSString *phone;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *shortName;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) BOOL enabled;
@property (nonatomic, copy) NSString *path;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) BOOL isLeaf;
@property (nonatomic, copy) NSString *orgType;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *contact;
@property (nonatomic, assign) NSInteger level;
/**
* (no documentation provided)
*
......@@ -2166,7 +2228,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *storeType;
@property (nonatomic, copy) NSString *authentication;
/**
* (no documentation provided)
*
......@@ -2178,43 +2240,43 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) Organization *upper;
@property (nonatomic, copy) NSString *name;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *authentication;
@property (nonatomic, strong) Organization *upper;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *namePath;
@property (nonatomic, assign) BOOL isLeaf;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *phone;
@property (nonatomic, copy) NSString *namePath;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *code;
@property (nonatomic, copy) NSString *contact;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *path;
@property (nonatomic, copy) NSString *code;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger level;
@property (nonatomic, copy) NSString *storeType;
@end /* interface Organization */
......@@ -2288,7 +2350,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 油库
*
......@@ -2336,13 +2398,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *price;
@property (nonatomic, strong) NSDecimalNumber *price;
/**
* 金额
*
*
*/
@property (nonatomic, strong) NSNumber *total;
@property (nonatomic, strong) NSDecimalNumber *total;
/**
* SO单是否已导出
*
......@@ -2376,7 +2438,7 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 状态
*
* 取值: RECEIVEBILLSTATE_INITIAL, RECEIVEBILLSTATE_SUBMIT,
* 取值: RECEIVEBILLSTATE_INITIAL, RECEIVEBILLSTATE_SUBMIT, RECEIVEBILLSTATE_CANCEL,
*/
@property (nonatomic, copy) NSString *state;
/**
......@@ -2462,13 +2524,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *billMeasure;
@property (nonatomic, strong) NSDecimalNumber *billMeasure;
/**
* 发油公斤数
*
*
*/
@property (nonatomic, strong) NSNumber *realMeasure;
@property (nonatomic, strong) NSDecimalNumber *realMeasure;
/**
* 备注
*
......@@ -2504,19 +2566,19 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *pickFuelDensity;
@property (nonatomic, strong) NSDecimalNumber *pickFuelDensity;
/**
* 发油升数
*
*
*/
@property (nonatomic, strong) NSNumber *pickFuelDensityCapacity;
@property (nonatomic, strong) NSDecimalNumber *pickFuelDensityCapacity;
/**
* 损耗升数
*
*
*/
@property (nonatomic, strong) NSNumber *wasterCapacity;
@property (nonatomic, strong) NSDecimalNumber *wasterCapacity;
/**
* 收油营业日期
*
......@@ -2528,7 +2590,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *wasterRate;
@property (nonatomic, strong) NSDecimalNumber *wasterRate;
/**
* 承运商
*
......@@ -2540,7 +2602,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *price;
@property (nonatomic, strong) NSDecimalNumber *price;
@end /* interface ReceiveBill */
......@@ -2582,62 +2644,68 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 提醒日志
* 全局参数
@author cyy24
@since 0.1
*/
@interface RemindLog : BasicEnterpriseBill2
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *fueler;
@interface TotalOption : BasicEnterpriseBill2
/**
* (no documentation provided)
* 参数标识
*
*
*/
@property (nonatomic, copy) NSString *receiverNumber;
@property (nonatomic, copy) NSString *optionKey;
/**
* (no documentation provided)
* 参数值
*
*
*/
@property (nonatomic, copy) NSString *context;
@property (nonatomic, copy) NSString *optionValue;
/**
* (no documentation provided)
* 备注
*
*
*/
@property (nonatomic, assign) BOOL result;
@end /* interface RemindLog */
@property (nonatomic, copy) NSString *optionRemark;
@end /* interface TotalOption */
/**
* 全局参数
* 提醒日志
@author cyy24
@since 0.1
*/
@interface TotalOption : BasicEnterpriseBill2
@interface RemindLog : BasicEnterpriseBill2
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *optionKey;
@property (nonatomic, strong) UCN *fueler;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *optionValue;
@end /* interface TotalOption */
@property (nonatomic, copy) NSString *receiverNumber;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *context;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) BOOL result;
@end /* interface RemindLog */
......@@ -2888,7 +2956,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 备注
*
......@@ -2912,7 +2980,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *price;
@property (nonatomic, strong) NSDecimalNumber *price;
/**
* 配送区域
*
......@@ -2966,7 +3034,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *price;
@property (nonatomic, strong) NSDecimalNumber *price;
/**
* (no documentation provided)
*
......@@ -3026,13 +3094,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *reqPrice;
@property (nonatomic, strong) NSDecimalNumber *reqPrice;
/**
* 申请数量
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 备注
*
......@@ -3068,7 +3136,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *minQuantity;
@property (nonatomic, strong) NSDecimalNumber *minQuantity;
@end /* interface ContractNumber */
......@@ -3125,7 +3193,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *total;
@property (nonatomic, strong) NSDecimalNumber *total;
@end /* interface DepotInv */
......@@ -3188,19 +3256,19 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *price;
@property (nonatomic, strong) NSDecimalNumber *price;
/**
* 建仓数量（吨）
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 建仓金额
*
*
*/
@property (nonatomic, strong) NSNumber *amount;
@property (nonatomic, strong) NSDecimalNumber *amount;
/**
* 付款时间范围
*
......@@ -3230,25 +3298,25 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *unpayAmount;
@property (nonatomic, strong) NSDecimalNumber *unpayAmount;
/**
* 未增加库存数
*
*
*/
@property (nonatomic, strong) NSNumber *undepotInv;
@property (nonatomic, strong) NSDecimalNumber *undepotInv;
/**
* 已缴纳保证金额
*
*
*/
@property (nonatomic, strong) NSNumber *payMarginAmount;
@property (nonatomic, strong) NSDecimalNumber *payMarginAmount;
/**
* 剩余库存
*
*
*/
@property (nonatomic, strong) NSNumber *total;
@property (nonatomic, strong) NSDecimalNumber *total;
@end /* interface DepotBill */
......@@ -3276,7 +3344,7 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* (no documentation provided)
*
* 取值: CONTRACTLOGSOURCETYPE_PICKINGBILL, CONTRACTLOGSOURCETYPE_RECEIVEBILL,
* 取值: CONTRACTLOGSOURCETYPE_PICKINGBILL, CONTRACTLOGSOURCETYPE_RECEIVEBILL, CONTRACTLOGSOURCETYPE_CONTRACT,
*/
@property (nonatomic, copy) NSString *sourceType;
/**
......@@ -3296,23 +3364,23 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *beforeTotal;
@property (nonatomic, strong) NSDecimalNumber *beforeTotal;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *subTotal;
@property (nonatomic, strong) NSDecimalNumber *subTotal;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *nowTotal;
@property (nonatomic, strong) NSDecimalNumber *nowTotal;
/**
* (no documentation provided)
*
* 取值: BILLSTATE_INITIAL, BILLSTATE_SUBMIT, BILLSTATE_ACCOMPLISHED,
* 取值: BILLSTATE_INITIAL, BILLSTATE_SUBMIT, BILLSTATE_ACCOMPLISHED, BILLSTATE_CANCEL,
*/
@property (nonatomic, copy) NSString *billState;
/**
......@@ -3398,19 +3466,25 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *realQuantity;
@property (nonatomic, strong) NSDecimalNumber *realQuantity;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger level;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *price;
@end /* interface Contract */
total/GTOApp/UserUtil/total_objc_json_client.m
View file @ 2c9621f9
......@@ -2,8 +2,8 @@
#import "total_objc_json_client.h"
@implementation BeanOperator
@synthesize operId;
@synthesize operName;
@synthesize operId;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -14,9 +14,9 @@
@end
@implementation OperateInfo
@synthesize enterprise;
@synthesize time;
@synthesize operator;
@synthesize enterprise;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -27,8 +27,8 @@
@end
@implementation Operator
@synthesize operName;
@synthesize fid;
@synthesize operName;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -71,8 +71,8 @@
@end
@implementation POperator
@synthesize operName;
@synthesize fid;
@synthesize operName;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -92,8 +92,8 @@
@implementation QueryCondition
@synthesize parameters;
@synthesize operation;
@synthesize parameter;
@synthesize operation;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -104,8 +104,8 @@
@end
@implementation QueryOrder
@synthesize field;
@synthesize direction;
@synthesize field;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -116,12 +116,12 @@
@end
@implementation QueryResult
@synthesize page;
@synthesize paging;
@synthesize pageCount;
@synthesize recordCount;
@synthesize page;
@synthesize records;
@synthesize recordCount;
@synthesize pageSize;
@synthesize pageCount;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -132,9 +132,9 @@
@end
@implementation QueryDefinition2
@synthesize orders;
@synthesize conditions;
@synthesize pageNumber;
@synthesize orders;
@synthesize pageSize;
+(BOOL)propertyIsOptional:(NSString*)propertyName
......@@ -157,21 +157,28 @@
@end
NSString * const CONTRACTSTATE_SAVE = @"save";
NSString * const CONTRACTSTATE_SUBMIT = @"submit";
NSString * const CONTRACTSTATE_CLOSE = @"close";
NSString * const BILLSTATE_INITIAL = @"initial";
NSString * const BILLSTATE_SUBMIT = @"submit";
NSString * const BILLSTATE_ACCOMPLISHED = @"accomplished";
NSString * const BILLSTATE_CANCEL = @"cancel";
NSString * const CONTRACTLOGACTIONTYPE_ADD = @"add";
NSString * const CONTRACTLOGACTIONTYPE_SUB = @"sub";
NSString * const CONTRACTLOGQUANTITYTYPE_VIRTUAL = @"virtual";
NSString * const CONTRACTLOGQUANTITYTYPE_REAL = @"real";
NSString * const CONTRACTLOGSOURCETYPE_PICKINGBILL = @"pickingbill";
NSString * const CONTRACTLOGSOURCETYPE_RECEIVEBILL = @"receivebill";
NSString * const CONTRACTLOGSOURCETYPE_CONTRACT = @"contract";
NSString * const CONTRACTLOGQUANTITYTYPE_VIRTUAL = @"virtual";
NSString * const CONTRACTLOGQUANTITYTYPE_REAL = @"real";
NSString * const CONTRACTLOGACTIONTYPE_ADD = @"add";
NSString * const CONTRACTLOGACTIONTYPE_SUB = @"sub";
NSString * const DEPOTBILLSTATE_INITIAL = @"initial";
......@@ -186,9 +193,11 @@ NSString * const PAYMETHOD_CHEQUE = @"cheque";
NSString * const PAYMETHOD_TRANSFER = @"transfer";
NSString * const CONTRACTSTATE_SAVE = @"save";
NSString * const CONTRACTSTATE_SUBMIT = @"submit";
NSString * const CONTRACTSTATE_CLOSE = @"close";
NSString * const DEPOTREQUESTBILLSTATE_INITIAL = @"initial";
NSString * const DEPOTREQUESTBILLSTATE_SUBMIT = @"submit";
NSString * const DEPOTREQUESTBILLSTATE_CANCELED = @"canceled";
NSString * const DEPOTREQUESTBILLSTATE_EFFECTIVED = @"effectived";
NSString * const DEPOTREQUESTBILLSTATE_ACCOMPLISHED = @"accomplished";
NSString * const DEPOTTYPE_GENERAL = @"general";
......@@ -207,18 +216,11 @@ NSString * const DEPOTTYPE_SPECIAL = @"special";
@end
NSString * const DEPOTREQUESTBILLSTATE_INITIAL = @"initial";
NSString * const DEPOTREQUESTBILLSTATE_SUBMIT = @"submit";
NSString * const DEPOTREQUESTBILLSTATE_CANCELED = @"canceled";
NSString * const DEPOTREQUESTBILLSTATE_EFFECTIVED = @"effectived";
NSString * const DEPOTREQUESTBILLSTATE_ACCOMPLISHED = @"accomplished";
@implementation QueryResultPaging
@synthesize page;
@synthesize pageSize;
@synthesize recordCount;
@synthesize pageCount;
@synthesize page;
@synthesize recordCount;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -246,10 +248,10 @@ NSString * const STORESTATE_INVALID = @"invalid";
@implementation QueryDefinition
@synthesize limit;
@synthesize conditions;
@synthesize orders;
@synthesize offset;
@synthesize conditions;
@synthesize limit;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -259,6 +261,11 @@ NSString * const STORESTATE_INVALID = @"invalid";
@end
NSString * const ORDERBILLDTLSTATE_INITIAL = @"initial";
NSString * const ORDERBILLDTLSTATE_SHIPPING = @"shipping";
NSString * const ORDERBILLDTLSTATE_ACCOMPLISHED = @"accomplished";
NSString * const ORDERBILLSTATE_INITIAL = @"initial";
NSString * const ORDERBILLSTATE_SUBMIT = @"submit";
NSString * const ORDERBILLSTATE_CANCELED = @"canceled";
......@@ -272,15 +279,8 @@ NSString * const PICKINGBILLSTATE_SUBMIT = @"submit";
NSString * const PICKINGBILLSTATE_ACCOMPLISHED = @"accomplished";
NSString * const ORDERBILLDTLSTATE_INITIAL = @"initial";
NSString * const ORDERBILLDTLSTATE_SHIPPING = @"shipping";
NSString * const ORDERBILLDTLSTATE_ACCOMPLISHED = @"accomplished";
NSString * const PRICECATEGORY_SALEPRICE = @"salePrice";
NSString * const PRICECATEGORY_GENERALTRADEPRICE = @"generalTradePrice";
NSString * const PRICECATEGORY_SPECTRADEPRICE = @"specTradePrice";
NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE = @"interalShippingPrice";
NSString * const FUELPRICESTATE_INITIAL = @"initial";
NSString * const FUELPRICESTATE_SUBMIT = @"submit";
@implementation GasMeasureValue
......@@ -297,10 +297,6 @@ NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE = @"interalShippingPrice";
@end
NSString * const RECEIVEBILLSTATE_INITIAL = @"initial";
NSString * const RECEIVEBILLSTATE_SUBMIT = @"submit";
NSString * const RECEIVEBILLEXPOTSTATE_NOEXPOT = @"noExpot";
NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVIN = @"exportEnvIn";
NSString * const RECEIVEBILLEXPOTSTATE_EXPORTSALE = @"exportSale";
......@@ -308,11 +304,18 @@ NSString * const RECEIVEBILLEXPOTSTATE_EXPORTPICKING = @"exportPicking";
NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVOUT = @"exportEnvOut";
NSString * const RECEIVEBILLSTATE_INITIAL = @"initial";
NSString * const RECEIVEBILLSTATE_SUBMIT = @"submit";
NSString * const RECEIVEBILLSTATE_CANCEL = @"cancel";
NSString * const REMINDTYPE_CONTRACTNUMBER = @"contractNumber";
NSString * const FUELPRICESTATE_INITIAL = @"initial";
NSString * const FUELPRICESTATE_SUBMIT = @"submit";
NSString * const PRICECATEGORY_SALEPRICE = @"salePrice";
NSString * const PRICECATEGORY_GENERALTRADEPRICE = @"generalTradePrice";
NSString * const PRICECATEGORY_SPECTRADEPRICE = @"specTradePrice";
NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE = @"interalShippingPrice";
@implementation POperateInfo
......@@ -325,6 +328,18 @@ NSString * const FUELPRICESTATE_SUBMIT = @"submit";
}
@end
@implementation OperateInfo2
@synthesize time;
@synthesize operator;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation RsOperateInfo
......@@ -341,9 +356,8 @@ NSString * const FUELPRICESTATE_SUBMIT = @"submit";
@end
@implementation OperateInfo2
@synthesize time;
@synthesize operator;
@implementation Entity
@synthesize uuid;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -363,8 +377,10 @@ NSString * const POSITIONTYPE_VENDOR = @"vendor";
NSString * const POSITIONTYPE_NONE = @"none";
@implementation Entity
@synthesize uuid;
@implementation BeanOperateInfo
@synthesize operator;
@synthesize time;
@synthesize enterprise;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -374,10 +390,12 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation BeanOperateInfo
@synthesize time;
@synthesize operator;
@synthesize enterprise;
@implementation GasDepot
@synthesize code;
@synthesize name;
@synthesize longitude;
@synthesize latitude;
@synthesize sapCode;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -390,6 +408,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@implementation GasFueler
@synthesize code;
@synthesize name;
@synthesize sapCode;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -416,7 +435,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation DeliveryArea
@implementation Area
@synthesize code;
@synthesize name;
......@@ -428,7 +447,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation Carrier
@implementation DeliveryArea
@synthesize code;
@synthesize name;
......@@ -440,11 +459,9 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation GasDepot
@implementation Carrier
@synthesize code;
@synthesize name;
@synthesize longitude;
@synthesize latitude;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -479,9 +496,10 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation Area
@synthesize code;
@synthesize name;
@implementation ChangePasswordLog
@synthesize userUuid;
@synthesize userName;
@synthesize changeDate;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -509,6 +527,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@synthesize name;
@synthesize minDensity;
@synthesize maxDensity;
@synthesize sapCode;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -534,8 +553,8 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation StandardEntity
@synthesize createInfo;
@synthesize version;
@synthesize createInfo;
@synthesize lastModifyInfo;
+(BOOL)propertyIsOptional:(NSString*)propertyName
......@@ -560,6 +579,23 @@ NSString * const POSITIONTYPE_NONE = @"none";
}
@end
@implementation ReceiveTankDtl
@synthesize tank;
@synthesize measureBeforeUnload;
@synthesize measureAfterUnload;
@synthesize measureOnSale;
@synthesize measureCalc;
@synthesize measureBill;
@synthesize measureRealDelivery;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation FuelPrice
......@@ -581,25 +617,13 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation ReceiveTankDtl
@synthesize tank;
@synthesize measureBeforeUnload;
@synthesize measureAfterUnload;
@synthesize measureOnSale;
@synthesize measureCalc;
@synthesize measureBill;
@synthesize measureRealDelivery;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation PEnterpriseEntity
@synthesize enterprise;
@implementation DepotBillPayDtl
@synthesize payMethod;
@synthesize total;
@synthesize payTicket;
@synthesize payTime;
@synthesize remark;
@synthesize effectived;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -624,8 +648,8 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation EnterpriseEntity2
@synthesize enterprise;
@implementation Role
@synthesize name;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -635,8 +659,8 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation Role
@synthesize name;
@implementation EnterpriseEntity2
@synthesize enterprise;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -646,13 +670,8 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation DepotBillPayDtl
@synthesize payMethod;
@synthesize total;
@synthesize payTicket;
@synthesize payTime;
@synthesize remark;
@synthesize effectived;
@implementation PEnterpriseEntity
@synthesize enterprise;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -717,20 +736,20 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation User
@synthesize state;
@synthesize belongOrg;
@synthesize businessType;
@synthesize name;
@synthesize login;
@synthesize password;
@synthesize address;
@synthesize remark;
@synthesize position;
@synthesize mobile;
@synthesize email;
@synthesize roles;
@synthesize organizations;
@synthesize enabled;
@synthesize password;
@synthesize organizations;
@synthesize roles;
@synthesize login;
@synthesize name;
@synthesize email;
@synthesize mobile;
@synthesize position;
@synthesize state;
@synthesize belongOrg;
@synthesize address;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -741,22 +760,22 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation Organization
@synthesize orgType;
@synthesize shortName;
@synthesize name;
@synthesize enabled;
@synthesize isLeaf;
@synthesize contact;
@synthesize phone;
@synthesize shortName;
@synthesize path;
@synthesize orgType;
@synthesize level;
@synthesize attachmentId;
@synthesize storeType;
@synthesize authentication;
@synthesize address;
@synthesize name;
@synthesize upper;
@synthesize authentication;
@synthesize isLeaf;
@synthesize namePath;
@synthesize phone;
@synthesize contact;
@synthesize code;
@synthesize path;
@synthesize level;
@synthesize storeType;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -859,11 +878,10 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation RemindLog
@synthesize fueler;
@synthesize receiverNumber;
@synthesize context;
@synthesize result;
@implementation TotalOption
@synthesize optionKey;
@synthesize optionValue;
@synthesize optionRemark;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -873,9 +891,11 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation TotalOption
@synthesize optionKey;
@synthesize optionValue;
@implementation RemindLog
@synthesize fueler;
@synthesize receiverNumber;
@synthesize context;
@synthesize result;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -1084,6 +1104,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@synthesize quantity;
@synthesize realQuantity;
@synthesize level;
@synthesize price;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......
total/Macro/GTOAppMacro.h
View file @ 2c9621f9
......@@ -83,16 +83,16 @@
//#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_REST_API_BASE_URL @"http://139.196.39.77:8080/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_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"
......
total/Total-Prefix.pch
View file @ 2c9621f9
......@@ -65,10 +65,14 @@
#define DISTRIBUTION @"/mdata/deliveryArea/query"
/**
* 油价
* 默认油价
*/
#define OILPRICE @"/fuelPrice/filterQuery"
/**
* 建仓申请有价
*/
#define DEPOTREQUEST @"/fuelPrice/depotQuery"
/**
* 行政区域
*/
......
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