Skip to content

X
xffruit
Commit f89f6359 authored by AvatarC's avatar AvatarC
Browse files
Options

Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 

Conflicts:
	XFFruit.xcodeproj/project.pbxproj
parents 4447c6b2 7adc37d4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 739 additions and 162 deletions
XFFruit.xcodeproj/project.pbxproj
View file @ f89f6359
...@@ -159,7 +159,10 @@ ...@@ -159,7 +159,10 @@
728899EB1BEF4233003CC41E /* PassgerPriceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */; }; 728899EB1BEF4233003CC41E /* PassgerPriceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */; };
728899EE1BEF4A75003CC41E /* PasengerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899ED1BEF4A75003CC41E /* PasengerCell.m */; }; 728899EE1BEF4A75003CC41E /* PasengerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899ED1BEF4A75003CC41E /* PasengerCell.m */; };
728899F11BEF4A8A003CC41E /* PassengerHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */; }; 728899F11BEF4A8A003CC41E /* PassengerHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */; };
729735C11BFC9B5800F83CEA /* Compass.m in Sources */ = {isa = PBXBuildFile; fileRef = 729735C01BFC9B5800F83CEA /* Compass.m */; };
728F84AC1C194A05009E4A3D /* UserWarehouse.m in Sources */ = {isa = PBXBuildFile; fileRef = 728F84AB1C194A05009E4A3D /* UserWarehouse.m */; settings = {ASSET_TAGS = (); }; };
729735C11BFC9B5800F83CEA /* Compass.m in Sources */ = {isa = PBXBuildFile; fileRef = 729735C01BFC9B5800F83CEA /* Compass.m */; settings = {ASSET_TAGS = (); }; };
729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; }; 729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; };
72A8132D1BCA8BBA003631F3 /* ChooseTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */; }; 72A8132D1BCA8BBA003631F3 /* ChooseTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */; };
72A813FA1BCD3205003631F3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813F71BCD3205003631F3 /* ReceiveViewController.m */; }; 72A813FA1BCD3205003631F3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813F71BCD3205003631F3 /* ReceiveViewController.m */; };
...@@ -758,6 +761,8 @@ ...@@ -758,6 +761,8 @@
728899ED1BEF4A75003CC41E /* PasengerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PasengerCell.m; sourceTree = "<group>"; }; 728899ED1BEF4A75003CC41E /* PasengerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PasengerCell.m; sourceTree = "<group>"; };
728899EF1BEF4A8A003CC41E /* PassengerHeaderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassengerHeaderCell.h; sourceTree = "<group>"; }; 728899EF1BEF4A8A003CC41E /* PassengerHeaderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassengerHeaderCell.h; sourceTree = "<group>"; };
728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PassengerHeaderCell.m; sourceTree = "<group>"; }; 728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PassengerHeaderCell.m; sourceTree = "<group>"; };
728F84AA1C194A05009E4A3D /* UserWarehouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserWarehouse.h; sourceTree = "<group>"; };
728F84AB1C194A05009E4A3D /* UserWarehouse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserWarehouse.m; sourceTree = "<group>"; };
729735BF1BFC9B5800F83CEA /* Compass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Compass.h; sourceTree = "<group>"; }; 729735BF1BFC9B5800F83CEA /* Compass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Compass.h; sourceTree = "<group>"; };
729735C01BFC9B5800F83CEA /* Compass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Compass.m; sourceTree = "<group>"; }; 729735C01BFC9B5800F83CEA /* Compass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Compass.m; sourceTree = "<group>"; };
729A2E911BE60C0200493603 /* GeometryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryView.h; sourceTree = "<group>"; }; 729A2E911BE60C0200493603 /* GeometryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryView.h; sourceTree = "<group>"; };
...@@ -1613,6 +1618,8 @@ ...@@ -1613,6 +1618,8 @@
FE4678AF1B8D63A100B5EDA3 /* Warehouse.m */, FE4678AF1B8D63A100B5EDA3 /* Warehouse.m */,
FE95FDD81B93FC12008040D0 /* PurchaseBillProduct.h */, FE95FDD81B93FC12008040D0 /* PurchaseBillProduct.h */,
FE95FDD91B93FC12008040D0 /* PurchaseBillProduct.m */, FE95FDD91B93FC12008040D0 /* PurchaseBillProduct.m */,
728F84AA1C194A05009E4A3D /* UserWarehouse.h */,
728F84AB1C194A05009E4A3D /* UserWarehouse.m */,
); );
path = Models; path = Models;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -3162,6 +3169,7 @@ ...@@ -3162,6 +3169,7 @@
FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */, FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */,
72F9D4821BA7EC9600795A00 /* NoticeProductViewController.m in Sources */, 72F9D4821BA7EC9600795A00 /* NoticeProductViewController.m in Sources */,
C15039221ADE39190081A686 /* IBTUIControl.m in Sources */, C15039221ADE39190081A686 /* IBTUIControl.m in Sources */,
728F84AC1C194A05009E4A3D /* UserWarehouse.m in Sources */,
C112BC4D1AD91CF800F75F58 /* ICRPatrolDetailViewController.m in Sources */, C112BC4D1AD91CF800F75F58 /* ICRPatrolDetailViewController.m in Sources */,
0414FF181B94959700C7B00E /* SeePurchaseNoticeViewController.m in Sources */, 0414FF181B94959700C7B00E /* SeePurchaseNoticeViewController.m in Sources */,
C142D2BC1AC3A155000109A7 /* UITableViewCell+Helper.m in Sources */, C142D2BC1AC3A155000109A7 /* UITableViewCell+Helper.m in Sources */,
......
XFFruit/Controllers/AppViewController/ICRAppViewControllerManager.m
View file @ f89f6359
...@@ -127,11 +127,13 @@ ...@@ -127,11 +127,13 @@
[self createHomeViewController];//首页 [self createHomeViewController];//首页
[self createBusinessViewController];//业务 [self createBusinessViewController];//业务
[self createReportViewController]; if ([IBTCommon checkIsPermission:Report_ACTION_Check]) {
[self createReportViewController];
}
[self createSyncViewController]; [self createSyncViewController];
[self createSystemViewController]; [self createSystemViewController];
if (!m_tabbarController) { if (!m_tabbarController) {
m_tabbarController = [[IBTTabBarController alloc] init]; m_tabbarController = [[IBTTabBarController alloc] init];
m_tabbarController.delegate = self; m_tabbarController.delegate = self;
......
XFFruit/Controllers/DataBaseController/ICRDataBaseController.m
View file @ f89f6359
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#import "Warehouse.h" #import "Warehouse.h"
#import "GXFProductUnit.h" #import "GXFProductUnit.h"
#import "Accounttitle.h" #import "Accounttitle.h"
#import "UserWarehouse.h"
#define ICR_DB_ERROR_PARAMETER @"Parse Error: Bad Parameter(s)" #define ICR_DB_ERROR_PARAMETER @"Parse Error: Bad Parameter(s)"
...@@ -98,7 +99,7 @@ static NSString *ICRDataBasePath = @""; ...@@ -98,7 +99,7 @@ static NSString *ICRDataBasePath = @"";
[_m_dbQueue inDatabase:^(FMDatabase *db) { [_m_dbQueue inDatabase:^(FMDatabase *db) {
NSArray *tableNameArr = NSArray *tableNameArr =
@[ [Product class],[User class],[Survey class],[Vendor class],[Warehouse class],[GXFProductUnit class],[Accounttitle class],[ICRAnnouncement class]]; @[ [Product class],[User class],[Survey class],[Vendor class],[Warehouse class],[GXFProductUnit class],[Accounttitle class],[ICRAnnouncement class],[UserWarehouse class]];
NSMutableArray *sqlBatch = [NSMutableArray array]; NSMutableArray *sqlBatch = [NSMutableArray array];
NSString *sql = nil; NSString *sql = nil;
......
XFFruit/Controllers/HTTPController/ICRHTTPController.h
View file @ f89f6359
...@@ -242,6 +242,14 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) { ...@@ -242,6 +242,14 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
page_size:(NSUInteger)page_size page_size:(NSUInteger)page_size
success:(void (^)(id))succ success:(void (^)(id))succ
failure:(void (^)(id))fail; failure:(void (^)(id))fail;
//4.用户仓库
- (void)downloadUserWarehouseWithStartDate:(NSString *)stateDate
Page_number:(NSUInteger)page_number
page_size:(NSUInteger)page_size
success:(void (^)(id))succ
failure:(void (^)(id))fail;
//5.科目账款 //5.科目账款
- (void)getAccounttitleWithStartDate:(NSString *)stateDate - (void)getAccounttitleWithStartDate:(NSString *)stateDate
Page_number:(NSUInteger)page_number Page_number:(NSUInteger)page_number
......
XFFruit/Controllers/HTTPController/ICRHTTPController.m
View file @ f89f6359
...@@ -83,6 +83,8 @@ typedef NS_ENUM(NSUInteger, ICRHTTPAction) { ...@@ -83,6 +83,8 @@ typedef NS_ENUM(NSUInteger, ICRHTTPAction) {
XFFHttp_GetVendor, XFFHttp_GetVendor,
//仓库 //仓库
XFFHttp_GetWarehouse, XFFHttp_GetWarehouse,
//用户仓库表
XFFHttp_downloadUserWarehouse,
//科目账单 //科目账单
XFFHttp_GetAccounttitle, XFFHttp_GetAccounttitle,
...@@ -197,6 +199,8 @@ static NSString * const ICRHTTPInterface[] = { ...@@ -197,6 +199,8 @@ static NSString * const ICRHTTPInterface[] = {
[XFFHttp_GetVendor] = @"data/vendor/download", [XFFHttp_GetVendor] = @"data/vendor/download",
//仓库 //仓库
[XFFHttp_GetWarehouse] = @"data/warehouse/download", [XFFHttp_GetWarehouse] = @"data/warehouse/download",
[XFFHttp_downloadUserWarehouse] = @"data/warehouse/downloadUserWarehouse",
//科目账单 //科目账单
[XFFHttp_GetAccounttitle] = @"data/accounttitle/download", [XFFHttp_GetAccounttitle] = @"data/accounttitle/download",
...@@ -1784,6 +1788,17 @@ acceptTypeJson:YES ...@@ -1784,6 +1788,17 @@ acceptTypeJson:YES
[self p_downloadWithStartDate:stateDate ICRHTTPAction:XFFHttp_GetWarehouse ClassName:@"Warehouse" Page_number:page_number page_size:page_size success:succ failure:fail]; [self p_downloadWithStartDate:stateDate ICRHTTPAction:XFFHttp_GetWarehouse ClassName:@"Warehouse" Page_number:page_number page_size:page_size success:succ failure:fail];
} }
//用户仓库表
- (void)downloadUserWarehouseWithStartDate:(NSString *)stateDate
Page_number:(NSUInteger)page_number
page_size:(NSUInteger)page_size
success:(void (^)(id))succ
failure:(void (^)(id))fail{
[self p_downloadWithStartDate:stateDate ICRHTTPAction:XFFHttp_downloadUserWarehouse ClassName:@"UserWarehouse" Page_number:page_number page_size:page_size success:succ failure:fail];
}
#pragma mark - 科目 #pragma mark - 科目
- (void)getAccounttitleWithStartDate:(NSString *)startDate - (void)getAccounttitleWithStartDate:(NSString *)startDate
Page_number:(NSUInteger)page_number Page_number:(NSUInteger)page_number
......
XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m
View file @ f89f6359
...@@ -219,12 +219,8 @@ ...@@ -219,12 +219,8 @@
}else{ }else{
sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"code"]; sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"code"];
} }
}else if([tableStr isEqualToString:GXF_BASECLASS_WAREHOUSE]){ }else if([tableStr isEqualToString:GXF_BASECLASS_UserWAREHOUSE]){
if (titleStr.length > 0) { sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE userUuid = '%@'", tableStr,[ICRUserUtil sharedInstance].userId];//@"4028b88150a987080150a987dce5007a"
sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"code"];
}else{
sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"code"];
}
}else if([tableStr isEqualToString:GXF_BASECLASS_VENDOR]){ }else if([tableStr isEqualToString:GXF_BASECLASS_VENDOR]){
if (titleStr.length > 0) { if (titleStr.length > 0) {
sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"code"]; sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"code"];
...@@ -251,16 +247,21 @@ ...@@ -251,16 +247,21 @@
NSString *befortDate = @"2014-01-01"; NSString *befortDate = @"2014-01-01";
[self getBaseDataFromServerWithStartDate:befortDate]; [self getBaseDataFromServerWithStartDate:befortDate];
}else{ }else{
[strongSelf.dataArr removeAllObjects]; if ([tableStr isEqualToString:GXF_BASECLASS_UserWAREHOUSE]) {
if (!self.tableView.header.lastUpdatedTime) { [self getWareHoseData:fetchedObjects titleStr:titleStr];
[strongSelf.dataArr addObject:[NSDate date]];
}else{ }else{
[strongSelf.dataArr addObject:self.tableView.header.lastUpdatedTime]; [strongSelf.dataArr removeAllObjects];
if (!self.tableView.header.lastUpdatedTime) {
[strongSelf.dataArr addObject:[NSDate date]];
}else{
[strongSelf.dataArr addObject:self.tableView.header.lastUpdatedTime];
}
[strongSelf.dataArr addObjectsFromArray:fetchedObjects];
[self tableViewRefresh:titleStr];
} }
[strongSelf.dataArr addObjectsFromArray:fetchedObjects];
[self tableViewRefresh:titleStr];
} }
}; };
...@@ -269,6 +270,49 @@ ...@@ -269,6 +270,49 @@
fetchBlock:fetchBlk fetchBlock:fetchBlk
fetchResultsBlock:fetchResultsBlk]; fetchResultsBlock:fetchResultsBlk];
} }
- (void)getWareHoseData:(NSArray *)arr titleStr:(NSString *)titleStr{
if (arr.count > 0) {
NSMutableString *parms = [NSMutableString string];
for (int i = 0; i < arr.count; i++) {
UserWarehouse *userW = arr[i];
if (i == arr.count - 1) {
[parms appendFormat:@"'%@'",userW.warehouseUuid];
}else{
[parms appendFormat:@"'%@',",userW.warehouseUuid];
}
}
ICRDatabaseFetchBlock fetchBlk = ^FMResultSet *(FMDatabase *db) {
NSString * sql = @"";
if (titleStr.length > 0) {
sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 AND uuid in (%@) ORDER BY %@", GXF_BASECLASS_WAREHOUSE,titleStr,titleStr, parms,@"code"];
}else{
sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 AND uuid in (%@) ORDER BY %@", GXF_BASECLASS_WAREHOUSE,parms, @"code"];
}
CLog(@"=========%@",sql);
return [db executeQuery:sql];
};
__weak typeof(self)weakSelf = self;
ICRDatabaseFetchResultsBlock fetchResultsBlk = ^(NSArray *fetchedObjects) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
[strongSelf.dataArr removeAllObjects];
if (!self.tableView.header.lastUpdatedTime) {
[strongSelf.dataArr addObject:[NSDate date]];
}else{
[strongSelf.dataArr addObject:self.tableView.header.lastUpdatedTime];
}
[strongSelf.dataArr addObjectsFromArray:fetchedObjects];
[self tableViewRefresh:titleStr];
};
ICRDataBaseController *dbCtrl = [ICRDataBaseController sharedController];
[dbCtrl runFetchForClass:NSClassFromString(GXF_BASECLASS_WAREHOUSE)
fetchBlock:fetchBlk
fetchResultsBlock:fetchResultsBlk];
}
}
#pragma mark -成功 #pragma mark -成功
- (void)sureClick{ - (void)sureClick{
if (self.isMoreChose) { if (self.isMoreChose) {
......
XFFruit/Macro/ICRAppMacro.h
View file @ f89f6359
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#import "Vendor.h" #import "Vendor.h"
#import "Warehouse.h" #import "Warehouse.h"
#import "Accounttitle.h" #import "Accounttitle.h"
#import "UserWarehouse.h"
......
XFFruit/Utilities/IBTUIKit/IBTConstants.h
View file @ f89f6359
This diff is collapsed.
XFFruit/ViewControllers/ChooseViewController/ChooseWarehouseViewController.m
View file @ f89f6359
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
//记录更新时间 //记录更新时间
self.tableView.header.lastUpdatedTimeKey = ChooseWarehouseUpdateDate; self.tableView.header.lastUpdatedTimeKey = ChooseWarehouseUpdateDate;
self.title = @"选择仓库"; self.title = @"选择仓库";
[self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE]; [self fetchDataList:@"" tableStr:GXF_BASECLASS_UserWAREHOUSE];
} }
-(void)getBaseDataFromServerWithStartDate:(NSString *)startDate{ -(void)getBaseDataFromServerWithStartDate:(NSString *)startDate{
...@@ -51,7 +51,9 @@ ...@@ -51,7 +51,9 @@
if (pageCount <= self.currentPage) { if (pageCount <= self.currentPage) {
[self endRefreshing]; [self endRefreshing];
[IBTLoadingView hideHUDWithText:nil]; [IBTLoadingView hideHUDWithText:nil];
[self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE]; // [self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE];
self.currentPage = 0;
[self getUserWareHouseFromServer:self.startDate];
}else{ }else{
self.currentPage++; self.currentPage++;
[self getBaseDataFromServerWithStartDate:self.startDate]; [self getBaseDataFromServerWithStartDate:self.startDate];
...@@ -60,7 +62,41 @@ ...@@ -60,7 +62,41 @@
[IBTLoadingView hideHUDWithText:nil]; [IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTips:data]; [IBTLoadingView showTips:data];
} }
}
- (void)getUserWareHouseFromServer:(NSString *)startDate{
__weak typeof(self)weakSelf = self;
void(^succ)(id) = ^(id data) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
//请求成功之后
strongSelf.startDate = startDate;
[strongSelf getLastUWDataFromServer:data];
};
void(^fail)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTips:data];
[self endRefreshing];
};
[[ICRHTTPController sharedController] downloadUserWarehouseWithStartDate:startDate Page_number:self.currentPage page_size:100 success:succ failure:fail];
}
- (void)getLastUWDataFromServer:(id)data
{
if (data) {
NSDictionary *pageDict = data[ @"data" ][ @"paging" ];
NSInteger pageCount = [pageDict[@"pageCount"] integerValue];
if (pageCount <= self.currentPage) {
[self endRefreshing];
[IBTLoadingView hideHUDWithText:nil];
[self fetchDataList:@"" tableStr:GXF_BASECLASS_UserWAREHOUSE];
}else{
self.currentPage++;
[self getUserWareHouseFromServer:self.startDate];
}
}else{
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTips:data];
}
} }
#pragma mark - 协议方法 #pragma mark - 协议方法
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
......
XFFruit/ViewControllers/Purchase/Controllers/ProductBillViewController.m
View file @ f89f6359
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
[self.view addSubview:self.tableView]; [self.view addSubview:self.tableView];
NSArray *arr = @[@"商品",@"单价",@"包装数量",@"已发运"]; NSArray *arr = @[@"商品",@"单价",@"包装数量",@"已发运数"];
HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenEdit]; HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenEdit];
[self.view addSubview:headCell]; [self.view addSubview:headCell];
......
XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m
View file @ f89f6359
...@@ -151,7 +151,7 @@ typedef enum : NSUInteger { ...@@ -151,7 +151,7 @@ typedef enum : NSUInteger {
} }
}else if([self.bill.state isEqualToString:PURCHASE_STATE_SHIPPING]){//状态是发运中即已审批 }else if([self.bill.state isEqualToString:PURCHASE_STATE_SHIPPING]){//状态是发运中即已审批
NSMutableArray *arr = [NSMutableArray array]; NSMutableArray *arr = [NSMutableArray array];
if([self checkIsPermission:PURCHASE_PERMISSIONS_VENDORAPPROVE]){//供应商审批权 if([self checkIsPermission:PURCHASE_PERMISSIONS_VENDORAPPROVE] && (!self.bill.vendorConfirmTime || self.bill.vendorConfirmTime.length < 1)){//供应商审批权
//显示确认按钮 //显示确认按钮
[arr addObject:@"确认"]; [arr addObject:@"确认"];
} }
...@@ -173,11 +173,22 @@ typedef enum : NSUInteger { ...@@ -173,11 +173,22 @@ typedef enum : NSUInteger {
NSArray *arr = @[@"作废"]; NSArray *arr = @[@"作废"];
[self createBtnWithArr:arr]; [self createBtnWithArr:arr];
}else{
[self hiddenTwoBtn];
}
}else if([self.bill.state isEqualToString:PURCHASE_STATE_PROCESSFAIL]){//系统处理失败的
if ([self checkIsPermission:PURCHASE_PERMISSIONS_ABORT]) {//有作废权的
//显示作废按钮
NSArray *arr = @[@"作废"];
[self createBtnWithArr:arr];
}else{ }else{
[self hiddenTwoBtn]; [self hiddenTwoBtn];
} }
}else if([self.bill.state isEqualToString:PURCHASE_STATE_ABORTED]){//已作废 }else if([self.bill.state isEqualToString:PURCHASE_STATE_ABORTED]){//已作废
[self hiddenTwoBtn]; [self hiddenTwoBtn];
}else{
[self hiddenTwoBtn];
} }
} }
...@@ -356,6 +367,12 @@ typedef enum : NSUInteger { ...@@ -356,6 +367,12 @@ typedef enum : NSUInteger {
}else if ([self.bill.state isEqualToString:PURCHASE_STATE_FINISHED]) { }else if ([self.bill.state isEqualToString:PURCHASE_STATE_FINISHED]) {
self.stateLabel.textColor = [UIColor blackColor]; self.stateLabel.textColor = [UIColor blackColor];
self.stateLabel.text = @"已完成"; self.stateLabel.text = @"已完成";
}else if ([self.bill.state isEqualToString:PURCHASE_STATE_PROCESS]) {
self.stateLabel.textColor = [UIColor blackColor];
self.stateLabel.text = @"提交系统处理";
}else if ([self.bill.state isEqualToString:PURCHASE_STATE_PROCESSFAIL]) {
self.stateLabel.textColor = [UIColor blackColor];
self.stateLabel.text = @"系统处理失败";
} }
self.noticeNumberLabel.text = (self.bill.noticeNumber.length == 0) ? @"无":(self.bill.noticeNumber); self.noticeNumberLabel.text = (self.bill.noticeNumber.length == 0) ? @"无":(self.bill.noticeNumber);
self.createOperNameLabel.text = [IBTCommon checkString:self.bill.create_operName]; self.createOperNameLabel.text = [IBTCommon checkString:self.bill.create_operName];
...@@ -366,7 +383,7 @@ typedef enum : NSUInteger { ...@@ -366,7 +383,7 @@ typedef enum : NSUInteger {
self.lastModifyNameLabel.text = [IBTCommon checkString:self.bill.lastModify_operName]; self.lastModifyNameLabel.text = [IBTCommon checkString:self.bill.lastModify_operName];
NSString *type = [self.bill.type isEqualToString:GXF_Critical] ? @"紧急" : @"普通"; NSString *type = [self.bill.type isEqualToString:GXF_Critical] ? @"紧急" : @"普通";
self.typeLabel.text = type; self.typeLabel.text = type;
self.vendorIsSureLabel.text = self.bill.vendorConfirmTime.length > 0 ? @"是":@"否"; self.vendorIsSureLabel.text = (self.bill.vendorConfirmTime.length > 0 && self.bill.vendorConfirmTime)? @"是":@"否";
self.warehouseLabel.text = [IBTCommon checkString:self.bill.receiveWrh_name]; self.warehouseLabel.text = [IBTCommon checkString:self.bill.receiveWrh_name];
self.otherPriceLabel.text = [self.bill.charge stringValue]; self.otherPriceLabel.text = [self.bill.charge stringValue];
NSMutableArray *productArr = [NSMutableArray array]; NSMutableArray *productArr = [NSMutableArray array];
...@@ -389,7 +406,7 @@ typedef enum : NSUInteger { ...@@ -389,7 +406,7 @@ typedef enum : NSUInteger {
noteFrame.size.height = height; noteFrame.size.height = height;
self.noteLabel.frame = noteFrame; self.noteLabel.frame = noteFrame;
CGFloat totalHeight = height + LeftHeight*_leftArr.count; CGFloat totalHeight = height + LeftHeight*_leftArr.count + LeftMargin;
CGRect purchaseFrame = _purchaseView.frame; CGRect purchaseFrame = _purchaseView.frame;
purchaseFrame.size.height = totalHeight; purchaseFrame.size.height = totalHeight;
_purchaseView.frame = purchaseFrame; _purchaseView.frame = purchaseFrame;
......
XFFruit/ViewControllers/Purchase/Controllers/PurchaseViewController.m
View file @ f89f6359
...@@ -48,6 +48,8 @@ typedef enum : NSUInteger { ...@@ -48,6 +48,8 @@ typedef enum : NSUInteger {
@property (nonatomic,strong)NSString *vendorLike; @property (nonatomic,strong)NSString *vendorLike;
@property (nonatomic,strong)NSString *state; @property (nonatomic,strong)NSString *state;
@property (nonatomic,strong)NSString *billLike; @property (nonatomic,strong)NSString *billLike;
@property (nonatomic,strong)NSString *productLike;
@property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序) @property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序)
@end @end
...@@ -119,6 +121,10 @@ typedef enum : NSUInteger { ...@@ -119,6 +121,10 @@ typedef enum : NSUInteger {
if (self.vendorLike.length > 0) { if (self.vendorLike.length > 0) {
vendorObject = self.vendorLike; vendorObject = self.vendorLike;
} }
id productObject = [NSNull null];
if (self.productLike.length > 0) {
productObject = self.productLike;
}
if (orderArr.count == 0) { if (orderArr.count == 0) {
QueryOrder *order = [QueryOrder new]; QueryOrder *order = [QueryOrder new];
order.field = @"billNumber"; order.field = @"billNumber";
...@@ -128,6 +134,7 @@ typedef enum : NSUInteger { ...@@ -128,6 +134,7 @@ typedef enum : NSUInteger {
} }
NSDictionary *dict = @{ NSDictionary *dict = @{
@"billNumberLike":billObject, @"billNumberLike":billObject,
@"productLike":productObject,
@"state":stateObject, @"state":stateObject,
@"titleLike":titleObject, @"titleLike":titleObject,
@"vendorUuid":vendorObject, @"vendorUuid":vendorObject,
...@@ -263,7 +270,7 @@ typedef enum : NSUInteger { ...@@ -263,7 +270,7 @@ typedef enum : NSUInteger {
}else{ }else{
[btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal]; [btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
if (_boltView == nil) { if (_boltView == nil) {
_boltView = [[PurchaseBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state billNumber:self.billLike titleStr:self.titleLike vendorNumber:self.vendorLike]; _boltView = [[PurchaseBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state billNumber:self.billLike titleStr:self.titleLike vendorNumber:self.vendorLike productNumber:self.productLike];
_boltView.backgroundColor = XXFBgColor; _boltView.backgroundColor = XXFBgColor;
_boltView.delegate = self; _boltView.delegate = self;
...@@ -330,7 +337,7 @@ typedef enum : NSUInteger { ...@@ -330,7 +337,7 @@ typedef enum : NSUInteger {
} }
} }
- (void)checkBoltBtnColor{ - (void)checkBoltBtnColor{
if (self.state.length > 0 || self.titleLike.length > 0 || self.billLike.length > 0 || self.vendorLike.length > 0) { if (self.state.length > 0 || self.titleLike.length > 0 || self.billLike.length > 0 || self.vendorLike.length > 0 || self.productLike.length > 0) {
[_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal]; [_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
}else{ }else{
[_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal]; [_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal];
...@@ -343,7 +350,7 @@ typedef enum : NSUInteger { ...@@ -343,7 +350,7 @@ typedef enum : NSUInteger {
[_boltView.titleFiled resignFirstResponder]; [_boltView.titleFiled resignFirstResponder];
[_boltView.billFiled resignFirstResponder]; [_boltView.billFiled resignFirstResponder];
[_boltView.vendorFiled resignFirstResponder]; [_boltView.vendorFiled resignFirstResponder];
[_boltView.productFiled resignFirstResponder];
_currentPage = 0; _currentPage = 0;
//请求 //请求
...@@ -382,6 +389,10 @@ typedef enum : NSUInteger { ...@@ -382,6 +389,10 @@ typedef enum : NSUInteger {
self.vendorLike = vendorLike; self.vendorLike = vendorLike;
CLog(@"%@",vendorLike); CLog(@"%@",vendorLike);
} }
- (void)getproductLike:(NSString *)productLike{
self.productLike = productLike;
CLog(@"%@",productLike);
}
- (void)clearBoltInformation{ - (void)clearBoltInformation{
//清空所有条件 //清空所有条件
if (self.billLike.length > 0) { if (self.billLike.length > 0) {
...@@ -396,6 +407,9 @@ typedef enum : NSUInteger { ...@@ -396,6 +407,9 @@ typedef enum : NSUInteger {
if (self.vendorLike.length > 0) { if (self.vendorLike.length > 0) {
self.vendorLike = @""; self.vendorLike = @"";
} }
if (self.productLike.length > 0) {
self.productLike = @"";
}
} }
#pragma mark - 协议方法 #pragma mark - 协议方法
......
XFFruit/ViewControllers/Purchase/Models/UserWarehouse.h 0 → 100644
View file @ f89f6359
//
// UserWarehouse.h
// XFFruit
//
// Created by 陈俊俊 on 15/12/10.
// Copyright © 2015年 Xummer. All rights reserved.
//
#import "IBTModel.h"
@interface UserWarehouse : IBTModel
@property (nonatomic,strong)NSString *uuid;// id
@property (nonatomic,strong)NSString *userUuid; //用户标识
@property (nonatomic,strong)NSString *warehouseUuid; //仓库唯一标识
@property (nonatomic,strong)NSString *create_time; //创建时间
@property (nonatomic,strong)NSString *create_id; //创建人代码
@property (nonatomic,strong)NSString *create_operName; //创建人名称
@property (nonatomic,strong)NSString *lastModified_time; //最后修改时间
@property (nonatomic,strong)NSString *lastModified_id; //最后修改人代码
@property (nonatomic,strong)NSString *lastModified_operName; //最后修改人名称
@end
XFFruit/ViewControllers/Purchase/Models/UserWarehouse.m 0 → 100644
View file @ f89f6359
//
// UserWarehouse.m
// XFFruit
//
// Created by 陈俊俊 on 15/12/10.
// Copyright © 2015年 Xummer. All rights reserved.
//
#import "UserWarehouse.h"
@implementation UserWarehouse
+ (NSDictionary *)specialKeysAndReplaceKeys {
return @{ @"uwID" : [[self class] PrimaryKey], };
}
+ (NSString *)PrimaryKey {
return @"uuid";
}
@end
XFFruit/ViewControllers/Purchase/Views/PurchaseBoltView.h
View file @ f89f6359
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
- (void)getbillLike:(NSString *)billLike; - (void)getbillLike:(NSString *)billLike;
- (void)gettitleLike:(NSString *)titleLike; - (void)gettitleLike:(NSString *)titleLike;
- (void)getvendorLike:(NSString *)vendorLike; - (void)getvendorLike:(NSString *)vendorLike;
- (void)getproductLike:(NSString *)productLike;
- (void)clearBoltInformation; - (void)clearBoltInformation;
@end @end
...@@ -25,6 +26,8 @@ ...@@ -25,6 +26,8 @@
@property (nonatomic,strong)UITextField *billFiled;//采购单号类似于 @property (nonatomic,strong)UITextField *billFiled;//采购单号类似于
@property (nonatomic,strong)UITextField *titleFiled;//通知单号类似于 @property (nonatomic,strong)UITextField *titleFiled;//通知单号类似于
@property (nonatomic,strong)UITextField *vendorFiled;//供应商uuid类似于 @property (nonatomic,strong)UITextField *vendorFiled;//供应商uuid类似于
@property (nonatomic,strong)UITextField *productFiled;//商品单号类似于
- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state billNumber:(NSString *)billNumber titleStr:(NSString *)titleStr vendorNumber:(NSString *)vendorNumber;
- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state billNumber:(NSString *)billNumber titleStr:(NSString *)titleStr vendorNumber:(NSString *)vendorNumber productNumber:(NSString *)productNumber;
@end @end
XFFruit/ViewControllers/Purchase/Views/PurchaseBoltView.m
View file @ f89f6359
...@@ -25,18 +25,21 @@ ...@@ -25,18 +25,21 @@
@property (nonatomic,strong)NSString *vendorNumber; @property (nonatomic,strong)NSString *vendorNumber;
@property (nonatomic,strong)NSString *billNumber; @property (nonatomic,strong)NSString *billNumber;
@property (nonatomic,strong)NSString *productNumber;
@end @end
@implementation PurchaseBoltView @implementation PurchaseBoltView
- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state billNumber:(NSString *)billNumber titleStr:(NSString *)titleStr vendorNumber:(NSString *)vendorNumber{ - (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state billNumber:(NSString *)billNumber titleStr:(NSString *)titleStr vendorNumber:(NSString *)vendorNumber productNumber:(NSString *)productNumber{
self = [super initWithFrame:frame]; self = [super initWithFrame:frame];
if (self) { if (self) {
self.billNumber = billNumber; self.billNumber = billNumber;
self.titleStr = titleStr; self.titleStr = titleStr;
self.vendorNumber = vendorNumber; self.vendorNumber = vendorNumber;
self.state = state; self.state = state;
self.productNumber = productNumber;
[self createView]; [self createView];
[self createRightView]; [self createRightView];
[self preferData]; [self preferData];
...@@ -70,6 +73,10 @@ ...@@ -70,6 +73,10 @@
if (self.vendorNumber.length > 0) { if (self.vendorNumber.length > 0) {
self.vendorFiled.text = self.vendorNumber; self.vendorFiled.text = self.vendorNumber;
} }
self.productFiled.hidden = YES;
if (self.productNumber.length > 0) {
self.productFiled.text = self.productNumber;
}
} }
#pragma mark - 创建视图 #pragma mark - 创建视图
...@@ -77,7 +84,7 @@ ...@@ -77,7 +84,7 @@
{ {
_leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)]; _leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)];
[self addSubview:_leftView]; [self addSubview:_leftView];
NSArray *arr = @[@"按状态",@"采购单号",@"标题",@"供应商Uuid"]; NSArray *arr = @[@"按状态",@"采购单号",@"标题",@"供应商Uuid",@"商品单号"];
for (NSInteger i = 0; i<arr.count; i++) { for (NSInteger i = 0; i<arr.count; i++) {
UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem]; UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
button.frame = CGRectMake(0, LeftHeight * i , LeftMargin ,LeftHeight); button.frame = CGRectMake(0, LeftHeight * i , LeftMargin ,LeftHeight);
...@@ -102,7 +109,7 @@ ...@@ -102,7 +109,7 @@
[self addSubview:_clearBtn]; [self addSubview:_clearBtn];
} }
- (void)createRightView{ - (void)createRightView{
NSArray *arr = @[@"输入类似采购单号",@"输入类似标题",@"输入类似供应商Uuid"]; NSArray *arr = @[@"输入类似采购单号",@"输入类似标题",@"输入类似供应商Uuid",@"输入类似商品单号"];
UIView *contentView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)]; UIView *contentView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)];
contentView.backgroundColor = [UIColor whiteColor]; contentView.backgroundColor = [UIColor whiteColor];
[self addSubview:contentView]; [self addSubview:contentView];
...@@ -128,6 +135,8 @@ ...@@ -128,6 +135,8 @@
_titleFiled = contentField; _titleFiled = contentField;
}else if(i == 2){ }else if(i == 2){
_vendorFiled = contentField; _vendorFiled = contentField;
}else if (i == 3){
_productFiled = contentField;
} }
} }
self.tableView = [[UITableView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight) style:(UITableViewStylePlain)]; self.tableView = [[UITableView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight) style:(UITableViewStylePlain)];
...@@ -151,6 +160,7 @@ ...@@ -151,6 +160,7 @@
_billFiled.hidden = YES; _billFiled.hidden = YES;
_titleFiled.hidden = YES; _titleFiled.hidden = YES;
_vendorFiled.hidden = YES; _vendorFiled.hidden = YES;
_productFiled.hidden = YES;
} }
break; break;
case 1002://条件二 case 1002://条件二
...@@ -159,6 +169,7 @@ ...@@ -159,6 +169,7 @@
_billFiled.hidden = NO; _billFiled.hidden = NO;
_titleFiled.hidden = YES; _titleFiled.hidden = YES;
_vendorFiled.hidden = YES; _vendorFiled.hidden = YES;
_productFiled.hidden = YES;
} }
break; break;
case 1003://条件三 case 1003://条件三
...@@ -167,6 +178,7 @@ ...@@ -167,6 +178,7 @@
_billFiled.hidden = YES; _billFiled.hidden = YES;
_titleFiled.hidden = NO; _titleFiled.hidden = NO;
_vendorFiled.hidden = YES; _vendorFiled.hidden = YES;
_productFiled.hidden = YES;
} }
break; break;
case 1004://条件四 case 1004://条件四
...@@ -175,6 +187,16 @@ ...@@ -175,6 +187,16 @@
_billFiled.hidden = YES; _billFiled.hidden = YES;
_titleFiled.hidden = YES; _titleFiled.hidden = YES;
_vendorFiled.hidden = NO; _vendorFiled.hidden = NO;
_productFiled.hidden = YES;
}
break;
case 1005://条件五
{
self.tableView.hidden = YES;
_billFiled.hidden = YES;
_titleFiled.hidden = YES;
_vendorFiled.hidden = YES;
_productFiled.hidden = NO;
} }
break; break;
default: default:
...@@ -192,6 +214,9 @@ ...@@ -192,6 +214,9 @@
if (_vendorFiled.text.length > 0) { if (_vendorFiled.text.length > 0) {
_vendorFiled.text = @""; _vendorFiled.text = @"";
} }
if (_productFiled.text.length > 0) {
_productFiled.text = @"";
}
if (_currentIndexPath) { if (_currentIndexPath) {
_currentIndexPath = nil; _currentIndexPath = nil;
[self.tableView reloadData]; [self.tableView reloadData];
...@@ -273,6 +298,7 @@ ...@@ -273,6 +298,7 @@
[self.billFiled resignFirstResponder]; [self.billFiled resignFirstResponder];
[self.titleFiled resignFirstResponder]; [self.titleFiled resignFirstResponder];
[self.vendorFiled resignFirstResponder]; [self.vendorFiled resignFirstResponder];
[self.productFiled resignFirstResponder];
} }
- (void)textFieldDidEndEditing:(UITextField *)textField{ - (void)textFieldDidEndEditing:(UITextField *)textField{
...@@ -288,6 +314,10 @@ ...@@ -288,6 +314,10 @@
// if (self.vendorFiled.text.length > 0) { // if (self.vendorFiled.text.length > 0) {
[self.delegate getvendorLike:self.vendorFiled.text]; [self.delegate getvendorLike:self.vendorFiled.text];
// } // }
}else if(textField == self.productFiled){
// if (self.vendorFiled.text.length > 0) {
[self.delegate getproductLike:self.productFiled.text];
// }
} }
} }
......
XFFruit/ViewControllers/Purchase/Views/PurchaseCell.m
View file @ f89f6359
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
self.stateBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.stateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20); self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
self.stateBtn.titleLabel.font = GXF_FOURTEENTH_SIZE; self.stateBtn.titleLabel.font = GXF_FOURTEENTH_SIZE;
// self.stateBtn.backgroundColor = [UIColor redColor];
[self.stateBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [self.stateBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
self.stateBtn.enabled = NO; self.stateBtn.enabled = NO;
...@@ -74,28 +76,45 @@ ...@@ -74,28 +76,45 @@
self.createOperNameLabel.text = [NSString stringWithFormat:@"创建人：%@",purchaseBill.create_operName] ; self.createOperNameLabel.text = [NSString stringWithFormat:@"创建人：%@",purchaseBill.create_operName] ;
self.createTimeLabel.text =[NSString stringWithFormat:@"创建时间：%@",purchaseBill.create_time]; self.createTimeLabel.text =[NSString stringWithFormat:@"创建时间：%@",purchaseBill.create_time];
NSString *stateStr = @""; NSString *stateStr = @"";
// if ([purchaseBill.vendor_code isEqualToString:@"0000"]) {
// purchaseBill.state = PURCHASE_STATE_PROCESS;
// }
if ([purchaseBill.state isEqualToString:PURCHASE_STATE_INITIAL]) { if ([purchaseBill.state isEqualToString:PURCHASE_STATE_INITIAL]) {
self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
stateStr = @"未提交"; stateStr = @"未提交";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled]; [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_SUBMITTED]) { }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_SUBMITTED]) {
self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
stateStr = @"未审批"; stateStr = @"未审批";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled]; [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_REJECTED]) { }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_REJECTED]) {
self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
stateStr = @"已拒绝"; stateStr = @"已拒绝";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled]; [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_SHIPPING]) { }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_SHIPPING]) {
self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
stateStr = @"发运中"; stateStr = @"发运中";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled]; [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
} }
else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_FINISHED]) { else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_FINISHED]) {
self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
stateStr = @"已完成"; stateStr = @"已完成";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled]; [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_ABORTED]) { }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_ABORTED]) {
self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
stateStr = @"已作废"; stateStr = @"已作废";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled]; [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_PROCESS]) {
// self.stateBtn.frame = CGRectMake(0 , TopMargin, LeftMargin - TopMargin, 20);
stateStr = @"提交系统处理";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_PROCESSFAIL]) {
// self.stateBtn.frame = CGRectMake(0 , TopMargin, LeftMargin - TopMargin, 20);
stateStr = @"系统处理失败";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
} }
[self.stateBtn setTitle:stateStr forState:UIControlStateNormal]; [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
} }
......
XFFruit/ViewControllers/PurchaseNotice/Controllers/SeePurchaseNoticeViewController.m
View file @ f89f6359
...@@ -409,7 +409,7 @@ typedef enum : NSUInteger { ...@@ -409,7 +409,7 @@ typedef enum : NSUInteger {
CGFloat height = [self.noteLabel calculateHeight]; CGFloat height = [self.noteLabel calculateHeight];
self.noteLabel.height = height; self.noteLabel.height = height;
CGFloat totalHeight = height + LeftHeight *_leftArr.count; CGFloat totalHeight = height + LeftHeight *_leftArr.count + LeftMargin;
_purchaseView.height = totalHeight; _purchaseView.height = totalHeight;
CGRect bottomFrame = _bottomView.frame; CGRect bottomFrame = _bottomView.frame;
......
XFFruit/ViewControllers/Transfer/Controllers/ChooseTransferViewController.m
View file @ f89f6359
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
} }
NSDictionary *dict = @{ NSDictionary *dict = @{
@"state":TRANSFER_STATE_RECEIVED, @"state":TRANSFER_STATE_RECEIVED,
@"billNumberLike":billNumberObject, @"billNumberProductLike":billNumberObject,
@"queryOrders":orderArr, @"queryOrders":orderArr,
@"userUuid":userUtil.userId, @"userUuid":userUtil.userId,
@"pageNumber":@(_currentPage), @"pageNumber":@(_currentPage),
...@@ -109,6 +109,8 @@ ...@@ -109,6 +109,8 @@
TransferPdtDetail *tran = [TransferPdtDetail new]; TransferPdtDetail *tran = [TransferPdtDetail new];
[tran setValuesForKeysWithDictionary:pdtDetailDict]; [tran setValuesForKeysWithDictionary:pdtDetailDict];
tran.sourcebillnumber = purchaseBill.billnumber; tran.sourcebillnumber = purchaseBill.billnumber;
tran.carnumber = purchaseBill.carnumber;
tran.carphone = purchaseBill.carphone;
[pdtArr addObject:tran]; [pdtArr addObject:tran];
} }
purchaseBill.pdtDetails = pdtArr; purchaseBill.pdtDetails = pdtArr;
...@@ -155,7 +157,7 @@ ...@@ -155,7 +157,7 @@
self.selectTextFiled.textAlignment = NSTextAlignmentLeft; self.selectTextFiled.textAlignment = NSTextAlignmentLeft;
self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"]; self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"];
self.selectTextFiled.delegate = self; self.selectTextFiled.delegate = self;
self.selectTextFiled.placeholder = @"输入类似转运单号"; self.selectTextFiled.placeholder = @"类似转运和商品单号";
self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE; self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE;
[self.view addSubview:self.selectTextFiled]; [self.view addSubview:self.selectTextFiled];
......
XFFruit/ViewControllers/Transfer/Controllers/ChooseTransportViewController.m
View file @ f89f6359
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
NSDictionary *dict = @{ NSDictionary *dict = @{
@"state":TRANSPORT_STATE_RECEIVED, @"state":TRANSPORT_STATE_RECEIVED,
@"userUuid":userUtil.userId, @"userUuid":userUtil.userId,
@"billNumberLike":billNumberObject, @"billNumberProductLike":billNumberObject,
@"queryOrders":orderArr, @"queryOrders":orderArr,
@"fetchParts":@"pdtDetails", @"fetchParts":@"pdtDetails",
@"pageNumber":@(_currentPage), @"pageNumber":@(_currentPage),
...@@ -111,6 +111,8 @@ ...@@ -111,6 +111,8 @@
TransportPdtDetail *tran = [TransportPdtDetail new]; TransportPdtDetail *tran = [TransportPdtDetail new];
[tran setValuesForKeysWithDictionary:pdtDetailDict]; [tran setValuesForKeysWithDictionary:pdtDetailDict];
tran.purchasebillnumber = purchaseBill.billnumber; tran.purchasebillnumber = purchaseBill.billnumber;
tran.carnumber = purchaseBill.carnumber;
tran.carphone = purchaseBill.carphone;
[pdtArr addObject:tran]; [pdtArr addObject:tran];
} }
purchaseBill.pdtDetails = pdtArr; purchaseBill.pdtDetails = pdtArr;
...@@ -157,7 +159,7 @@ ...@@ -157,7 +159,7 @@
self.selectTextFiled.textAlignment = NSTextAlignmentLeft; self.selectTextFiled.textAlignment = NSTextAlignmentLeft;
self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"]; self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"];
self.selectTextFiled.delegate = self; self.selectTextFiled.delegate = self;
self.selectTextFiled.placeholder = @"输入类似发运单号"; self.selectTextFiled.placeholder = @"类似发运和商品单号";
self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE; self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE;
[self.view addSubview:self.selectTextFiled]; [self.view addSubview:self.selectTextFiled];
......
XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m
View file @ f89f6359
...@@ -298,6 +298,8 @@ typedef enum : NSUInteger { ...@@ -298,6 +298,8 @@ typedef enum : NSUInteger {
if (products.count > 0) { if (products.count > 0) {
NSMutableArray *arr = [self coverTransferFromTransportProduct:products]; NSMutableArray *arr = [self coverTransferFromTransportProduct:products];
[_bottomView reProduct:arr]; [_bottomView reProduct:arr];
TransferPdtDetail *pdt = arr[0];
[self setPhoneAndCar:pdt.carnumber phone:pdt.carphone];
} }
}; };
[self PushViewController:tpv animated:YES]; [self PushViewController:tpv animated:YES];
...@@ -308,11 +310,23 @@ typedef enum : NSUInteger { ...@@ -308,11 +310,23 @@ typedef enum : NSUInteger {
ctv.chooseTransferProduct = ^(NSArray *products){ ctv.chooseTransferProduct = ^(NSArray *products){
if (products.count > 0) { if (products.count > 0) {
[_bottomView reProduct:products]; [_bottomView reProduct:products];
TransferPdtDetail *pdt = products[0];
[self setPhoneAndCar:pdt.carnumber phone:pdt.carphone];
} }
}; };
[self PushViewController:ctv animated:YES]; [self PushViewController:ctv animated:YES];
} }
#pragma mark - 从发运单和转运单带过来手机和车辆信息
- (void)setPhoneAndCar:(NSString *)carNumber phone:(NSString *)carphone{
if (_sheetView.carTextFiled.text.length < 1) {
_sheetView.carTextFiled.text = carNumber;
}
if (_sheetView.phoneTextFiled.text.length < 1) {
_sheetView.phoneTextFiled.text = carphone;
}
}
- (void)addTransferCost:(NSNotification *)fination{ - (void)addTransferCost:(NSNotification *)fination{
...@@ -460,6 +474,8 @@ typedef enum : NSUInteger { ...@@ -460,6 +474,8 @@ typedef enum : NSUInteger {
ferPdt.baseUnit = pdt.baseUnit; ferPdt.baseUnit = pdt.baseUnit;
ferPdt.total = pdt.total; ferPdt.total = pdt.total;
ferPdt.note = pdt.note; ferPdt.note = pdt.note;
ferPdt.carphone = pdt.carphone;
ferPdt.carnumber = pdt.carnumber;
[transferP addObject:ferPdt]; [transferP addObject:ferPdt];
} }
return transferP; return transferP;
......
XFFruit/ViewControllers/Transfer/Controllers/TransferDetailViewController.m
View file @ f89f6359
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
#define TopMargin 15 #define TopMargin 15
typedef enum : NSUInteger { typedef enum : NSUInteger {
AbortTag = 20000, AbortTag = 20000,
EndTag EndTag,
SubmitTag
} BtnTag; } BtnTag;
@interface TransferDetailViewController (){ @interface TransferDetailViewController (){
...@@ -86,6 +87,12 @@ typedef enum : NSUInteger { ...@@ -86,6 +87,12 @@ typedef enum : NSUInteger {
}else if ([self.transfer.state isEqualToString:TRANSFER_STATE_ABORTED]) { }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_ABORTED]) {
self.stateLabel.textColor = [UIColor grayColor]; self.stateLabel.textColor = [UIColor grayColor];
self.stateLabel.text = @"已作废"; self.stateLabel.text = @"已作废";
}else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESS]) {
self.stateLabel.textColor = [UIColor blackColor];
self.stateLabel.text = @"提交系统处理";
}else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) {
self.stateLabel.textColor = [UIColor blackColor];
self.stateLabel.text = @"系统处理失败";
} }
self.purchaseLabel.text = [self getPurchaseWith:self.transfer.pdtDetails]; self.purchaseLabel.text = [self getPurchaseWith:self.transfer.pdtDetails];
self.warehouseLabel.text = [IBTCommon checkString:self.transfer.warehouseName]; self.warehouseLabel.text = [IBTCommon checkString:self.transfer.warehouseName];
...@@ -108,14 +115,15 @@ typedef enum : NSUInteger { ...@@ -108,14 +115,15 @@ typedef enum : NSUInteger {
self.noteLabel.frame = noteFrame; self.noteLabel.frame = noteFrame;
CGFloat totalHeight = height + LeftHeight*9; CGFloat totalHeight = height + LeftHeight*9;
// CGRect purchaseFrame = _purchaseView.frame;
// purchaseFrame.size.height = totalHeight; CGRect purchaseFrame = _transportView.frame;
// _purchaseView.frame = purchaseFrame; purchaseFrame.size.height = totalHeight + LeftMargin;
// _transportView.frame = purchaseFrame;
//
// CGRect bottomFrame = _bottomView.frame;
// bottomFrame.origin.y = CGRectGetMaxY(_purchaseView.frame) + TopMargin; CGRect bottomFrame = _bottomView.frame;
// _bottomView.frame = bottomFrame; bottomFrame.origin.y = CGRectGetMaxY(_transportView.frame) + TopMargin;
_bottomView.frame = bottomFrame;
_scrollView.contentSize = CGSizeMake(ScreenSize.width, totalHeight + CGRectGetHeight(_bottomView.frame) + TopMargin*2); _scrollView.contentSize = CGSizeMake(ScreenSize.width, totalHeight + CGRectGetHeight(_bottomView.frame) + TopMargin*2);
} }
...@@ -147,6 +155,8 @@ typedef enum : NSUInteger { ...@@ -147,6 +155,8 @@ typedef enum : NSUInteger {
btnTag = EndTag; btnTag = EndTag;
}else if ([arr[i] isEqualToString:@"作废"]) { }else if ([arr[i] isEqualToString:@"作废"]) {
btnTag = AbortTag; btnTag = AbortTag;
}else if ([arr[i] isEqualToString:@"提交"]) {
btnTag = SubmitTag;
} }
CGRect btnFrame = CGRectMake(LeftMargin + (LeftMargin + btnWidth)*i, ScreenSize.height - 64 - BottomHeight +5, btnWidth, 40); CGRect btnFrame = CGRectMake(LeftMargin + (LeftMargin + btnWidth)*i, ScreenSize.height - 64 - BottomHeight +5, btnWidth, 40);
UIButton *perBtn = [IBTCustomButtom creatButtonWithFrame:btnFrame target:self sel:@selector(btnClick:) tag:btnTag image:nil title:arr[i] titleColor:[UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_COMMIT_COLOR]; UIButton *perBtn = [IBTCustomButtom creatButtonWithFrame:btnFrame target:self sel:@selector(btnClick:) tag:btnTag image:nil title:arr[i] titleColor:[UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_COMMIT_COLOR];
...@@ -169,6 +179,19 @@ typedef enum : NSUInteger { ...@@ -169,6 +179,19 @@ typedef enum : NSUInteger {
}else{ }else{
[self hiddenBottomView]; [self hiddenBottomView];
} }
#warning 测试
}else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]){
NSMutableArray *arr = [NSMutableArray array];
if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_ABORT]) {
[arr addObject:@"作废"];
}if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_NEW]) {
[arr addObject:@"提交"];
}
if (arr.count == 0) {
[self hiddenBottomView];
}else{
[self createBtnWithArr:arr];
}
}else{ }else{
[self hiddenBottomView]; [self hiddenBottomView];
} }
...@@ -255,6 +278,15 @@ typedef enum : NSUInteger { ...@@ -255,6 +278,15 @@ typedef enum : NSUInteger {
[alertView show]; [alertView show];
} }
break; break;
case SubmitTag:
{
CLog(@"提交");
UIAlertView *alertView = [[UIAlertView alloc]initWithTitle:@"温馨提示" message:@"请确认提交" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil];
alertView.delegate = self;
alertView.tag = SubmitTag;
[alertView show];
}
break;
default: default:
break; break;
...@@ -271,6 +303,10 @@ typedef enum : NSUInteger { ...@@ -271,6 +303,10 @@ typedef enum : NSUInteger {
if (buttonIndex == 1) { if (buttonIndex == 1) {
[self dealByAction:TRANSFER_STATE_RECEIVED];//结束 [self dealByAction:TRANSFER_STATE_RECEIVED];//结束
} }
}else if (alertView.tag == SubmitTag){
if (buttonIndex == 1) { //提交
[self getDataFromServer:TRANSFER_STATE_PROCESSFAIL msg:@"正在提交..."];
}
} }
} }
- (void)dealByAction:(NSString *)action{ - (void)dealByAction:(NSString *)action{
...@@ -301,7 +337,49 @@ typedef enum : NSUInteger { ...@@ -301,7 +337,49 @@ typedef enum : NSUInteger {
[[ICRHTTPController sharedController] endTransferWithTransferUuid:self.transfer.uuid version:self.transfer.version success:succ failure:fail]; [[ICRHTTPController sharedController] endTransferWithTransferUuid:self.transfer.uuid version:self.transfer.version success:succ failure:fail];
} }
} }
#pragma mark - 提交数据
- (void)getDataFromServer:(NSString *)state msg:(NSString *)msg{
//保存
void(^succ)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
if (data) {
NSInteger success = [data[@"success"] integerValue];
NSString *message = data[@"message"];
if (success == 1) {
[ICRUserUtil sharedInstance].needFresh = YES;
[self PopViewControllerAnimated:YES];
}else{
[IBTLoadingView showTips:message];
}
}
};
void(^fail)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTips:data];
};
NSDictionary *dict = @{@"uuid":self.transfer.uuid,
@"version":self.transfer.version,
@"billnumber":self.transfer.billnumber,
@"enterprise":[ICRUserUtil sharedInstance].orgId,
@"state":TRANSFER_STATE_UNRECEIVED,
@"warehouseUuid":[IBTCommon checkString:self.transfer.warehouseUuid],
@"warehouseCode":[IBTCommon checkString:self.transfer.warehouseCode],
@"warehouseName":[IBTCommon checkString:self.transfer.warehouseName],
@"rwarehouseUuid":[IBTCommon checkString:self.transfer.rwarehouseUuid],
@"rwarehouseCode":[IBTCommon checkString:self.transfer.rwarehouseCode],
@"rwarehouseName":[IBTCommon checkString:self.transfer.rwarehouseName],
@"carnumber":[IBTCommon checkString:self.transfer.carnumber],
@"type":[IBTCommon checkString:self.transfer.type],
@"carphone":[IBTCommon checkString:self.transfer.carphone],
@"arriveDate":[IBTCommon checkString:self.transfer.arriveDate],
@"note":[IBTCommon checkString:self.transfer.note],
@"pdtDetails":self.transfer.pdtDetails,
@"accountDetails":self.transfer.accountDetails
};
[IBTLoadingView showProgressLabel:msg];
[[ICRHTTPController sharedController] saveTransferWithData:dict success:succ failure:fail];
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
......
XFFruit/ViewControllers/Transfer/Controllers/TransferViewController.m
View file @ f89f6359
...@@ -47,6 +47,8 @@ typedef enum : NSUInteger { ...@@ -47,6 +47,8 @@ typedef enum : NSUInteger {
@property (nonatomic,strong)NSString *billLike; @property (nonatomic,strong)NSString *billLike;
@property (nonatomic,strong)NSString *state; @property (nonatomic,strong)NSString *state;
@property (nonatomic,strong)NSString *userLike; @property (nonatomic,strong)NSString *userLike;
@property (nonatomic,strong)NSString *productLike;
@property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序) @property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序)
@end @end
...@@ -89,6 +91,10 @@ typedef enum : NSUInteger { ...@@ -89,6 +91,10 @@ typedef enum : NSUInteger {
if (self.userLike.length > 0) { if (self.userLike.length > 0) {
userObject = self.userLike; userObject = self.userLike;
} }
id productObject = [NSNull null];
if (self.productLike.length > 0) {
productObject = self.productLike;
}
id stateObject = [NSNull null]; id stateObject = [NSNull null];
if (self.state.length > 0 && ![self.state isEqualToString:@"none"]) { if (self.state.length > 0 && ![self.state isEqualToString:@"none"]) {
stateObject = self.state; stateObject = self.state;
...@@ -120,6 +126,7 @@ typedef enum : NSUInteger { ...@@ -120,6 +126,7 @@ typedef enum : NSUInteger {
NSDictionary *dict = @{ NSDictionary *dict = @{
@"state":stateObject, @"state":stateObject,
@"billNumberLike":billObject, @"billNumberLike":billObject,
@"productLike":productObject,
@"creator":userObject, @"creator":userObject,
@"queryOrders":orderArr, @"queryOrders":orderArr,
@"userUuid":userUtil.userId, @"userUuid":userUtil.userId,
...@@ -159,8 +166,6 @@ typedef enum : NSUInteger { ...@@ -159,8 +166,6 @@ typedef enum : NSUInteger {
}else{ }else{
[IBTLoadingView showTips:@" 无记录 "]; [IBTLoadingView showTips:@" 无记录 "];
} }
} }
- (void)createRefresh{ - (void)createRefresh{
self.tableView.header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ self.tableView.header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
...@@ -253,7 +258,7 @@ typedef enum : NSUInteger { ...@@ -253,7 +258,7 @@ typedef enum : NSUInteger {
}else{ }else{
[btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal]; [btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
if (_boltView == nil) { if (_boltView == nil) {
_boltView = [[TransferBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state userNumber:self.userLike billNumber:self.billLike]; _boltView = [[TransferBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state userNumber:self.userLike billNumber:self.billLike productNumber:self.productLike];
_boltView.backgroundColor = XXFBgColor; _boltView.backgroundColor = XXFBgColor;
_boltView.delegate = self; _boltView.delegate = self;
...@@ -320,7 +325,7 @@ typedef enum : NSUInteger { ...@@ -320,7 +325,7 @@ typedef enum : NSUInteger {
} }
} }
- (void)checkBoltBtnColor{ - (void)checkBoltBtnColor{
if (self.state.length > 0 || self.billLike.length > 0 || self.userLike.length > 0) { if (self.state.length > 0 || self.billLike.length > 0 || self.userLike.length > 0 || self.productLike.length > 0) {
[_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal]; [_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
}else{ }else{
[_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal]; [_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal];
...@@ -333,6 +338,7 @@ typedef enum : NSUInteger { ...@@ -333,6 +338,7 @@ typedef enum : NSUInteger {
[_boltView.userFiled resignFirstResponder]; [_boltView.userFiled resignFirstResponder];
[_boltView.billFiled resignFirstResponder]; [_boltView.billFiled resignFirstResponder];
[_boltView.productField resignFirstResponder];
_currentPage = 0; _currentPage = 0;
//请求 //请求
...@@ -367,6 +373,11 @@ typedef enum : NSUInteger { ...@@ -367,6 +373,11 @@ typedef enum : NSUInteger {
self.billLike = billLike; self.billLike = billLike;
CLog(@"%@",billLike); CLog(@"%@",billLike);
} }
- (void)getproductLike:(NSString *)productLike{
self.productLike = productLike;
CLog(@"%@",productLike);
}
- (void)clearBoltInformation{ - (void)clearBoltInformation{
//清空所有条件 //清空所有条件
if (self.userLike.length > 0) { if (self.userLike.length > 0) {
...@@ -378,6 +389,9 @@ typedef enum : NSUInteger { ...@@ -378,6 +389,9 @@ typedef enum : NSUInteger {
if (self.state.length > 0) { if (self.state.length > 0) {
self.state = @""; self.state = @"";
} }
if (self.productLike.length > 0) {
self.productLike = @"";
}
} }
#pragma mark - 协议方法 #pragma mark - 协议方法
......
XFFruit/ViewControllers/Transfer/Models/TransferPdtDetail.h
View file @ f89f6359
...@@ -32,4 +32,9 @@ ...@@ -32,4 +32,9 @@
@property (nonatomic,strong)NSNumber *rctQty; //收货数量 @property (nonatomic,strong)NSNumber *rctQty; //收货数量
@property (nonatomic,strong)NSNumber *rctTotal; //收货金额 @property (nonatomic,strong)NSNumber *rctTotal; //收货金额
//新增手机和车辆信息
@property (nonatomic,strong)NSString *carphone; //司机电话
@property (nonatomic,strong)NSString *carnumber; //车牌号
@end @end
XFFruit/ViewControllers/Transfer/Views/TransferBoltView.h
View file @ f89f6359
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
- (void)getBoltValueSelectRow:(NSString *)state; - (void)getBoltValueSelectRow:(NSString *)state;
- (void)getuserLike:(NSString *)userLike; - (void)getuserLike:(NSString *)userLike;
- (void)getbillLike:(NSString *)billLike; - (void)getbillLike:(NSString *)billLike;
- (void)getproductLike:(NSString *)productLike;
- (void)clearBoltInformation; - (void)clearBoltInformation;
@end @end
...@@ -22,6 +24,8 @@ ...@@ -22,6 +24,8 @@
@property (nonatomic,strong)UITextField *userFiled;//采购单号类似于 @property (nonatomic,strong)UITextField *userFiled;//采购单号类似于
@property (nonatomic,strong)UITextField *billFiled;//通知单号类似于 @property (nonatomic,strong)UITextField *billFiled;//通知单号类似于
@property (nonatomic,strong)UITextField *creatorField;//供应商uuid类似于 @property (nonatomic,strong)UITextField *creatorField;//供应商uuid类似于
@property (nonatomic,strong)UITextField *productField;//商品类似于
- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber; - (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber productNumber:(NSString *)productNumber;
@end @end
XFFruit/ViewControllers/Transfer/Views/TransferBoltView.m
View file @ f89f6359
...@@ -28,17 +28,19 @@ ...@@ -28,17 +28,19 @@
@property (nonatomic,strong)NSString *state; @property (nonatomic,strong)NSString *state;
@property (nonatomic,strong)NSString *billNumber; @property (nonatomic,strong)NSString *billNumber;
@property (nonatomic,strong)NSString *userNumber; @property (nonatomic,strong)NSString *userNumber;
@property (nonatomic,strong)NSString *productNumber;
@end @end
@implementation TransferBoltView @implementation TransferBoltView
- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber{ - (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber productNumber:(NSString *)productNumber{
self = [super initWithFrame:frame]; self = [super initWithFrame:frame];
if (self) { if (self) {
self.userNumber = userNumber; self.userNumber = userNumber;
self.billNumber = billNumber; self.billNumber = billNumber;
self.state = state; self.state = state;
self.productNumber = productNumber;
[self createView]; [self createView];
[self createRightView]; [self createRightView];
[self preferData]; [self preferData];
...@@ -63,6 +65,10 @@ ...@@ -63,6 +65,10 @@
if (self.billNumber.length > 0) { if (self.billNumber.length > 0) {
self.billFiled.text = self.billNumber; self.billFiled.text = self.billNumber;
} }
self.productField.hidden = YES;
if (self.productNumber.length > 0) {
self.productField.text = self.productNumber;
}
} }
#pragma mark - 创建视图 #pragma mark - 创建视图
...@@ -70,7 +76,7 @@ ...@@ -70,7 +76,7 @@
{ {
_leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)]; _leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)];
[self addSubview:_leftView]; [self addSubview:_leftView];
NSArray *arr = @[@"按状态",@"创建人代码",@"调研单号"]; NSArray *arr = @[@"按状态",@"创建人代码",@"调研单号",@"商品单号"];
for (NSInteger i = 0; i<arr.count; i++) { for (NSInteger i = 0; i<arr.count; i++) {
UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem]; UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
button.frame = CGRectMake(0, LeftHeight * i , LeftMargin ,LeftHeight); button.frame = CGRectMake(0, LeftHeight * i , LeftMargin ,LeftHeight);
...@@ -97,7 +103,7 @@ ...@@ -97,7 +103,7 @@
- (void)createRightView{ - (void)createRightView{
NSArray *arr = @[@"输入类似创建人代码",@"输入类似调研单号"]; NSArray *arr = @[@"输入类似创建人代码",@"输入类似调研单号",@"输入类似商品单号"];
UIView *contentView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)]; UIView *contentView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)];
contentView.backgroundColor = [UIColor whiteColor]; contentView.backgroundColor = [UIColor whiteColor];
[self addSubview:contentView]; [self addSubview:contentView];
...@@ -121,6 +127,8 @@ ...@@ -121,6 +127,8 @@
self.userFiled = contentField; self.userFiled = contentField;
}else if(i == 1){ }else if(i == 1){
self.billFiled = contentField; self.billFiled = contentField;
}else if(i == 2){
self.productField = contentField;
} }
} }
...@@ -144,6 +152,7 @@ ...@@ -144,6 +152,7 @@
self.tableView.hidden = NO; self.tableView.hidden = NO;
self.userFiled.hidden = YES; self.userFiled.hidden = YES;
self.billFiled.hidden = YES; self.billFiled.hidden = YES;
self.productField.hidden = YES;
} }
break; break;
case 1002://条件二 case 1002://条件二
...@@ -151,6 +160,8 @@ ...@@ -151,6 +160,8 @@
self.tableView.hidden = YES; self.tableView.hidden = YES;
self.userFiled.hidden = NO; self.userFiled.hidden = NO;
self.billFiled.hidden = YES; self.billFiled.hidden = YES;
self.productField.hidden = YES;
} }
break; break;
case 1003://条件三 case 1003://条件三
...@@ -158,6 +169,17 @@ ...@@ -158,6 +169,17 @@
self.tableView.hidden = YES; self.tableView.hidden = YES;
self.userFiled.hidden = YES; self.userFiled.hidden = YES;
self.billFiled.hidden = NO; self.billFiled.hidden = NO;
self.productField.hidden = YES;
}
break;
case 1004://条件三
{
self.tableView.hidden = YES;
self.userFiled.hidden = YES;
self.billFiled.hidden = YES;
self.productField.hidden = NO;
} }
break; break;
default: default:
...@@ -172,6 +194,9 @@ ...@@ -172,6 +194,9 @@
if (_userFiled.text.length > 0) { if (_userFiled.text.length > 0) {
_userFiled.text = @""; _userFiled.text = @"";
} }
if (_productField.text.length > 0) {
_productField.text = @"";
}
if (_currentIndexPath) { if (_currentIndexPath) {
_currentIndexPath = nil; _currentIndexPath = nil;
[self.tableView reloadData]; [self.tableView reloadData];
...@@ -248,6 +273,7 @@ ...@@ -248,6 +273,7 @@
- (void)keyBoardHidden{ - (void)keyBoardHidden{
[self.userFiled resignFirstResponder]; [self.userFiled resignFirstResponder];
[self.billFiled resignFirstResponder]; [self.billFiled resignFirstResponder];
[self.productField resignFirstResponder];
} }
- (void)textFieldDidEndEditing:(UITextField *)textField{ - (void)textFieldDidEndEditing:(UITextField *)textField{
...@@ -259,6 +285,10 @@ ...@@ -259,6 +285,10 @@
// if (self.billFiled.text.length > 0) { // if (self.billFiled.text.length > 0) {
[self.delegate getbillLike:self.billFiled.text]; [self.delegate getbillLike:self.billFiled.text];
// } // }
}else if(textField == self.productField){
// if (self.billFiled.text.length > 0) {
[self.delegate getproductLike:self.productField.text];
// }
} }
} }
......
XFFruit/ViewControllers/Transfer/Views/TransferCell.m
View file @ f89f6359
...@@ -97,6 +97,12 @@ ...@@ -97,6 +97,12 @@
stateStr = @"已作废"; stateStr = @"已作废";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled]; [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
}else if ([transfer.state isEqualToString:TRANSFER_STATE_PROCESS]) {
stateStr = @"提交系统处理";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
}else if ([transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) {
stateStr = @"系统处理失败";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
} }
[self.stateBtn setTitle:stateStr forState:UIControlStateNormal]; [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
} }
......
XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m
View file @ f89f6359
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
#define TopMargin 15 #define TopMargin 15
typedef enum : NSUInteger { typedef enum : NSUInteger {
AbortTag = 20000, AbortTag = 20000,
EndTag EndTag,
SubmitTag
} BtnTag; } BtnTag;
...@@ -96,6 +97,12 @@ typedef enum : NSUInteger { ...@@ -96,6 +97,12 @@ typedef enum : NSUInteger {
}else if ([self.transport.state isEqualToString:TRANSPORT_STATE_ABORTED]) { }else if ([self.transport.state isEqualToString:TRANSPORT_STATE_ABORTED]) {
self.stateLabel.textColor = [UIColor grayColor]; self.stateLabel.textColor = [UIColor grayColor];
self.stateLabel.text = @"已作废"; self.stateLabel.text = @"已作废";
}else if ([self.transport.state isEqualToString:TRANSPORT_STATE_PROCESS]) {
self.stateLabel.textColor = [UIColor blackColor];
self.stateLabel.text = @"提交系统处理";
}else if ([self.transport.state isEqualToString:TRANSPORT_STATE_PROCESSFAIL]) {
self.stateLabel.textColor = [UIColor blackColor];
self.stateLabel.text = @"系统处理失败";
} }
self.purchaseLabel.text = [self getPurchaseWith:self.transport.pdtDetails]; self.purchaseLabel.text = [self getPurchaseWith:self.transport.pdtDetails];
self.warehouseLabel.text = [IBTCommon checkString:self.transport.warehouseName]; self.warehouseLabel.text = [IBTCommon checkString:self.transport.warehouseName];
...@@ -137,14 +144,14 @@ typedef enum : NSUInteger { ...@@ -137,14 +144,14 @@ typedef enum : NSUInteger {
self.noteLabel.frame = noteFrame; self.noteLabel.frame = noteFrame;
CGFloat totalHeight = height + LeftHeight*9; CGFloat totalHeight = height + LeftHeight*9;
// CGRect purchaseFrame = _purchaseView.frame;
// purchaseFrame.size.height = totalHeight; CGRect purchaseFrame = _transportView.frame;
// _purchaseView.frame = purchaseFrame; purchaseFrame.size.height = totalHeight + LeftMargin;
// _transportView.frame = purchaseFrame;
//
// CGRect bottomFrame = _bottomView.frame; CGRect bottomFrame = _bottomView.frame;
// bottomFrame.origin.y = CGRectGetMaxY(_purchaseView.frame) + TopMargin; bottomFrame.origin.y = CGRectGetMaxY(_transportView.frame) + TopMargin;
// _bottomView.frame = bottomFrame; _bottomView.frame = bottomFrame;
_scrollView.contentSize = CGSizeMake(ScreenSize.width, totalHeight + CGRectGetHeight(_bottomView.frame) + TopMargin*2); _scrollView.contentSize = CGSizeMake(ScreenSize.width, totalHeight + CGRectGetHeight(_bottomView.frame) + TopMargin*2);
} }
...@@ -170,7 +177,15 @@ typedef enum : NSUInteger { ...@@ -170,7 +177,15 @@ typedef enum : NSUInteger {
[alertView show]; [alertView show];
} }
break; break;
case SubmitTag:
{
CLog(@"提交");
UIAlertView *alertView = [[UIAlertView alloc]initWithTitle:@"温馨提示" message:@"请确认提交" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil];
alertView.delegate = self;
alertView.tag = SubmitTag;
[alertView show];
}
break;
default: default:
break; break;
} }
...@@ -217,6 +232,8 @@ typedef enum : NSUInteger { ...@@ -217,6 +232,8 @@ typedef enum : NSUInteger {
btnTag = EndTag; btnTag = EndTag;
}else if ([arr[i] isEqualToString:@"作废"]) { }else if ([arr[i] isEqualToString:@"作废"]) {
btnTag = AbortTag; btnTag = AbortTag;
}else if ([arr[i] isEqualToString:@"提交"]) {
btnTag = SubmitTag;
} }
CGRect btnFrame = CGRectMake(LeftMargin + (LeftMargin + btnWidth)*i, ScreenSize.height - 64 - BottomHeight +5, btnWidth, 40); CGRect btnFrame = CGRectMake(LeftMargin + (LeftMargin + btnWidth)*i, ScreenSize.height - 64 - BottomHeight +5, btnWidth, 40);
UIButton *perBtn = [IBTCustomButtom creatButtonWithFrame:btnFrame target:self sel:@selector(btnClick:) tag:btnTag image:nil title:arr[i] titleColor:[UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_COMMIT_COLOR]; UIButton *perBtn = [IBTCustomButtom creatButtonWithFrame:btnFrame target:self sel:@selector(btnClick:) tag:btnTag image:nil title:arr[i] titleColor:[UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_COMMIT_COLOR];
...@@ -257,6 +274,20 @@ typedef enum : NSUInteger { ...@@ -257,6 +274,20 @@ typedef enum : NSUInteger {
}else{ }else{
[self createBtnWithArr:arr]; [self createBtnWithArr:arr];
} }
}else if ([self.transport.state isEqualToString:TRANSPORT_STATE_PROCESSFAIL]){
NSMutableArray *arr = [NSMutableArray array];
if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_ABORT]) {
[arr addObject:@"作废"];
}if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_NEW]) {
[arr addObject:@"提交"];
}
if (arr.count == 0) {
[self hiddenAllBtn];
}else{
[self createBtnWithArr:arr];
}
}else{
[self hiddenAllBtn];
} }
NSArray *leftArr = @[@"单号:",@"采购单:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"预计到货时间:",@"备注:"]; NSArray *leftArr = @[@"单号:",@"采购单:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"预计到货时间:",@"备注:"];
...@@ -325,9 +356,56 @@ typedef enum : NSUInteger { ...@@ -325,9 +356,56 @@ typedef enum : NSUInteger {
if (buttonIndex == 1) { if (buttonIndex == 1) {
[self dealByAction:TRANSPORT_STATE_RECEIVED];//结束 [self dealByAction:TRANSPORT_STATE_RECEIVED];//结束
} }
}else if (alertView.tag == SubmitTag){
if (buttonIndex == 1) {
[self getDataFromServer:TRANSPORT_STATE_RECEIVED msg:@"正在提交..."];
}
} }
} }
#pragma mark - 提交
- (void)getDataFromServer:(NSString *)state msg:(NSString *)msg{
//保存
void(^succ)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
if (data) {
NSInteger success = [data[@"success"] integerValue];
NSString *message = data[@"message"];
if (success == 1) {
[ICRUserUtil sharedInstance].needFresh = YES;
[self PopViewControllerAnimated:YES];
}else{
[IBTLoadingView showTips:message];
}
}
};
void(^fail)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTips:data];
};
NSDictionary *dict = @{@"uuid":self.transport.uuid,
@"version":self.transport.version,
@"billnumber":self.transport.billnumber,
@"enterprise":[ICRUserUtil sharedInstance].orgId,
@"state":TRANSPORT_STATE_RECEIVED,
@"warehouseUuid":[IBTCommon checkString:self.transport.warehouseUuid],
@"warehouseCode":[IBTCommon checkString:self.transport.warehouseCode],
@"warehouseName":[IBTCommon checkString:self.transport.warehouseName],
@"rwarehouseUuid":[IBTCommon checkString:self.transport.rwarehouseUuid],
@"rwarehouseCode":[IBTCommon checkString:self.transport.rwarehouseCode],
@"rwarehouseName":[IBTCommon checkString:self.transport.rwarehouseName],
@"carnumber":[IBTCommon checkString:self.transport.carnumber],
@"type":[IBTCommon checkString:self.transport.type],
@"carphone":[IBTCommon checkString:self.transport.carphone],
@"arriveDate":[IBTCommon checkString:self.transport.arriveDate],
@"note":[IBTCommon checkString:self.transport.note],
@"pdtDetails":self.transport.pdtDetails,
@"accountDetails":self.transport.accountDetails};
[IBTLoadingView showProgressLabel:msg];
[[ICRHTTPController sharedController] saveAndSubmitTransportWithData:dict success:succ failure:fail];
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
......
XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.m
View file @ f89f6359
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#import "GXFPopView.h" #import "GXFPopView.h"
#define TableHeight 44 #define TableHeight 44
#define ShowHeight 110 #define ShowHeight 130
@interface TransportProductViewController () @interface TransportProductViewController ()
<UITableViewDataSource,UITableViewDelegate,FooterCellDelegate,HeaderCellDelegate,GXFPopViewDelegate> <UITableViewDataSource,UITableViewDelegate,FooterCellDelegate,HeaderCellDelegate,GXFPopViewDelegate>
...@@ -51,19 +51,19 @@ ...@@ -51,19 +51,19 @@
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
[self.view addSubview:self.tableView]; [self.view addSubview:self.tableView];
NSArray *arr = @[@"商品",@"单价",@"包装数量"]; NSArray *arr = @[@"商品",@"单价",@"包装数量",@"已转运数"];
HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenEdit]; HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenEdit];
[self.view addSubview:headCell]; [self.view addSubview:headCell];
headCell.delegate = self; headCell.delegate = self;
self.tableView.tableHeaderView = headCell; self.tableView.tableHeaderView = headCell;
if (!self.isHiddenEdit) { // if (!self.isHiddenEdit) {
FooterCell *footCell = [[FooterCell alloc]initWithFrame:CGRectMake(0, 0, _tableFrame.size.width, 50) withTitle:@"+点击添加商品明细" isTwo:self.twoTitle]; // FooterCell *footCell = [[FooterCell alloc]initWithFrame:CGRectMake(0, 0, _tableFrame.size.width, 50) withTitle:@"+点击添加商品明细" isTwo:self.twoTitle];
[self.view addSubview:footCell]; // [self.view addSubview:footCell];
footCell.delegate = self; // footCell.delegate = self;
self.tableView.tableFooterView = footCell; // self.tableView.tableFooterView = footCell;
} // }
} }
#pragma mark - headCellDelegate #pragma mark - headCellDelegate
......
XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m
View file @ f89f6359
...@@ -81,9 +81,9 @@ ...@@ -81,9 +81,9 @@
} }
NSDictionary *dict = @{ NSDictionary *dict = @{
@"state":@"shipping", @"state":@"shipping",
@"billNumberLike":billNumberObject,
@"queryOrders":orderArr, @"queryOrders":orderArr,
@"userUuid":userUtil.userId, @"userUuid":userUtil.userId,
@"billNumberProductLike":billNumberObject,
@"fetchParts":@"products", @"fetchParts":@"products",
@"pageNumber":@(_currentPage), @"pageNumber":@(_currentPage),
@"pageSize":@(20)}; @"pageSize":@(20)};
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
self.selectTextFiled.textAlignment = NSTextAlignmentLeft; self.selectTextFiled.textAlignment = NSTextAlignmentLeft;
self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"]; self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"];
self.selectTextFiled.delegate = self; self.selectTextFiled.delegate = self;
self.selectTextFiled.placeholder = @"输入类似采购单号"; self.selectTextFiled.placeholder = @"类似采购和商品单号";
self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE; self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE;
[self.view addSubview:self.selectTextFiled]; [self.view addSubview:self.selectTextFiled];
......
XFFruit/ViewControllers/Transport/Controllers/TransportViewController.m
View file @ f89f6359
...@@ -48,6 +48,8 @@ typedef enum : NSUInteger { ...@@ -48,6 +48,8 @@ typedef enum : NSUInteger {
@property (nonatomic,strong)NSString *billLike; @property (nonatomic,strong)NSString *billLike;
@property (nonatomic,strong)NSString *state; @property (nonatomic,strong)NSString *state;
@property (nonatomic,strong)NSString *userLike; @property (nonatomic,strong)NSString *userLike;
@property (nonatomic,strong)NSString *productLike;
@property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序) @property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序)
@end @end
...@@ -90,6 +92,10 @@ typedef enum : NSUInteger { ...@@ -90,6 +92,10 @@ typedef enum : NSUInteger {
if (self.userLike.length > 0) { if (self.userLike.length > 0) {
userObject = self.userLike; userObject = self.userLike;
} }
id productObject = [NSNull null];
if (self.productLike.length > 0) {
productObject = self.productLike;
}
id stateObject = [NSNull null]; id stateObject = [NSNull null];
if (self.state.length > 0 && ![self.state isEqualToString:@"none"]) { if (self.state.length > 0 && ![self.state isEqualToString:@"none"]) {
stateObject = self.state; stateObject = self.state;
...@@ -121,6 +127,7 @@ typedef enum : NSUInteger { ...@@ -121,6 +127,7 @@ typedef enum : NSUInteger {
NSDictionary *dict = @{ NSDictionary *dict = @{
@"state":stateObject, @"state":stateObject,
@"billNumberLike":billObject, @"billNumberLike":billObject,
@"productLike":productObject,
@"creator":userObject, @"creator":userObject,
@"queryOrders":orderArr, @"queryOrders":orderArr,
@"userUuid":userUtil.userId, @"userUuid":userUtil.userId,
...@@ -254,7 +261,7 @@ typedef enum : NSUInteger { ...@@ -254,7 +261,7 @@ typedef enum : NSUInteger {
}else{ }else{
[btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal]; [btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
if (_boltView == nil) { if (_boltView == nil) {
_boltView = [[TransportBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state userNumber:self.userLike billNumber:self.billLike]; _boltView = [[TransportBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state userNumber:self.userLike billNumber:self.billLike productNumber:self.productLike];
_boltView.backgroundColor = XXFBgColor; _boltView.backgroundColor = XXFBgColor;
_boltView.delegate = self; _boltView.delegate = self;
...@@ -321,7 +328,7 @@ typedef enum : NSUInteger { ...@@ -321,7 +328,7 @@ typedef enum : NSUInteger {
} }
} }
- (void)checkBoltBtnColor{ - (void)checkBoltBtnColor{
if (self.state.length > 0 || self.billLike.length > 0 || self.userLike.length > 0) { if (self.state.length > 0 || self.billLike.length > 0 || self.userLike.length > 0 || self.productLike.length > 0) {
[_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal]; [_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
}else{ }else{
[_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal]; [_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal];
...@@ -334,6 +341,7 @@ typedef enum : NSUInteger { ...@@ -334,6 +341,7 @@ typedef enum : NSUInteger {
[_boltView.userFiled resignFirstResponder]; [_boltView.userFiled resignFirstResponder];
[_boltView.billFiled resignFirstResponder]; [_boltView.billFiled resignFirstResponder];
[_boltView.productField resignFirstResponder];
_currentPage = 0; _currentPage = 0;
//请求 //请求
...@@ -368,6 +376,10 @@ typedef enum : NSUInteger { ...@@ -368,6 +376,10 @@ typedef enum : NSUInteger {
self.billLike = billLike; self.billLike = billLike;
CLog(@"%@",billLike); CLog(@"%@",billLike);
} }
- (void)getproductLike:(NSString *)productLike{
self.productLike = productLike;
CLog(@"%@",productLike);
}
- (void)clearBoltInformation{ - (void)clearBoltInformation{
//清空所有条件 //清空所有条件
if (self.userLike.length > 0) { if (self.userLike.length > 0) {
...@@ -379,6 +391,9 @@ typedef enum : NSUInteger { ...@@ -379,6 +391,9 @@ typedef enum : NSUInteger {
if (self.state.length > 0) { if (self.state.length > 0) {
self.state = @""; self.state = @"";
} }
if (self.productLike.length > 0) {
self.productLike = @"";
}
} }
#pragma mark - 协议方法 #pragma mark - 协议方法
......
XFFruit/ViewControllers/Transport/Models/TransportPdtDetail.h
View file @ f89f6359
...@@ -24,6 +24,13 @@ ...@@ -24,6 +24,13 @@
@property (nonatomic,strong)NSString *baseUnit;//规格单位 @property (nonatomic,strong)NSString *baseUnit;//规格单位
@property (nonatomic,strong)NSNumber *baseQty;//发运的基础数量 @property (nonatomic,strong)NSNumber *baseQty;//发运的基础数量
@property (nonatomic,strong)NSNumber *total;//发运合计金额 @property (nonatomic,strong)NSNumber *total;//发运合计金额
@property (nonatomic,strong)NSNumber *transferBaseQty;//已转运基础数量
@property (nonatomic,strong)NSNumber *transferQty;//已转运数量
@property (nonatomic,strong)NSString *note;//备注 @property (nonatomic,strong)NSString *note;//备注
//新增手机和车辆信息
@property (nonatomic,strong)NSString *carphone; //司机电话
@property (nonatomic,strong)NSString *carnumber; //车牌号
@end @end
XFFruit/ViewControllers/Transport/Views/TransportBoltView.h
View file @ f89f6359
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
- (void)getBoltValueSelectRow:(NSString *)state; - (void)getBoltValueSelectRow:(NSString *)state;
- (void)getuserLike:(NSString *)userLike; - (void)getuserLike:(NSString *)userLike;
- (void)getbillLike:(NSString *)billLike; - (void)getbillLike:(NSString *)billLike;
- (void)getproductLike:(NSString *)productLike;
- (void)clearBoltInformation; - (void)clearBoltInformation;
@end @end
...@@ -22,6 +24,7 @@ ...@@ -22,6 +24,7 @@
@property (nonatomic,strong)UITextField *userFiled;//采购单号类似于 @property (nonatomic,strong)UITextField *userFiled;//采购单号类似于
@property (nonatomic,strong)UITextField *billFiled;//通知单号类似于 @property (nonatomic,strong)UITextField *billFiled;//通知单号类似于
@property (nonatomic,strong)UITextField *creatorField;//供应商uuid类似于 @property (nonatomic,strong)UITextField *creatorField;//供应商uuid类似于
@property (nonatomic,strong)UITextField *productField;//商品类似于
- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber; - (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber productNumber:(NSString *)productNumber;
@end @end
XFFruit/ViewControllers/Transport/Views/TransportBoltView.m
View file @ f89f6359
...@@ -27,17 +27,19 @@ ...@@ -27,17 +27,19 @@
@property (nonatomic,strong)NSString *state; @property (nonatomic,strong)NSString *state;
@property (nonatomic,strong)NSString *billNumber; @property (nonatomic,strong)NSString *billNumber;
@property (nonatomic,strong)NSString *userNumber; @property (nonatomic,strong)NSString *userNumber;
@property (nonatomic,strong)NSString *productNumber;
@end @end
@implementation TransportBoltView @implementation TransportBoltView
- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber{ - (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber productNumber:(NSString *)productNumber{
self = [super initWithFrame:frame]; self = [super initWithFrame:frame];
if (self) { if (self) {
self.userNumber = userNumber; self.userNumber = userNumber;
self.billNumber = billNumber; self.billNumber = billNumber;
self.state = state; self.state = state;
self.productNumber = productNumber;
[self createView]; [self createView];
[self createRightView]; [self createRightView];
[self preferData]; [self preferData];
...@@ -62,6 +64,10 @@ ...@@ -62,6 +64,10 @@
if (self.billNumber.length > 0) { if (self.billNumber.length > 0) {
self.billFiled.text = self.billNumber; self.billFiled.text = self.billNumber;
} }
self.productField.hidden = YES;
if (self.productNumber.length > 0) {
self.productField.text = self.productNumber;
}
} }
#pragma mark - 创建视图 #pragma mark - 创建视图
...@@ -69,7 +75,7 @@ ...@@ -69,7 +75,7 @@
{ {
_leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)]; _leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)];
[self addSubview:_leftView]; [self addSubview:_leftView];
NSArray *arr = @[@"按状态",@"创建人代码",@"调研单号"]; NSArray *arr = @[@"按状态",@"创建人代码",@"调研单号",@"商品单号"];
for (NSInteger i = 0; i<arr.count; i++) { for (NSInteger i = 0; i<arr.count; i++) {
UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem]; UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
button.frame = CGRectMake(0, LeftHeight * i , LeftMargin ,LeftHeight); button.frame = CGRectMake(0, LeftHeight * i , LeftMargin ,LeftHeight);
...@@ -96,7 +102,7 @@ ...@@ -96,7 +102,7 @@
- (void)createRightView{ - (void)createRightView{
NSArray *arr = @[@"输入类似创建人代码",@"输入类似调研单号"]; NSArray *arr = @[@"输入类似创建人代码",@"输入类似调研单号",@"输入类似商品单号"];
UIView *contentView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)]; UIView *contentView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)];
contentView.backgroundColor = [UIColor whiteColor]; contentView.backgroundColor = [UIColor whiteColor];
[self addSubview:contentView]; [self addSubview:contentView];
...@@ -120,6 +126,8 @@ ...@@ -120,6 +126,8 @@
self.userFiled = contentField; self.userFiled = contentField;
}else if(i == 1){ }else if(i == 1){
self.billFiled = contentField; self.billFiled = contentField;
}else if(i == 2){
self.productField = contentField;
} }
} }
...@@ -143,6 +151,7 @@ ...@@ -143,6 +151,7 @@
self.tableView.hidden = NO; self.tableView.hidden = NO;
self.userFiled.hidden = YES; self.userFiled.hidden = YES;
self.billFiled.hidden = YES; self.billFiled.hidden = YES;
self.productField.hidden = YES;
} }
break; break;
case 1002://条件二 case 1002://条件二
...@@ -150,6 +159,7 @@ ...@@ -150,6 +159,7 @@
self.tableView.hidden = YES; self.tableView.hidden = YES;
self.userFiled.hidden = NO; self.userFiled.hidden = NO;
self.billFiled.hidden = YES; self.billFiled.hidden = YES;
self.productField.hidden = YES;
} }
break; break;
case 1003://条件三 case 1003://条件三
...@@ -157,6 +167,15 @@ ...@@ -157,6 +167,15 @@
self.tableView.hidden = YES; self.tableView.hidden = YES;
self.userFiled.hidden = YES; self.userFiled.hidden = YES;
self.billFiled.hidden = NO; self.billFiled.hidden = NO;
self.productField.hidden = YES;
}
break;
case 1004://条件四
{
self.tableView.hidden = YES;
self.userFiled.hidden = YES;
self.billFiled.hidden = YES;
self.productField.hidden = NO;
} }
break; break;
default: default:
...@@ -171,6 +190,9 @@ ...@@ -171,6 +190,9 @@
if (_userFiled.text.length > 0) { if (_userFiled.text.length > 0) {
_userFiled.text = @""; _userFiled.text = @"";
} }
if (_productField.text.length > 0) {
_productField.text = @"";
}
if (_currentIndexPath) { if (_currentIndexPath) {
_currentIndexPath = nil; _currentIndexPath = nil;
[self.tableView reloadData]; [self.tableView reloadData];
...@@ -247,6 +269,7 @@ ...@@ -247,6 +269,7 @@
- (void)keyBoardHidden{ - (void)keyBoardHidden{
[self.userFiled resignFirstResponder]; [self.userFiled resignFirstResponder];
[self.billFiled resignFirstResponder]; [self.billFiled resignFirstResponder];
[self.productField resignFirstResponder];
} }
- (void)textFieldDidEndEditing:(UITextField *)textField{ - (void)textFieldDidEndEditing:(UITextField *)textField{
...@@ -258,6 +281,10 @@ ...@@ -258,6 +281,10 @@
// if (self.billFiled.text.length > 0) { // if (self.billFiled.text.length > 0) {
[self.delegate getbillLike:self.billFiled.text]; [self.delegate getbillLike:self.billFiled.text];
// } // }
}else if(textField == self.productField){
// if (self.billFiled.text.length > 0) {
[self.delegate getproductLike:self.productField.text];
// }
} }
} }
......
XFFruit/ViewControllers/Transport/Views/TransportCell.m
View file @ f89f6359
...@@ -90,6 +90,12 @@ ...@@ -90,6 +90,12 @@
}else if ([transport.state isEqualToString:TRANSPORT_STATE_FINISHED]) { }else if ([transport.state isEqualToString:TRANSPORT_STATE_FINISHED]) {
stateStr = @"已完成"; stateStr = @"已完成";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled]; [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
}else if ([transport.state isEqualToString:TRANSPORT_STATE_PROCESS]) {
stateStr = @"提交系统处理";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
}else if ([transport.state isEqualToString:TRANSPORT_STATE_PROCESSFAIL]) {
stateStr = @"系统处理失败";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
} }
[self.stateBtn setTitle:stateStr forState:UIControlStateNormal]; [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
} }
......
XFFruit/ViewControllers/Transport/Views/TransportPurductCell.h
View file @ f89f6359
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
@property (nonatomic,strong)UILabel *titleLabel; @property (nonatomic,strong)UILabel *titleLabel;
@property (nonatomic,strong)UILabel *priceLabel; @property (nonatomic,strong)UILabel *priceLabel;
@property (nonatomic,strong)UILabel *countLabel; @property (nonatomic,strong)UILabel *countLabel;
@property (nonatomic,strong)UILabel *shippedQtyLabel;
@property (nonatomic,strong)UILabel *lineLabel; @property (nonatomic,strong)UILabel *lineLabel;
@property (nonatomic,strong)UIView *showView; @property (nonatomic,strong)UIView *showView;
...@@ -26,6 +27,11 @@ ...@@ -26,6 +27,11 @@
@property (nonatomic,strong)UILabel *showTotalLabel; @property (nonatomic,strong)UILabel *showTotalLabel;
@property (nonatomic,strong)UILabel *showNoteLabel; @property (nonatomic,strong)UILabel *showNoteLabel;
@property (nonatomic,strong)UILabel *showPurchaseLabel; @property (nonatomic,strong)UILabel *showPurchaseLabel;
@property (nonatomic,strong)UILabel *showShippedQty;//转运包装数量
@property (nonatomic,strong)UILabel *showShippedBaseQty;//转运基础数量
@property (nonatomic,strong)NSString *rightImageName; @property (nonatomic,strong)NSString *rightImageName;
- (void)setPdtDetail:(TransportPdtDetail *)pdtDetail row:(NSInteger)row; - (void)setPdtDetail:(TransportPdtDetail *)pdtDetail row:(NSInteger)row;
......
XFFruit/ViewControllers/Transport/Views/TransportPurductCell.m
View file @ f89f6359
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
- (void)bulidLayout - (void)bulidLayout
{ {
CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (3 -1))/3; CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (4 -1))/4;
self.smallImageView = [[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - SmallSize)/2 , SmallSize, SmallSize)]; self.smallImageView = [[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - SmallSize)/2 , SmallSize, SmallSize)];
self.smallImageView.image = [UIImage imageNamed:@"arrowright"]; self.smallImageView.image = [UIImage imageNamed:@"arrowright"];
...@@ -63,6 +63,12 @@ ...@@ -63,6 +63,12 @@
self.countLabel.textColor = GXF_CONTENT_COLOR; self.countLabel.textColor = GXF_CONTENT_COLOR;
self.countLabel.font = GXF_SIXTEENTEH_SIZE; self.countLabel.font = GXF_SIXTEENTEH_SIZE;
self.shippedQtyLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.countLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
self.shippedQtyLabel.textAlignment = NSTextAlignmentCenter;
self.shippedQtyLabel.textColor = GXF_CONTENT_COLOR;
self.shippedQtyLabel.font = GXF_SIXTEENTEH_SIZE;
self.showView = [[UIView alloc]initWithFrame:CGRectMake(0, TableHeight, ScreenSize.width, 0)]; self.showView = [[UIView alloc]initWithFrame:CGRectMake(0, TableHeight, ScreenSize.width, 0)];
self.showView.clipsToBounds = YES; self.showView.clipsToBounds = YES;
...@@ -111,13 +117,31 @@ ...@@ -111,13 +117,31 @@
self.showNoteLabel.text = @"备注：1000"; self.showNoteLabel.text = @"备注：1000";
self.showNoteLabel.font = GXF_THREETEENTH_SIZE; self.showNoteLabel.font = GXF_THREETEENTH_SIZE;
self.showPurchaseLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth+ 100, ShowHeight))];
self.showShippedQty = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth, ShowHeight))];
self.showShippedQty.textAlignment = NSTextAlignmentLeft;
self.showShippedQty.textColor = GXF_PLACEHOLDER_COLOR;
self.showShippedQty.text = @"转运运包装数量：";
self.showShippedQty.font = GXF_THREETEENTH_SIZE;
self.showShippedBaseQty = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showCountLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth, ShowHeight))];
self.showShippedBaseQty.textAlignment = NSTextAlignmentLeft;
self.showShippedBaseQty.textColor = GXF_PLACEHOLDER_COLOR;
self.showShippedBaseQty.text = @"转运基础数量：";
self.showShippedBaseQty.font = GXF_THREETEENTH_SIZE;
self.showPurchaseLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showShippedQty.frame), ShowWidth+ 100, ShowHeight))];
self.showPurchaseLabel.textAlignment = NSTextAlignmentLeft; self.showPurchaseLabel.textAlignment = NSTextAlignmentLeft;
self.showPurchaseLabel.textColor = GXF_PLACEHOLDER_COLOR; self.showPurchaseLabel.textColor = GXF_PLACEHOLDER_COLOR;
self.showPurchaseLabel.text = @"采购单号：1000"; self.showPurchaseLabel.text = @"采购单号：1000";
self.showPurchaseLabel.font = GXF_THREETEENTH_SIZE; self.showPurchaseLabel.font = GXF_THREETEENTH_SIZE;
self.editBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.editBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[self.editBtn setImage:[UIImage imageNamed:self.rightImageName] forState:UIControlStateNormal]; [self.editBtn setImage:[UIImage imageNamed:self.rightImageName] forState:UIControlStateNormal];
self.editBtn.frame = CGRectMake(ScreenSize.width - LeftWidth, 0, LeftWidth , TableHeight); self.editBtn.frame = CGRectMake(ScreenSize.width - LeftWidth, 0, LeftWidth , TableHeight);
...@@ -131,6 +155,7 @@ ...@@ -131,6 +155,7 @@
[self.contentView addSubview:self.titleLabel]; [self.contentView addSubview:self.titleLabel];
[self.contentView addSubview:self.priceLabel]; [self.contentView addSubview:self.priceLabel];
[self.contentView addSubview:self.countLabel]; [self.contentView addSubview:self.countLabel];
[self.contentView addSubview:self.shippedQtyLabel];
[self.contentView addSubview:self.editBtn]; [self.contentView addSubview:self.editBtn];
[self.contentView addSubview:self.showView]; [self.contentView addSubview:self.showView];
...@@ -141,7 +166,11 @@ ...@@ -141,7 +166,11 @@
[self.showView addSubview:self.showPriceLabel]; [self.showView addSubview:self.showPriceLabel];
[self.showView addSubview:self.showPurchaseLabel]; [self.showView addSubview:self.showPurchaseLabel];
[self.showView addSubview:self.showTotalLabel]; [self.showView addSubview:self.showTotalLabel];
[self.showView addSubview:self.showShippedBaseQty];
[self.showView addSubview:self.showShippedQty];
[self.showView addSubview:self.showTotalLabel];
[self.showView addSubview:self.showNoteLabel]; [self.showView addSubview:self.showNoteLabel];
[self.contentView addSubview:self.lineLabel]; [self.contentView addSubview:self.lineLabel];
...@@ -152,6 +181,8 @@ ...@@ -152,6 +181,8 @@
self.titleLabel.text = pdtDetail.productName; self.titleLabel.text = pdtDetail.productName;
self.priceLabel.text = [NSString stringWithFormat:@"%.2f元",[pdtDetail.price floatValue]]; self.priceLabel.text = [NSString stringWithFormat:@"%.2f元",[pdtDetail.price floatValue]];
self.countLabel.text = [NSString stringWithFormat:@"%@%@",[pdtDetail.qty stringValue],pdtDetail.unit]; self.countLabel.text = [NSString stringWithFormat:@"%@%@",[pdtDetail.qty stringValue],pdtDetail.unit];
self.shippedQtyLabel.text = [NSString stringWithFormat:@"%@%@",pdtDetail.transferBaseQty ? [pdtDetail.transferBaseQty stringValue]:@"0",pdtDetail.unit];
self.showNameLabel.text = [NSString stringWithFormat:@"商品：%@[%@]",pdtDetail.productName,pdtDetail.productCode]; self.showNameLabel.text = [NSString stringWithFormat:@"商品：%@[%@]",pdtDetail.productName,pdtDetail.productCode];
self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",[pdtDetail.qpc stringValue],pdtDetail.baseUnit]; self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",[pdtDetail.qpc stringValue],pdtDetail.baseUnit];
self.showCountLabel.text = [NSString stringWithFormat:@"包装数量：%@%@",[pdtDetail.qty stringValue],pdtDetail.unit]; self.showCountLabel.text = [NSString stringWithFormat:@"包装数量：%@%@",[pdtDetail.qty stringValue],pdtDetail.unit];
...@@ -159,7 +190,8 @@ ...@@ -159,7 +190,8 @@
self.showPriceLabel.text = [NSString stringWithFormat:@"包装单价：%.2f元",[pdtDetail.packprice floatValue]]; self.showPriceLabel.text = [NSString stringWithFormat:@"包装单价：%.2f元",[pdtDetail.packprice floatValue]];
self.showPurchaseLabel.text = [NSString stringWithFormat:@"采购单号：%@",pdtDetail.purchasebillnumber.length > 0 ? pdtDetail.purchasebillnumber: @"无"]; self.showPurchaseLabel.text = [NSString stringWithFormat:@"采购单号：%@",pdtDetail.purchasebillnumber.length > 0 ? pdtDetail.purchasebillnumber: @"无"];
self.showTotalLabel.text = [NSString stringWithFormat:@"总金额：%.2f元",[pdtDetail.total floatValue]]; self.showTotalLabel.text = [NSString stringWithFormat:@"总金额：%.2f元",[pdtDetail.total floatValue]];
self.showShippedBaseQty.text = [NSString stringWithFormat:@"转运包装数量：%@%@",pdtDetail.transferQty ? [pdtDetail.transferQty stringValue]:@"0",pdtDetail.unit];
self.showShippedQty.text = [NSString stringWithFormat:@"转运运基础数量：%@%@",pdtDetail.transferBaseQty ? [pdtDetail.transferBaseQty stringValue]:@"0",pdtDetail.baseUnit];
self.showNoteLabel.text =[NSString stringWithFormat:@"备注：%@",pdtDetail.note ? pdtDetail.note :@"无"]; self.showNoteLabel.text =[NSString stringWithFormat:@"备注：%@",pdtDetail.note ? pdtDetail.note :@"无"];
} }
......
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