加工单详情：已完成和已废弃

XFFruit.xcodeproj/project.pbxproj

@@ -88,6 +88,7 @@
 		35CF339E1B96E606001211EF /* GXFWarehouseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35CF339D1B96E606001211EF /* GXFWarehouseViewController.m */; };
 		35D56A7D1B9D4E8300996C28 /* GXFProcessCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D56A7C1B9D4E8300996C28 /* GXFProcessCell.m */; };
 		35D56A801B9D533900996C28 /* GXFProcessBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D56A7F1B9D533900996C28 /* GXFProcessBoltView.m */; };
+		35D56A831B9D5E7500996C28 /* GXFSeeProcessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D56A821B9D5E7500996C28 /* GXFSeeProcessViewController.m */; };
 		7217E9E51B72364300FE5C1D /* NewSurveyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7217E9C51B72364300FE5C1D /* NewSurveyViewController.m */; };
 		7217E9E61B72364300FE5C1D /* SurveyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7217E9C71B72364300FE5C1D /* SurveyViewController.m */; };
 		7217E9E71B72364300FE5C1D /* Attachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 7217E9CA1B72364300FE5C1D /* Attachment.m */; };
@@ -551,6 +552,8 @@
 		35D56A7C1B9D4E8300996C28 /* GXFProcessCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFProcessCell.m; sourceTree = "<group>"; };
 		35D56A7E1B9D533900996C28 /* GXFProcessBoltView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXFProcessBoltView.h; sourceTree = "<group>"; };
 		35D56A7F1B9D533900996C28 /* GXFProcessBoltView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFProcessBoltView.m; sourceTree = "<group>"; };
+		35D56A811B9D5E7500996C28 /* GXFSeeProcessViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXFSeeProcessViewController.h; sourceTree = "<group>"; };
+		35D56A821B9D5E7500996C28 /* GXFSeeProcessViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFSeeProcessViewController.m; sourceTree = "<group>"; };
 		7217E9C41B72364300FE5C1D /* NewSurveyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewSurveyViewController.h; sourceTree = "<group>"; };
 		7217E9C51B72364300FE5C1D /* NewSurveyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewSurveyViewController.m; sourceTree = "<group>"; };
 		7217E9C61B72364300FE5C1D /* SurveyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurveyViewController.h; sourceTree = "<group>"; };
@@ -1078,6 +1081,8 @@
 				35CF33801B9542BE001211EF /* GXFNewProcessViewController.m */,
 				358432F21B994EDD007E73ED /* GXFListProcessViewController.h */,
 				358432F31B994EDD007E73ED /* GXFListProcessViewController.m */,
+				35D56A811B9D5E7500996C28 /* GXFSeeProcessViewController.h */,
+				35D56A821B9D5E7500996C28 /* GXFSeeProcessViewController.m */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -2405,6 +2410,7 @@
 				FE4678AA1B8D60F900B5EDA3 /* ChooseTypeViewController.m in Sources */,
 				30DB92A61ADD039F00271835 /* ICRAnnocementContentView.m in Sources */,
 				C142D2B21AC3A155000109A7 /* UIFont+Custom.m in Sources */,
+				35D56A831B9D5E7500996C28 /* GXFSeeProcessViewController.m in Sources */,
 				C15295CE1B24741400DF60D1 /* ASValuePopUpView.m in Sources */,
 				C159184D1AC062460013B391 /* IBTTableView.m in Sources */,
 				30D1859C1ADBB91000327997 /* ICRAnnouncement.m in Sources */,

XFFruit/ViewControllers/Process/Controllers/GXFListProcessViewController.m

@@ -10,7 +10,8 @@
 #import "GXFProcessCell.h"
 #import "GXFProcessBill.h"
 
-//#import "SeePurchaseNoticeViewController.h"
+#import "GXFSeeProcessViewController.h"
+#import "GXFNewProcessViewController.h"
 #import "QueryOrder.h"
 #import "SortMaskView.h"
 #import "GXFProcessBoltView.h"
@@ -417,17 +418,21 @@ typedef enum : NSUInteger {
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-//    SeePurchaseNoticeViewController *pvc = [SeePurchaseNoticeViewController new];
-//    pvc.title = @"查看采购单";
-//    pvc.bill = _dataArr[indexPath.row];
-//    if(indexPath.row == 0){
-//        pvc.indexPerson = 0;
-//    }else if(indexPath.row == 1){
-//        pvc.indexPerson = 1;
-//    }else if(indexPath.row == 2){
-//        pvc.indexPerson = 2;
-//    }
-//    [self PushViewController:pvc animated:YES];
+  //  GXFProcessCell *cell = (GXFProcessCell *)[tableView cellForRowAtIndexPath:indexPath];
+    GXFProcessBill *bill = (GXFProcessBill *)self.dataArr[indexPath.row];
+    
+ 
+    if([bill.state isEqualToString:PROCESS_STATE_PROCESSINF]){
+    
+    } else {
+        GXFSeeProcessViewController *seeProcessVC = [[GXFSeeProcessViewController alloc]initWithProcessUuid:bill.uuid];
+        
+        [self PushViewController:seeProcessVC animated:YES];
+    }
+   
+
+
+
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{

XFFruit/ViewControllers/Process/Controllers/GXFSeeProcessViewController.h

+//
+//  GXFSeeProcessViewController.h
+//  XFFruit
+//
+//  Created by freecui on 15/9/7.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface GXFSeeProcessViewController : UIViewController
+- (instancetype)initWithProcessUuid: (NSString *)processUuid;
+@end

XFFruit/ViewControllers/Process/Views/GXFBottomView.h

@@ -13,6 +13,7 @@
 
 - (void)bottomViewleftButtonClicked: (UIButton *)leftBtn;
 - (void)bottomViewRightButtonClicked: (UIButton *)rightBtn;
+- (void)bottomViewOneButtonClicked: (UIButton *)oneBtn;
 @end
 @interface GXFBottomView : IBTUIView
 
@@ -24,6 +25,7 @@ typedef NS_ENUM(NSInteger, buttonTag){
 @property (nonatomic, weak) id<GXFBottomViewDelegate>delegate;
 @property (nonatomic, strong) UIButton *f_leftBtn;
 @property (nonatomic, strong) UIButton *f_rightBtn;
+@property (nonatomic, strong) UIButton *f_oneBtn;
 - (instancetype)initWithFrame:(CGRect)frame
                  LeftBtnTitle: (NSString *)leftTitle
                 rightBtnTitle: (NSString *)rightTitle;
@@ -33,4 +35,8 @@ typedef NS_ENUM(NSInteger, buttonTag){
              rightButtonColor: (UIColor *)rightBtnColor
                  LeftBtnTitle: (NSString *)leftTitle
                 rightBtnTitle: (NSString *)rightTitle;
+
+- (instancetype)initOneButtonWithFrame:(CGRect)frame
+                           buttonColor: (UIColor *)btnColor
+                           buttonTitle: (NSString *)title;
 @end

XFFruit/ViewControllers/Process/Views/GXFBottomView.m

@@ -74,4 +74,22 @@
     }
 
 }
+
+- (instancetype)initOneButtonWithFrame:(CGRect)frame buttonColor:(UIColor *)btnColor buttonTitle:(NSString *)title {
+    self = [super initWithFrame:frame];
+    if (!self) {
+        return nil;
+    }
+    
+    CGRect rect = CGRectMake(LEFT_PADDING, TOP_PADDING, frame.size.width - 2 * LEFT_PADDING, BUTTON_HEIGHT);
+    UIButton *btn = [IBTCustomButtom creatButtonWithFrame:rect target:self sel:@selector(oneBtnClicked) tag:0 image:nil title:title titleColor:[UIColor whiteColor] isCorner:YES corner:5 bgColor:btnColor];
+    self.f_oneBtn = btn;
+    [self addSubview:_f_oneBtn];
+    return self;
+}
+- (void)oneBtnClicked {
+    if ([_delegate respondsToSelector:@selector(bottomViewOneButtonClicked:)]) {
+        [_delegate bottomViewOneButtonClicked:_f_oneBtn];
+    }
+}
 @end

XFFruit/ViewControllers/Process/Views/GXFProcessBill.h

@@ -37,5 +37,5 @@
 //@property (nonatomic,copy)NSString *materials;原料明细
 //@property (nonatomic,copy)NSString *procucts;商品明细
 
-
+- (instancetype )initWithDict: (NSDictionary *)dict;
 @end

XFFruit/ViewControllers/Process/Views/GXFProcessBill.m

@@ -9,5 +9,36 @@
 #import "GXFProcessBill.h"
 
 @implementation GXFProcessBill
+- (instancetype)initWithDict:(NSDictionary *)dict {
+    self = [super init];
+    if (!self) {
+        self = nil;
+    }
+    
+    self.uuid = dict[@"uuid"];
+    self.version = dict[@"version"];
+    self.billNumber = dict[@"billNumber"];
+    self.state = dict[@"state"];
+    self.title = dict[@"title"];
+    self.beginDate = dict[@"beginDate"];
+    self.endDate = dict[@"endDate"];
+    self.vendor_uuid = dict[@"vendor_uuid"];
+    self.vendor_code = dict[@"vendor_code"];
+    self.vendor_name = dict[@"vendor_name"];
+    self.warehouse_uuid = dict[@"warehouse_uuid"];
+    self.warehouse_code = dict[@"warehouse_code"];
+    self.warehouse_name = dict[@"warehouse_name"];
+    self.contact = dict[@"contact"];
+    self.contactPhone = dict[@"contactPhone"];
+    self.total = dict[@"total"];
+    self.remark = dict[@"remark"];
+    self.create_time = dict[@"create_time"];
+    self.create_id = dict[@"create_id"];
+    self.create_operName = dict[@"create_operName"];
+    self.lastModified_time = dict[@"lastModified_time"];
+    self.lastModified_id = dict[@"lastModified_id"];
+    self.lastModified_operName = dict[@"lastModified_operName"];
+    return self;
 
+}
 @end

XFFruit/ViewControllers/Process/Views/GXFProcessMaterial.h

@@ -20,4 +20,5 @@
 @property (nonatomic,strong) NSNumber *basePrice;//基础单价
 @property (nonatomic,strong) NSNumber *total;//金额
 @property (nonatomic,copy) NSString *remark;//备注
+- (instancetype )initWithDict: (NSDictionary *)dict;
 @end

XFFruit/ViewControllers/Process/Views/GXFProcessMaterial.m

@@ -10,5 +10,24 @@
 #import "GXFProcessMaterial.h"
 
 @implementation GXFProcessMaterial
+- (instancetype)initWithDict:(NSDictionary *)dict {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+    
+    self.uuid = dict[@"uuid"];
+    self.productUuid = dict[@"productUuid"];
+    self.productCode = dict[@"productCode"];
+    self.productName = dict[@"productName"];
+    self.instockDate = dict[@"instockDate"];
+    self.place = dict[@"place"];
+    self.quality = dict[@"quality"];
+    self.baseQty = dict[@"baseQty"];
+    self.basePrice = dict[@"basePrice"];
+    self.total = dict[@"total"];
+    self.remark = dict[@"remark"];
+    return self;
+}
 
 @end

XFFruit/ViewControllers/Process/Views/GXFProcessProduct.h

@@ -21,4 +21,6 @@
 @property (nonatomic,strong) NSNumber *baseQty;//基础数量
 
 @property (nonatomic,copy) NSString *remark;//备注
+
+- (instancetype )initWithDict: (NSDictionary *)dict;
 @end

XFFruit/ViewControllers/Process/Views/GXFProcessProduct.m

@@ -10,4 +10,23 @@
 
 @implementation GXFProcessProduct
 
+- (instancetype)initWithDict:(NSDictionary *)dict {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+    
+    self.uuid = dict[@"uuid"];
+    self.productUuid = dict[@"productUuid"];
+    self.productCode = dict[@"productCode"];
+    self.productName = dict[@"productName"];
+    self.outstockDate = dict[@"outstockDate"];
+    self.unit = dict[@"unit"];
+    self.qpc = dict[@"qpc"];
+    self.qpcStr = dict[@"qpcStr"];
+    self.quantity = dict[@"quantity"];
+    self.baseQty = dict[@"baseQty"];
+    self.remark = dict[@"remark"];
+    return self;
+}
 @end