Skip to content

X
xffruit
Commit 42ce6cb5 authored by freecui's avatar freecui
Browse files
Options

找到加工单界面but

parent 5bfa7b5f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 543 additions and 14 deletions
XFFruit.xcodeproj/project.pbxproj
View file @ 42ce6cb5
......@@ -57,6 +57,8 @@
35A1C3551B8EFBBF004AC9F7 /* PermissionJson in Resources */ = {isa = PBXBuildFile; fileRef = 35A1C3541B8EFBBF004AC9F7 /* PermissionJson */; };
35A1C3581B8F09D2004AC9F7 /* GXFFunctionDB.m in Sources */ = {isa = PBXBuildFile; fileRef = 35A1C3571B8F09D2004AC9F7 /* GXFFunctionDB.m */; };
35B448DF1B9B0A73001209E2 /* ProductBillCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 35B448DE1B9B0A73001209E2 /* ProductBillCell.m */; };
35B462D91B9C3D7D00AE2C3E /* GXFProcessMaterialItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35B462D81B9C3D7D00AE2C3E /* GXFProcessMaterialItemView.m */; };
35B462DC1B9C3D9600AE2C3E /* GXFProcessProductItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35B462DB1B9C3D9600AE2C3E /* GXFProcessProductItemView.m */; };
35B9B40E1B8FFB59009851CC /* GXFFunctionDBHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 35B9B40D1B8FFB59009851CC /* GXFFunctionDBHelper.m */; };
35C3C0AC1AE956040035AC8A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C3C0AB1AE956040035AC8A /* Security.framework */; };
35C3C0AE1AE9560E0035AC8A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C3C0AD1AE9560E0035AC8A /* CoreGraphics.framework */; };
......@@ -491,6 +493,10 @@
35A1C3571B8F09D2004AC9F7 /* GXFFunctionDB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFFunctionDB.m; sourceTree = "<group>"; };
35B448DD1B9B0A73001209E2 /* ProductBillCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductBillCell.h; sourceTree = "<group>"; };
35B448DE1B9B0A73001209E2 /* ProductBillCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductBillCell.m; sourceTree = "<group>"; };
35B462D71B9C3D7D00AE2C3E /* GXFProcessMaterialItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXFProcessMaterialItemView.h; sourceTree = "<group>"; };
35B462D81B9C3D7D00AE2C3E /* GXFProcessMaterialItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFProcessMaterialItemView.m; sourceTree = "<group>"; };
35B462DA1B9C3D9600AE2C3E /* GXFProcessProductItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXFProcessProductItemView.h; sourceTree = "<group>"; };
35B462DB1B9C3D9600AE2C3E /* GXFProcessProductItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFProcessProductItemView.m; sourceTree = "<group>"; };
35B9B40C1B8FFB59009851CC /* GXFFunctionDBHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXFFunctionDBHelper.h; sourceTree = "<group>"; };
35B9B40D1B8FFB59009851CC /* GXFFunctionDBHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFFunctionDBHelper.m; sourceTree = "<group>"; };
35C3C0AB1AE956040035AC8A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
......@@ -1060,6 +1066,10 @@
358432ED1B993BAF007E73ED /* GXFProcessMaterialTableViewCell.m */,
358432EF1B993BD8007E73ED /* GXFProcessProductTableViewCell.h */,
358432F01B993BD8007E73ED /* GXFProcessProductTableViewCell.m */,
35B462D71B9C3D7D00AE2C3E /* GXFProcessMaterialItemView.h */,
35B462D81B9C3D7D00AE2C3E /* GXFProcessMaterialItemView.m */,
35B462DA1B9C3D9600AE2C3E /* GXFProcessProductItemView.h */,
35B462DB1B9C3D9600AE2C3E /* GXFProcessProductItemView.m */,
);
path = Views;
sourceTree = "<group>";
......@@ -2463,6 +2473,7 @@
30D749551ACE421A00C63BA1 /* IBTUITextField.m in Sources */,
7217E9EA1B72364300FE5C1D /* BoltMaskView.m in Sources */,
C11A346B1B2451D500079129 /* NALLabelsMatrix.m in Sources */,
35B462D91B9C3D7D00AE2C3E /* GXFProcessMaterialItemView.m in Sources */,
C17DE85A1AD81D1600581AA6 /* NSMutableArray+SafeInsert.m in Sources */,
35C3C0B91AE9567B0035AC8A /* ICRNavigationViewController.mm in Sources */,
35321F6A1B97EF3600E5C670 /* GXFPopNewProductViewController.m in Sources */,
......@@ -2534,6 +2545,7 @@
C1E1085D1ADA577500620375 /* ICRTaskDetailContentView.m in Sources */,
C14BE30E1ADB86DB0049F1AA /* NSData+EncodeAdditions.m in Sources */,
FEA2F3031B8453C700D64735 /* GoodsViewController.m in Sources */,
35B462DC1B9C3D9600AE2C3E /* GXFProcessProductItemView.m in Sources */,
FE0C9B091B7C543D00335B39 /* User.m in Sources */,
C1E093041AC8E8E0003B7126 /* ICRCheckBox.m in Sources */,
C1864A561B0B0D9D00D11C4E /* ICRPostTask.m in Sources */,
......
XFFruit/Controllers/HTTPController/ICRHTTPController.m
View file @ 42ce6cb5
......@@ -1722,7 +1722,7 @@ acceptTypeJson:YES
}
};
#pragma 请求参数的下载时间应该有要求？？？？
#pragma 请求参数的下载时间应该有要求？？？？ 加工工厂，用[NSDate date]可以获取到数据，但是供应商获取不到 ？？
NSString *dateStr = @"2015-05-04";//[[NSDate date] httpParameterString];//urlAction
NSString *urlStr = [[[self class] UrlForPluginHTTPAction:urlAction] stringByAppendingFormat:@"?startDate=%@&pageNumber=%@&pageSize=%@", dateStr,@(page_number),@(page_size)];
NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
......
XFFruit/ViewControllers/Process/Controllers/GXFNewProcessViewController.m
View file @ 42ce6cb5
......@@ -77,6 +77,11 @@ typedef NS_ENUM(NSInteger, cellRow) {
self.title = @"添加加工单";
[self initData];
[self initSubViews];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(addNewMaterail:) name:KNOTIFICATION_saveMaterial object:nil];
//货物明细
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(addNewProduct:) name:KNOTIFICATION_saveProduct object:nil];
}
//刷新数据
......@@ -86,7 +91,7 @@ typedef NS_ENUM(NSInteger, cellRow) {
}
- (void)addNewMaterail: (NSNotification *)aNotification {
GXFProcessMaterial *material = aNotification.object;
if (_d_materialMuArr) {
if (_d_materialMuArr ) {
[_d_materialMuArr addObject:material];
[self p_refreshData];
}
......@@ -113,12 +118,9 @@ typedef NS_ENUM(NSInteger, cellRow) {
}
}
- (void)viewWillAppear:(BOOL)animated {
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(addNewMaterail:) name:KNOTIFICATION_saveMaterial object:nil];
//货物明细
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(addNewProduct:) name:KNOTIFICATION_saveProduct object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(editProduct:) name:KNOTIFICATION_editProduct object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(deleteProduct:) name:KNOTIFICATION_deleteProduct object:nil];
// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(editProduct:) name:KNOTIFICATION_editProduct object:nil];
// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(deleteProduct:) name:KNOTIFICATION_deleteProduct object:nil];
//
// //保存
// void(^succ)(id) = ^(id data) {
......@@ -388,7 +390,7 @@ typedef NS_ENUM(NSInteger, cellRow) {
}else {
static NSString *cellID = @"ProductCell";
// if(_d_isProduct)
GXFProcessMaterialTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
......@@ -404,6 +406,8 @@ typedef NS_ENUM(NSInteger, cellRow) {
if (self.isHiddenEdit) {
cell.editBtn.hidden = YES;
}
} else {
}
if ([self isHaveIndexPath:indexPath]) {
cell.smallImageView.image = [UIImage imageNamed:@"arrowdown"];
......@@ -587,6 +591,7 @@ typedef NS_ENUM(NSInteger, cellRow) {
//保存
void(^succ)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
CLog(@"%@",data[@"message"]);
// if (data) {
// NSInteger success = [data[@"success"] integerValue];
// NSString *message = data[@"message"];
......@@ -637,13 +642,13 @@ typedef NS_ENUM(NSInteger, cellRow) {
}
NSDictionary *dict = @{@"uuid":@"",
NSDictionary *dict = @{//@"uuid":@"",
@"version":@(0),
@"billnumber":@"",
@"title":@"title",//[IBTCommon checkString:self.titleStr],
@"vendor_uuid": @"000",//_d_processBill.vendor_uuid,
@"vendor_code": @"111",//_d_processBill.vendor_code,
@"vendor_name": @"ff",//_d_processBill.vendor_name,
@"vendor_uuid": _d_processBill.vendor_uuid,
@"vendor_code": _d_processBill.vendor_code,
@"vendor_name": _d_processBill.vendor_name,
@"warehouse_uuid":_d_processBill.warehouse_uuid,
@"warehouse_code":_d_processBill.warehouse_code,
@"warehouse_name":_d_processBill.warehouse_name,
......
XFFruit/ViewControllers/Process/Views/GXFProcessMaterialItemView.h 0 → 100644
View file @ 42ce6cb5
//
// GXFProcessMaterialItemView.h
// XFFruit
//
// Created by freecui on 15/9/6.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "IBTUIView.h"
@interface GXFProcessMaterialItemView : IBTUIView
@end
@class GXFProcessMaterial;
@interface GXFProcessMaterialItemView (configure)
- (void)updateWithProcessMaterial: (GXFProcessMaterial *)processMaterial;
@end
#define ICR_ProcessMaterial_ITEM_HEIGTH (130.0f)
\ No newline at end of file
XFFruit/ViewControllers/Process/Views/GXFProcessMaterialItemView.m 0 → 100644
View file @ 42ce6cb5
//
// GXFProcessMaterialItemView.m
// XFFruit
//
// Created by freecui on 15/9/6.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "GXFProcessMaterialItemView.h"
@implementation GXFProcessMaterialItemView
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
XFFruit/ViewControllers/Process/Views/GXFProcessProductItemView.h 0 → 100644
View file @ 42ce6cb5
//
// GXFProcessProductItemView.h
// XFFruit
//
// Created by freecui on 15/9/6.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "IBTUIView.h"
@interface GXFProcessProductItemView : IBTUIView
@end
XFFruit/ViewControllers/Process/Views/GXFProcessProductItemView.m 0 → 100644
View file @ 42ce6cb5
//
// GXFProcessProductItemView.m
// XFFruit
//
// Created by freecui on 15/9/6.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "GXFProcessProductItemView.h"
@implementation GXFProcessProductItemView
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
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