加工单列表

XFFruit/Controllers/HTTPController/ICRHTTPController.h

@@ -253,6 +253,40 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
                         failure:(void (^)(id))fail;
 
 
+//1·保存采购通知单
+- (void)savePurchaseNoticeWithData:(id)data
+                            success:(void (^)(id))succ
+                            failure:(void (^)(id))fail;
+//2·获取采购通知单列表
+- (void)getPurchaseNoticeListWithData:(id)data
+                           success:(void (^)(id))succ
+                           failure:(void (^)(id))fail;
+
+//3·采购通知单明细(读)
+- (void)getPurchaseNoticeDetailedWithPurchaseUuid:(NSString *)purchaseUuid  success:(void (^)(id))succ
+                  failure:(void (^)(id))fail;
+//4·保存并提交采购通知单
+- (void)saveAndSubmitPurchaseNoticeWithData:(id)data
+                           success:(void (^)(id))succ
+                           failure:(void (^)(id))fail;
+
+//5·提交采购通知单
+- (void)ComitPurchaseNoticeWithData:(id)data
+                           success:(void (^)(id))succ
+                           failure:(void (^)(id))fail;
+//6·接受采购通知单
+- (void)acceptPurchaseNoticeWithData:(id)data
+                            success:(void (^)(id))succ
+                            failure:(void (^)(id))fail;
+//7·结束采购通知单
+- (void)finishPurchaseNoticeWithData:(id)data
+                             success:(void (^)(id))succ
+                             failure:(void (^)(id))fail;
+//8·获取采购通知单跟进记录
+- (void)getPurchaseNoticeRecodWithData:(id)data
+                             success:(void (^)(id))succ
+                             failure:(void (^)(id))fail;
+
 
 //添加采购单
 - (void)savePurchaseWithData:(id)data

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -86,6 +86,16 @@ typedef NS_ENUM(NSUInteger, ICRHTTPAction) {
     //加工单
     XFFHttp_QueryProcess,
     XFFHttp_GetProcess,
+    //采购通知单
+    XFFHttp_savePurchaseNotice,
+    XFFHttp_getPurchaseNoticeList,
+    XFFHttp_getPurchaseNoticeDetailed,
+    XFFHttp_saveAndSubmitPurchaseNotice,
+    XFFHttp_ComitPurchaseNotice,
+    XFFHttp_acceptPurchaseNotice,
+    XFFHttp_finishPurchaseNotice,
+    XFFHttp_getPurchaseNoticeRecod,
+    
 
     //采购单
     XFFHttp_PurchaseSave,
@@ -159,7 +169,17 @@ static NSString * const ICRHTTPInterface[] = {
     //加工单
     [XFFHttp_QueryProcess ]                = @"process/query",
     [XFFHttp_GetProcess ]                     = @"process/get",
-
+    //采购通知单
+    [XFFHttp_savePurchaseNotice]           = @"purchase/notice/save",
+    [XFFHttp_getPurchaseNoticeList]         = @"purchase/notice/query",
+    [XFFHttp_getPurchaseNoticeDetailed]      = @"purchase/notice/get/",
+    [XFFHttp_saveAndSubmitPurchaseNotice]     = @"purchase/notice/saveandsubmit",
+    [XFFHttp_ComitPurchaseNotice]       = @"purchase/notice/submit/",
+    [XFFHttp_acceptPurchaseNotice]       = @"purchase/notice/accept/",
+    [XFFHttp_finishPurchaseNotice]        = @"purchase/notice/finish/",
+    
+    [XFFHttp_getPurchaseNoticeRecod]       = @"purchase/trace/get/",
+    
 
     //采购单
     [XFFHttp_PurchaseSave]                  = @"purchase/bill/save",
@@ -1800,12 +1820,13 @@ acceptTypeJson:YES
     };
     NSDictionary *dict = data;
     NSString *urlStr = [[self class] UrlForPluginHTTPAction:XFFHttp_QueryProcess ];
-    [self GET:urlStr
-    parameters:dict
-     needToken:NO
-acceptTypeJson:YES
-       success:success
-       failure:failure];
+   [self POST:urlStr parameters:dict needToken:NO acceptTypeJson:YES success:success failure:failure];
+//    [self GET:urlStr
+//    parameters:dict
+//     needToken:NO
+//acceptTypeJson:YES
+//       success:success
+//       failure:failure];
 }
 //7.3	加工单明细(读) [已实现]
 - (void)getResultWithProcessUuid:(NSString *)processUuid
@@ -1980,5 +2001,80 @@ acceptTypeJson:YES
       success:success
       failure:failure];
 
+}
+//1·保存采购通知单
+- (void)savePurchaseNoticeWithData:(id)data
+                           success:(void (^)(id))succ
+                           failure:(void (^)(id))fail
+{
+    
+}
+//2·获取采购通知单列表
+- (void)getPurchaseNoticeListWithData:(id)data
+                              success:(void (^)(id))succ
+                              failure:(void (^)(id))fail
+{
+    void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+        CLog(@"%@", responseObject);
+        if (succ) {
+            succ( responseObject );
+        }
+    };
+    void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+        CLog(@"%@", error);
+        if (fail) {
+            fail( error );
+        }
+    };
+    NSDictionary *dict = data;
+    NSString *urlStr = [[self class] UrlForPluginHTTPAction:XFFHttp_getPurchaseNoticeList];
+    [self POST:urlStr
+    parameters:dict
+     needToken:NO
+acceptTypeJson:YES
+       success:success
+       failure:failure];
+ 
+}
+//3·采购通知单明细(读)
+- (void)getPurchaseNoticeDetailedWithPurchaseUuid:(NSString *)purchaseUuid                    success:(void (^)(id))succ
+                                    failure:(void (^)(id))fail
+{
+    
+}
+//4·保存并提交采购通知单
+- (void)saveAndSubmitPurchaseNoticeWithData:(id)data
+                                    success:(void (^)(id))succ
+                                    failure:(void (^)(id))fail
+{
+    
+}
+//5·提交采购通知单
+- (void)ComitPurchaseNoticeWithData:(id)data
+                            success:(void (^)(id))succ
+                            failure:(void (^)(id))fail
+{
+    
+}
+//6·接受采购通知单
+- (void)acceptPurchaseNoticeWithData:(id)data
+                             success:(void (^)(id))succ
+                             failure:(void (^)(id))fail
+{
+    
+}
+//7·结束采购通知单
+- (void)finishPurchaseNoticeWithData:(id)data
+                             success:(void (^)(id))succ
+                             failure:(void (^)(id))fail
+{
+    
+}
+//8·获取采购通知单跟进记录
+- (void)getPurchaseNoticeRecodWithData:(id)data
+                               success:(void (^)(id))succ
+                               failure:(void (^)(id))fail
+{
+    
 }
 @end

XFFruit/Macro/ICRAppMacro.h

@@ -49,11 +49,11 @@
 //颜色
 #define   GXF_LABLE_TINT_COLOR  HexColor(@"444444")
 #define   GXF_LABLE_BG_COLOR  XXFBgColor
-#define    GXF_GREEN_COLOR HexColor(@"50bd62")
-#define     GXF_ORIGIN_COLOR HexColor(@"f69100")
-#define     GXF_GRAY_COLOR  HexColor(@"444444")
+#define   GXF_GREEN_COLOR HexColor(@"50bd62")
+#define   GXF_ORIGIN_COLOR HexColor(@"f69100")
+#define   GXF_GRAY_COLOR  HexColor(@"444444")
 //字体大小
-#define GXF_LABLE_FONT FontSize(15)
+#define   GXF_LABLE_FONT FontSize(15)
 
 
 //  高度

XFFruit/Macro/ICRNotificationMacro.h

@@ -19,6 +19,7 @@
 //Avatar
 #define KNOTIFICATION_saveMaterial @"KNOTIFICATION_saveMaterial"
 #define KNOTIFICATION_editMaterial @"KNOTIFICATION_editMaterial"
+#define KNOTIFICATION_deleteMaterial @"KNOTIFICATION_deleteMaterial"
 
 #define KNOTIFICATION_saveProduct @"KNOTIFICATION_saveProduct"
 #define KNOTIFICATION_editProduct @"KNOTIFICATION_editProduct"

XFFruit/Utilities/IBTUIKit/IBTConstants.h

@@ -136,6 +136,12 @@
 #define PURCHASE_STATE_FINISHED     @"finished"
 
 
+//加工单状态
+#define PROCESS_STATE_PROCESSINF      @"processing"
+#define PROCESS_STATE_ABORTED          @"aborted"
+#define PROCESS_STATE_FINISHED        @"finished"
+
+
 #define ShowMessage(msg) [[[UIAlertView alloc] initWithTitle:@"温馨提示" message:msg delegate:nil cancelButtonTitle:@"确定" otherButtonTitles:nil] show]
 
 //类型

XFFruit/ViewControllers/Business/BusinessViewController.m

@@ -24,12 +24,16 @@
 #import "NewPurchaseViewController.h"
 #import "PurchaseViewController.h"
 
+#import"PurchaseNoticeViewController.h"
+
+
 #import "GXFFunctionDB.h"
 #import "GXFNewProcessViewController.h"
-#import "GXFSeeProcessViewController.h"
+#import "GXFListProcessViewController.h"
 @interface BusinessViewController ()<ICRFunctionBaseViewDelegate,UITableViewDataSource,UITableViewDelegate>
 @property (nonatomic, strong) ICRFunctionBaseView *c_functionBaseView;
 @property (nonatomic, strong) UITableView *c_tableView;
+
 @end
 
 @implementation BusinessViewController
@@ -143,8 +147,8 @@
             break;
         case kFunctionSeePurchaseNotice://查看采购通知单
         {
-            SeePurchaseNoticeViewController *svc =
-            [[SeePurchaseNoticeViewController alloc] init];
+            PurchaseNoticeViewController *svc =
+            [[PurchaseNoticeViewController alloc] init];
             svc.title = [IBTCommon localizableString:@"Survey3"];
             [self PushViewController:svc animated:YES];
         }
@@ -171,7 +175,7 @@
         }
             break;
         case kFunctionSeeProcessing:{
-            GXFSeeProcessViewController *seeProcessVC= [[GXFSeeProcessViewController alloc]init];
+            GXFListProcessViewController *seeProcessVC= [[GXFListProcessViewController alloc]init];
             [self PushViewController:seeProcessVC animated:YES];
         }
             break;

XFFruit/ViewControllers/Home/Controllers/ICRHomeViewController.m

@@ -32,7 +32,7 @@
 #import "GXFFunction.h"
 #import "GXFNoticeFunctionTableViewCell.h"
 #import "GXFFunctionCollectionViewCell.h"
-#import "GXFSeeProcessViewController.h"
+#import "GXFListProcessViewController.h"
 
 
 
@@ -282,7 +282,7 @@ static NSString *collectionCellID = @"collectionCell";
         }
             break;
         case kFunctionSeeProcessing:{
-            GXFSeeProcessViewController *seeProcessVC= [[GXFSeeProcessViewController alloc]init];
+            GXFListProcessViewController *seeProcessVC= [[GXFListProcessViewController alloc]init];
             [self PushViewController:seeProcessVC animated:YES];
         }
             break;

XFFruit/ViewControllers/Process/Controllers/GXFSeeProcessViewController.h → XFFruit/ViewControllers/Process/Controllers/GXFListProcessViewController.h

@@ -8,6 +8,6 @@
 
 #import <UIKit/UIKit.h>
 
-@interface GXFSeeProcessViewController : UIViewController
+@interface GXFListProcessViewController : UIViewController
 
 @end

XFFruit/ViewControllers/Process/Views/GXFPopNewMaterialViewController.h

@@ -7,10 +7,11 @@
 //
 
 #import <UIKit/UIKit.h>
-
+@class GXFProcessMaterial;
 @interface GXFPopNewMaterialViewController : UIViewController
 
 
-
+- (instancetype)initWithProcessMaterial: (GXFProcessMaterial *)processMaterial
+                                isEdit: (BOOL) isEdited;
 @end
 

XFFruit/ViewControllers/Process/Views/GXFPopNewMaterialViewController.m

@@ -34,10 +34,21 @@
 @property (nonatomic, strong) NSIndexPath *d_dateIndexPath;
 @property (nonatomic, assign) BOOL d_hasSaved;
 @property (nonatomic, strong) GXFBottomView *c_bottomV;
+@property (nonatomic, assign) BOOL d_isEdited;
 
 @end
 @implementation GXFPopNewMaterialViewController
 
+- (instancetype)initWithProcessMaterial: (GXFProcessMaterial *)processMaterial
+                                 isEdit: (BOOL) isEdited {
+    self = [super init];
+    if (!self) {
+        return nil;
+    }
+    self.d_processMaterial = processMaterial;
+    self.d_isEdited = isEdited;
+    return self;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = @"新增原料明细";
@@ -127,7 +138,7 @@
         xfCell = [tableView dequeueReusableCellWithIdentifier:lblCell];  //
         if (!xfCell) {
             xfCell = [[GXFTableViewCell alloc]initWithWidth:_c_tableView.width Style:UITableViewCellStyleDefault reuseIdentifier:lblCell textFieldPlaceholder:_d_rightArr[indexPath.row] hasLable:YES backLableText:_d_lableTextArr[indexPath.row - 4]];
-        
+            xfCell.f_textField.keyboardType = UIKeyboardTypeNumbersAndPunctuation;
         }
         
     }
@@ -257,13 +268,18 @@
 
 #pragma GXFBottomViewDelegate
 - (void)bottomViewleftButtonClicked:(UIButton *)leftBtn {
-
+    if (_d_isEdited) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_deleteMaterial object:_d_processMaterial];
+    }
 }
 - (void)bottomViewRightButtonClicked:(UIButton *)rightBtn {
     self.d_hasSaved = YES;
     [self.c_bottomV.f_rightBtn setBackgroundColor:GXF_GRAY_COLOR];
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_saveMaterial object:_d_processMaterial];
+    if (_d_isEdited) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_editMaterial object:_d_processMaterial];
+    } else {
+        [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_saveMaterial object:_d_processMaterial];
+    }
     
     
 

XFFruit/ViewControllers/Process/Views/GXFPopNewProductViewController.m

@@ -113,7 +113,7 @@
         xfCell = [tableView dequeueReusableCellWithIdentifier:lblCell];  //
         if (!xfCell) {
             xfCell = [[GXFTableViewCell alloc]initWithWidth:_c_tableView.width Style:UITableViewCellStyleDefault reuseIdentifier:lblCell textFieldPlaceholder:_d_rightArr[indexPath.row] hasLable:YES backLableText:_d_lableTextArr[indexPath.row - 3]];
-            
+             xfCell.f_textField.keyboardType = UIKeyboardTypeNumbersAndPunctuation;
         }
         
     }

XFFruit/ViewControllers/Process/Views/GXFProcessBoltView.h

+//
+//  GXFProcessBoltView.h
+//  XFFruit
+//
+//  Created by freecui on 15/9/7.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@protocol GXFProcessBoltViewDelegate <NSObject>
+- (void)getBoltValueSelectRow:(NSString *)state;
+- (void)getbillLike:(NSString *)billLike;
+- (void)getnoticeLike:(NSString *)noticeLike;
+- (void)clearBoltInformation;
+@end
+
+@interface GXFProcessBoltView : UIView<UITableViewDataSource,UITableViewDelegate>
+@property (nonatomic,strong)UITableView *tableView;
+@property (nonatomic,strong)NSMutableArray *dataArr;
+@property (nonatomic,weak)id <GXFProcessBoltViewDelegate>delegate;
+
+@property (nonatomic,strong)UITextField *billFiled;//采购单号类似于
+//@property (nonatomic,strong)UITextField *noticeFiled;//通知单号类似于
+@property (nonatomic,strong)UITextField *vendorFiled;//供应商uuid类似于
+
+- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state billNumber:(NSString *)billNumber noticeNumber:(NSString *)noticeNumber;
+@end

XFFruit/ViewControllers/Process/Views/GXFProcessCell.h

+//
+//  GXFProcessBillCell.h
+//  XFFruit
+//
+//  Created by freecui on 15/9/7.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "GXFProcessBill.h"
+@interface GXFProcessCell : UITableViewCell
+@property (nonatomic,strong)UILabel *billNumberLabel;//加工单号
+@property (nonatomic,strong)UILabel *titleLabel;//标题
+//@property (nonatomic,strong)UILabel *noticeNumberLabel;//采购通知单号
+@property (nonatomic,strong)UILabel *createOperNameLabel;//创建人
+@property (nonatomic,strong)UILabel *createTimeLabel;//创建时间
+@property (nonatomic,strong)UILabel *lineLabel;
+@property (nonatomic,strong)UIButton *stateBtn;
+
+@property (nonatomic,strong)GXFProcessBill *processBill;
+@end

XFFruit/ViewControllers/Process/Views/GXFProcessCell.m

+//
+//  PurchaseCell.m
+//  XFFruit
+//
+//  Created by 陈俊俊 on 15/8/23.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "GXFProcessCell.h"
+#define TitleSize 16
+#define ContentSize 14
+#define LeftMargin 90
+#define TopMargin 10
+#define TitleHeight 20
+#define TableHeight 120
+
+@implementation  GXFProcessCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
+    
+    self =  [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        [self bulidLayout];
+    }
+    return self;
+}
+
+- (void)bulidLayout
+{
+    self.stateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
+    self.stateBtn.titleLabel.font = FontSize(ContentSize);
+    [self.stateBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    self.stateBtn.enabled = NO;
+    
+    self.billNumberLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, TopMargin, ScreenSize.width - LeftMargin, TitleHeight))];
+    self.billNumberLabel.textColor = GXF_CONTENT_COLOR;
+    self.billNumberLabel.font = FontSize(TitleSize);
+    
+    self.titleLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, CGRectGetMaxY(self.billNumberLabel.frame), ScreenSize.width - LeftMargin, TitleHeight*2))];
+    self.titleLabel.numberOfLines = 0;
+    self.titleLabel.textColor = GXF_CELL_COLOR;
+    self.titleLabel.font = FontSize(ContentSize);
+    
+    self.createOperNameLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, CGRectGetMaxY(self.titleLabel.frame), ScreenSize.width - LeftMargin, TitleHeight))];
+    self.createOperNameLabel.textColor = GXF_CELL_COLOR;
+    self.createOperNameLabel.font = FontSize(ContentSize);
+    
+    
+    self.createTimeLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, CGRectGetMaxY(self.createOperNameLabel.frame), ScreenSize.width - LeftMargin, TitleHeight))];
+    self.createTimeLabel.textColor = GXF_CELL_COLOR;
+    self.createTimeLabel.font = FontSize(ContentSize);
+    
+    self.lineLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin,TableHeight-1, ScreenSize.width - LeftMargin - TopMargin * 2, 1))];;
+    self.lineLabel.backgroundColor = GXF_LINE_COLOR;
+    
+    [self.contentView addSubview:self.stateBtn];
+    [self.contentView addSubview:self.billNumberLabel];
+    [self.contentView addSubview:self.titleLabel];
+    [self.contentView addSubview:self.createOperNameLabel];
+    [self.contentView addSubview:self.createTimeLabel];
+    [self.contentView addSubview:self.lineLabel];
+    
+}
+
+- (void)setProcessBill:(GXFProcessBill *)processBill{
+    self.billNumberLabel.text = [NSString stringWithFormat:@"单号：%@",processBill.billNumber];
+    self.titleLabel.text = [NSString stringWithFormat:@"标题：%@",processBill.title];
+    self.createOperNameLabel.text = [NSString stringWithFormat:@"创建人：%@",processBill.create_operName] ;
+    self.createTimeLabel.text =[NSString stringWithFormat:@"创建时间：%@",processBill.create_time];
+    NSString *stateStr = @"";
+    if ([processBill.state isEqualToString:PROCESS_STATE_PROCESSINF]) {
+        stateStr = @"进行中";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"]  forState:UIControlStateDisabled];
+    }else if ([processBill.state isEqualToString:PROCESS_STATE_ABORTED]) {
+        stateStr = @"已作废";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+    }else if ([processBill.state isEqualToString:PURCHASE_STATE_FINISHED]) {
+        stateStr = @"已完成";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled];
+    }
+    [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
+}
+
+
+
+
+
+
+
+- (void)awakeFromNib {
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+    
+    // Configure the view for the selected state
+}
+
+@end

XFFruit/ViewControllers/Process/Views/GXFProcessMaterialItemView.h

-//
-//  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

-//
-//  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/GXFProcessMaterialTableViewCell.m

@@ -22,6 +22,7 @@
 #define ShowWidth 150
 #define ShowHeight 20
 #import "GXFProcessMaterialTableViewCell.h"
+#import "GXFProcessMaterial.h"
 @interface GXFProcessMaterialTableViewCell ()
 
 
@@ -102,43 +103,43 @@
     self.showBaseCountLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.showTitleLabel.frame), 0, ShowWidth, ShowHeight))];
     self.showBaseCountLabel.textAlignment = NSTextAlignmentLeft;
     self.showBaseCountLabel.textColor = HexColor(ShowColor);
-    self.showBaseCountLabel.text = @"基础数量：10000";
+    self.showBaseCountLabel.text = [NSString stringWithFormat:@"基础数量：%@",processMaterial.baseQty];//@"基础数量：10000";
     self.showBaseCountLabel.font = FontSize(ShowSize);
     
     self.showDateLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showTitleLabel.frame), CGRectGetMaxY(self.showTitleLabel.frame), ShowWidth, ShowHeight))];
     self.showDateLabel.textAlignment = NSTextAlignmentLeft;
     self.showDateLabel.textColor = HexColor(ShowColor);
-    self.showDateLabel.text = @"入库时间：2015-02-04";
+    self.showDateLabel.text = [NSString stringWithFormat:@"入库时间：%@",processMaterial.instockDate ];//@"入库时间：2015-02-04";
     self.showDateLabel.font = FontSize(ShowSize);
     
     self.basebaseQtyLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showBaseCountLabel.frame), CGRectGetMaxY(self.showTitleLabel.frame), ShowWidth, ShowHeight))];
     self.basebaseQtyLabel.textAlignment = NSTextAlignmentLeft;
     self.basebaseQtyLabel.textColor = HexColor(ShowColor);
-    self.basebaseQtyLabel.text = @"基础单价：11元";
+    self.basebaseQtyLabel.text = [NSString stringWithFormat:@"基础单价：%@",processMaterial.basePrice];//@"基础单价：11元";
     self.basebaseQtyLabel.font = FontSize(ShowSize);
     
     self.totalbaseQtyLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showTitleLabel.frame), CGRectGetMaxY(self.showDateLabel.frame), ShowWidth, ShowHeight))];
     self.totalbaseQtyLabel.textAlignment = NSTextAlignmentLeft;
     self.totalbaseQtyLabel.textColor = HexColor(ShowColor);
-    self.totalbaseQtyLabel.text = @"总金额：1000";
+    self.totalbaseQtyLabel.text = [NSString stringWithFormat:@"总金额：%@",processMaterial.total];///@"总金额：1000";
     self.totalbaseQtyLabel.font = FontSize(ShowSize);
     
     self.placeLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showBaseCountLabel.frame), CGRectGetMaxY(self.showDateLabel.frame), ShowWidth, ShowHeight))];
     self.placeLabel.textAlignment = NSTextAlignmentLeft;
     self.placeLabel.textColor = HexColor(ShowColor);
-    self.placeLabel.text = @"产地：河南省";
+    self.placeLabel.text = [NSString stringWithFormat:@"产地：%@",processMaterial.place];//@"产地：河南省";
     self.placeLabel.font = FontSize(ShowSize);
     
     self.qualityLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showTitleLabel.frame), CGRectGetMaxY(self.totalbaseQtyLabel.frame), ShowWidth, ShowHeight))];
     self.qualityLabel.textAlignment = NSTextAlignmentLeft;
     self.qualityLabel.textColor = HexColor(ShowColor);
-    self.qualityLabel.text = @"质量：1000";
+    self.qualityLabel.text = [NSString stringWithFormat:@"质量：%@",processMaterial.quality];//@"质量：1000";
     self.qualityLabel.font = FontSize(ShowSize);
     
     self.remarkLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showTitleLabel.frame), CGRectGetMaxY(self.qualityLabel.frame), ShowWidth, ShowHeight))];
     self.remarkLabel.textAlignment = NSTextAlignmentLeft;
     self.remarkLabel.textColor = HexColor(ShowColor);
-    self.remarkLabel.text = @"描述：河南省";
+    self.remarkLabel.text = [NSString stringWithFormat:@"备注：%@",processMaterial.remark];//@"描述：河南省";
     self.remarkLabel.font = FontSize(ShowSize);
     
     

XFFruit/ViewControllers/Process/Views/GXFProcessProductItemView.m

-
-//
-//  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

XFFruit/ViewControllers/Process/Views/GXFProcessProductTableViewCell.m

@@ -23,6 +23,7 @@
 #define ShowHeight 20
 
 #import "GXFProcessProductTableViewCell.h"
+
 @interface GXFProcessProductTableViewCell ()
 
 @property (nonatomic,strong)UILabel *titleLabel;
@@ -103,43 +104,43 @@
     self.showBaseCountLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.showTitleLabel.frame), 0, ShowWidth, ShowHeight))];
     self.showBaseCountLabel.textAlignment = NSTextAlignmentLeft;
     self.showBaseCountLabel.textColor = HexColor(ShowColor);
-    self.showBaseCountLabel.text = @"基础数量：10000";
+    self.showBaseCountLabel.text = [NSString stringWithFormat:@"基础数量：%@",processProduct.baseQty];//@"基础数量：10000";
     self.showBaseCountLabel.font = FontSize(ShowSize);
     
     self.showDateLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showTitleLabel.frame), CGRectGetMaxY(self.showTitleLabel.frame), ShowWidth, ShowHeight))];
     self.showDateLabel.textAlignment = NSTextAlignmentLeft;
     self.showDateLabel.textColor = HexColor(ShowColor);
-    self.showDateLabel.text = @"入库时间：2015-02-04";
+    self.showDateLabel.text = [NSString stringWithFormat:@"出库时间：%@",processProduct.outstockDate];//@"入库时间：2015-02-04";
     self.showDateLabel.font = FontSize(ShowSize);
     
     self.basebaseQtyLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showBaseCountLabel.frame), CGRectGetMaxY(self.showTitleLabel.frame), ShowWidth, ShowHeight))];
     self.basebaseQtyLabel.textAlignment = NSTextAlignmentLeft;
     self.basebaseQtyLabel.textColor = HexColor(ShowColor);
-    self.basebaseQtyLabel.text = @"基础单价：11元";
+    self.basebaseQtyLabel.text = [NSString stringWithFormat:@"包装单位：%@",processProduct.unit];//@"基础单价：11元";
     self.basebaseQtyLabel.font = FontSize(ShowSize);
     
     self.totalbaseQtyLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showTitleLabel.frame), CGRectGetMaxY(self.showDateLabel.frame), ShowWidth, ShowHeight))];
     self.totalbaseQtyLabel.textAlignment = NSTextAlignmentLeft;
     self.totalbaseQtyLabel.textColor = HexColor(ShowColor);
-    self.totalbaseQtyLabel.text = @"总金额：1000";
+    self.totalbaseQtyLabel.text =[NSString stringWithFormat:@"包装规格：%@",processProduct.qpc];// @"总金额：1000";
     self.totalbaseQtyLabel.font = FontSize(ShowSize);
     
     self.placeLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showBaseCountLabel.frame), CGRectGetMaxY(self.showDateLabel.frame), ShowWidth, ShowHeight))];
     self.placeLabel.textAlignment = NSTextAlignmentLeft;
     self.placeLabel.textColor = HexColor(ShowColor);
-    self.placeLabel.text = @"产地：河南省";
+    self.placeLabel.text = [NSString stringWithFormat:@"包装规格描述：%@",processProduct.qpcStr];//@"产地：河南省";
     self.placeLabel.font = FontSize(ShowSize);
     
     self.qualityLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showTitleLabel.frame), CGRectGetMaxY(self.totalbaseQtyLabel.frame), ShowWidth, ShowHeight))];
     self.qualityLabel.textAlignment = NSTextAlignmentLeft;
     self.qualityLabel.textColor = HexColor(ShowColor);
-    self.qualityLabel.text = @"质量：1000";
+    self.qualityLabel.text = [NSString stringWithFormat:@"包装数量：%@",processProduct.quantity];// @"质量：1000";
     self.qualityLabel.font = FontSize(ShowSize);
     
     self.remarkLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showTitleLabel.frame), CGRectGetMaxY(self.qualityLabel.frame), ShowWidth, ShowHeight))];
     self.remarkLabel.textAlignment = NSTextAlignmentLeft;
     self.remarkLabel.textColor = HexColor(ShowColor);
-    self.remarkLabel.text = @"描述：河南省";
+    self.remarkLabel.text = [NSString stringWithFormat:@"备注：%@",processProduct.remark];//@"描述：河南省";
     self.remarkLabel.font = FontSize(ShowSize);
     
     
@@ -177,7 +178,7 @@
     
 }
 
-
+//- (void)
 - (void)awakeFromNib {
     // Initialization code
 }

XFFruit/ViewControllers/Process/Views/GXFProcessProductItemView.h → XFFruit/ViewControllers/PurchaseNotice/Controllers/PurchaseNoticeViewController.h

 //
-//  GXFProcessProductItemView.h
+//  PurchaseNoticeViewController.h
 //  XFFruit
 //
-//  Created by freecui on 15/9/6.
+//  Created by mac on 15/9/5.
 //  Copyright (c) 2015年 Xummer. All rights reserved.
 //
 
-#import "IBTUIView.h"
+#import "ICRBaseViewController.h"
 
-@interface GXFProcessProductItemView : IBTUIView
+@interface PurchaseNoticeViewController : ICRBaseViewController
 
 @end

XFFruit/ViewControllers/PurchaseNotice/SeePurchaseNoticeViewController.h → XFFruit/ViewControllers/PurchaseNotice/Controllers/SeePurchaseNoticeViewController.h

@@ -7,7 +7,10 @@
 //
 
 #import "ICRBaseViewController.h"
-
+#import "PurchaseBill.h"
 @interface SeePurchaseNoticeViewController : ICRBaseViewController
+@property (nonatomic,strong)PurchaseBill *bill;
+//模拟三个人员
+@property (nonatomic,assign)NSInteger indexPerson;//0.1.2
 
 @end

XFFruit/ViewControllers/PurchaseNotice/Models/ShopDetail.h

+//
+//  ShopDetail.h
+//  XFFruit
+//
+//  Created by mac on 15/9/7.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "IBTModel.h"
+
+@interface ShopDetail : IBTModel
+@property (nonatomic,strong)NSString *merchandise;//商品
+@property (nonatomic,strong)NSString *packageSpecification;//包装规格
+@property (nonatomic,strong)NSString *packageQuantity;//包装数量
+@property (nonatomic,strong)NSString *packageUnit;//包装单位
+@property (nonatomic,strong)NSString *foundationQuantity;//基础数量
+@property (nonatomic,strong)NSString *foundationUnitPrice;//基础单价
+@property (nonatomic,strong)NSString *packageUnitPrice;//包装单价
+@property (nonatomic,strong)NSString *totalMoney;//总金额
+@property (nonatomic,strong)NSString *remark;//备注
+
+@end

XFFruit/ViewControllers/PurchaseNotice/Models/ShopDetail.m

+//
+//  ShopDetail.m
+//  XFFruit
+//
+//  Created by mac on 15/9/7.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "ShopDetail.h"
+
+@implementation ShopDetail
++ (NSDictionary *)specialKeysAndReplaceKeys {
+    return @{ @"pID" : [[self class] PrimaryKey], };
+}
+
++ (NSString *)PrimaryKey {
+    return @"uuid";
+}
+
+@end

XFFruit/ViewControllers/PurchaseNotice/SeePurchaseNoticeViewController.m

-//
-//  SeePurchaseNoticeViewController.m
-//  XFFruit
-//
-//  Created by mac on 15/8/16.
-//  Copyright (c) 2015年 Xummer. All rights reserved.
-//
-
-#import "SeePurchaseNoticeViewController.h"
-
-@interface SeePurchaseNoticeViewController ()
-
-@end
-
-@implementation SeePurchaseNoticeViewController
-
-- (void)viewDidLoad {
-    
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end

XFFruit/ViewControllers/PurchaseNotice/PurchaseNoticeCell.h → XFFruit/ViewControllers/PurchaseNotice/Views/PurchaseNoticeCell.h

@@ -11,6 +11,7 @@
 @interface PurchaseNoticeCell : UITableViewCell
 @property (nonatomic,strong)UILabel *HeardLabel;
 @property (nonatomic,strong)UILabel *FootLabel;
+@property (nonatomic,strong)UIImageView *arrowView;
 @property (nonatomic,strong)UILabel *SpLabel;
 @property (nonatomic,strong)UILabel *DjLabel;
 @property (nonatomic,strong)UILabel *BzggLabel;
@@ -18,6 +19,21 @@
 @property (nonatomic,strong)UIView *subSview;
 @property (nonatomic, assign) BOOL isSelected;
 @property (nonatomic,strong)UIButton *button;
+@property (nonatomic,strong)UILabel *packageSpecification;//包装规格
+@property (nonatomic,strong)UILabel *packageQuantity;//包装数量
+@property (nonatomic,strong)UILabel *packageUnit;//包装单位
+@property (nonatomic,strong)UILabel *foundationQuantity;//基础数量
+
+@property (nonatomic,strong)UILabel *foundationUnitPrice;//基础单价
+@property (nonatomic,strong)UILabel *packageUnitPrice;//包装单价
+@property (nonatomic,strong)UILabel *totalMoney;//总金额
+@property (nonatomic,strong)UILabel *remark;//备注
+@property (nonatomic,strong)NSArray *shopDetailAry1;
+@property (nonatomic,strong)NSArray *shopDetailAry2;
+
+
+
+
 
 
 - (void)setTitleStr:(NSString *)str;

XFFruit/ViewControllers/PurchaseNotice/PurchaseNoticeCell.m → XFFruit/ViewControllers/PurchaseNotice/Views/PurchaseNoticeCell.m

@@ -11,6 +11,8 @@
 #define LeftMargin 15
 #define TableHeight 46
 #define TableWidth 60
+#define LeftWidth 40
+#define RightWidth 30
 
 @implementation PurchaseNoticeCell
 
@@ -18,75 +20,114 @@
     
     self =  [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
-        
         self.isSelected=NO;
+        [self initdata];
         [self bulidLayout];
     }
     return self;
 }
-
+-(void)initdata
+{
+     self.packageSpecification=[[UILabel alloc]init];//包装规格
+     self.packageQuantity=[[UILabel alloc]init];;//包装数量
+     self.packageUnit=[[UILabel alloc]init]; ;//包装单位
+     self.foundationQuantity=[[UILabel alloc]init];;//基础数量
+     self.foundationUnitPrice=[[UILabel alloc]init];;//基础单价
+     self.packageUnitPrice=[[UILabel alloc]init];;//包装单价
+     self.totalMoney=[[UILabel alloc]init];;//总金额
+     self.remark=[[UILabel alloc]init];;//备注
+    self.shopDetailAry1=[NSArray arrayWithObjects: self.packageSpecification, self.foundationQuantity ,self.packageUnitPrice,self.remark,nil];
+     self.shopDetailAry2=[NSArray arrayWithObjects: self.packageQuantity, self.foundationUnitPrice ,self.totalMoney,nil];
+}
 - (void)bulidLayout
 {
+    CGFloat gipWidth = (ScreenSize.width-4*TableWidth-(LeftMargin+20)-RightWidth)/3;
     self.HeardLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin * 2, 1))];
     self.HeardLabel.backgroundColor = HexColor(@"e5e5e5");
     self.HeardLabel.font = FontSize(TitleSize);
     
     self.FootLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, self.size.height-1, ScreenSize.width - LeftMargin * 2, 1))];
-    self.HeardLabel.backgroundColor = HexColor(@"e5e5e5");
-    self.HeardLabel.font = FontSize(TitleSize);
+    self.FootLabel.backgroundColor = HexColor(@"e5e5e5");
+    self.FootLabel.font = FontSize(TitleSize);
+    
+    self.arrowView=[[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - 10)/2 , 10, 10)];
+    self.arrowView.image = [UIImage imageNamed:@"arrowright"];
+    self.arrowView.contentMode = UIViewContentModeScaleAspectFit;
     
     self.SpLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin+20, 0, TableWidth, TableHeight))];
     self.SpLabel.textAlignment= NSTextAlignmentLeft;
     self.SpLabel.textColor = HexColor(@"666666");
     self.SpLabel.font = FontSize(TitleSize);
     
-    self.DjLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin+80, 0,  TableWidth,TableHeight ))];
+    self.DjLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin+20+self.SpLabel.size.width+gipWidth , 0,  TableWidth,TableHeight ))];
     self.DjLabel.textAlignment= NSTextAlignmentLeft;
     self.DjLabel.textColor = HexColor(@"666666");
     self.DjLabel.font = FontSize(TitleSize);
     
-    self.BzggLabel=[[UILabel alloc]initWithFrame:CGRectMake(LeftMargin+150, 0, TableWidth, TableHeight)];
+    self.BzggLabel=[[UILabel alloc]initWithFrame:CGRectMake(self.DjLabel.frame.origin.x+self.DjLabel.size.width+gipWidth, 0, TableWidth, TableHeight)];
     self.BzggLabel.textAlignment= NSTextAlignmentLeft;
     self.BzggLabel.textColor = HexColor(@"666666");
     self.BzggLabel.font = FontSize(TitleSize);
     
-    self.BzslLabel=[[UILabel alloc]initWithFrame:CGRectMake(LeftMargin+240, 0, TableWidth, TableHeight)];
+    self.BzslLabel=[[UILabel alloc]initWithFrame:CGRectMake(self.BzggLabel.frame.origin.x+self.BzggLabel.size.width+gipWidth, 0, TableWidth, TableHeight)];
     self.BzslLabel.textAlignment= NSTextAlignmentLeft;
     self.BzslLabel.textColor = HexColor(@"666666");
     self.BzslLabel.font = FontSize(TitleSize);
     
-    self.SpLabel.text=@"1 西瓜";
-    self.DjLabel.text=@"0.8";
-    self.BzggLabel.text=@"1*12";
-    self.BzslLabel.text=@"100框";
+//    self.SpLabel.text=@"1 西瓜";
+//    self.DjLabel.text=@"0.8";
+//    self.BzggLabel.text=@"1*12";
+//    self.BzslLabel.text=@"100框";
     self.subSview=[[UIView alloc]initWithFrame:CGRectMake(0, 50, ScreenSize.width, TableHeight*3)];
     
    
     
-    NSArray*array=[NSArray arrayWithObjects:@"包装规格",@"基础数量" ,@"包装单价",@"备注",nil];
-    NSArray*array1=[NSArray arrayWithObjects:@"包装数量",@"基础单价" ,@"总金额",nil];
+    NSArray*array=[NSArray arrayWithObjects:@"包装规格:",@"基础数量:" ,@"包装单价:",@"备注:",nil];
+    NSArray*array1=[NSArray arrayWithObjects:@"包装数量:",@"基础单价:" ,@"总金额:",nil];
+    
     
     for (int i=0; i<array.count; i++) {
-        UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(TableWidth-10, i*(10+10), 100, 10)];
-        lable.text=[array objectAtIndex:i];
+        UILabel *lable=[[UILabel alloc]init];
+//        if (i==0) {
+            lable.frame=CGRectMake(LeftWidth, i*(10+10), (ScreenSize.width-2*LeftMargin)/4, 10);
+//        }
+              lable.text=[array objectAtIndex:i];
         lable.font=FontSize(TitleSize-2);
         [lable setTextColor:HexColor(@"444444")];
+       
         [self.subSview addSubview:lable];
+        UILabel*shopeLable= [self.shopDetailAry1 objectAtIndex:i];
+        if (i==3) {
+            shopeLable.frame=CGRectMake(lable.frame.origin.x+lable.frame.size.width-LeftMargin, lable.frame.origin.y,(ScreenSize.width-2*LeftMargin)/4*3, 10);
+        }else{
+             shopeLable.frame=CGRectMake(lable.frame.origin.x+lable.frame.size.width-LeftMargin, lable.frame.origin.y,(ScreenSize.width-2*LeftMargin)/4, 10);
+        }
+       
+        shopeLable.font=FontSize(TitleSize-2);
+        [shopeLable setTextColor:HexColor(@"444444")];
+//        shopeLable.backgroundColor=[UIColor redColor];
+        [self.subSview addSubview:shopeLable];
     }
     for (int i=0; i<array1.count; i++) {
-        UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(TableWidth+150, i*(10+10), 100, 10)];
-        lable.text=[array objectAtIndex:i];
+        UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(ScreenSize.width/2, i*(10+10), (ScreenSize.width-2*LeftMargin)/4, 10)];
+       
+        lable.text=[array1 objectAtIndex:i];
         lable.font=FontSize(TitleSize-2);
         [lable setTextColor:HexColor(@"444444")];
+        
         [self.subSview addSubview:lable];
+        UILabel*shopeLable= [self.shopDetailAry2 objectAtIndex:i];
+        shopeLable.frame=CGRectMake(lable.frame.origin.x-LeftMargin+lable.frame.size.width, lable.frame.origin.y,(ScreenSize.width-2*LeftMargin)/4, 10);
+        shopeLable.font=FontSize(TitleSize-2);
+        [shopeLable setTextColor:HexColor(@"444444")];
+//        shopeLable.backgroundColor=[UIColor redColor];
+        [self.subSview addSubview:shopeLable];
     }
     self.subSview.hidden=YES;
     
     self.button=[UIButton buttonWithType:UIButtonTypeCustom];
-    [self.button setFrame:CGRectMake(310, 0, 50, 50)];
-    [self.button setImage:[UIImage imageNamed:@"AttachHide"] forState:UIControlStateNormal];
-//    [self.button setTitle:@"编辑" forState:UIControlStateNormal];
-//    [self.button setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+    [self.button setFrame:CGRectMake(ScreenSize.width-50, 0, 50, 50)];
+    [self.button setImage:[UIImage imageNamed:@"edit"] forState:UIControlStateNormal];
     [self.contentView addSubview:self.button];
      [self.contentView addSubview:self.subSview];
     [self.contentView addSubview:self.SpLabel];
@@ -94,6 +135,7 @@
     [self.contentView addSubview:self.BzslLabel];
     [self.contentView addSubview:self.BzggLabel];
     [self.contentView  addSubview:self.HeardLabel];
+    [self.contentView addSubview:self.arrowView];
 //    [self.contentView  addSubview:self.FootLabel];
 }
 - (void)setTitleStr:(NSString *)str

XFFruit/ViewControllers/PurchaseNotice/Views/SelectCompanyViewController.h

+//
+//  SelectCompanyViewController.h
+//  XFFruit
+//
+//  Created by mac on 15/8/31.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "ICRBaseViewController.h"
+#import "MaskCell.h"
+typedef void(^ChosePackaging)(NSString *Packaging);
+
+
+
+@interface SelectCompanyViewController : ICRBaseViewController
+@property (nonatomic,copy)ChosePackaging chosePackaging;
+@end

XFFruit/ViewControllers/PurchaseNotice/Views/SelectCompanyViewController.m

+//
+//  SelectCompanyViewController.m
+//  XFFruit
+//
+//  Created by mac on 15/8/31.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "SelectCompanyViewController.h"
+#define TableHeight 45
+@interface SelectCompanyViewController ()<UITableViewDataSource,UITableViewDelegate>
+{
+    
+}
+@property (nonatomic,strong)NSMutableArray *dataArr;
+@property (nonatomic,strong)UITableView *tableView;
+@end
+
+@implementation SelectCompanyViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self initData];
+    [self  initView];
+    // Do any additional setup after loading the view.
+}
+-(void)initData
+{
+    self.dataArr=[NSMutableArray arrayWithObjects:@"筐",@"斤",nil];
+    self.title = @"选择包装单位";
+    
+}
+-(void)initView
+{
+    self.tableView = [[UITableView alloc]initWithFrame:CGRectMake(0, 0,ScreenSize.width, ScreenSize.height) style:(UITableViewStylePlain)];
+    self.tableView.backgroundColor = [UIColor whiteColor];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    [self.view addSubview:self.tableView];
+}
+#pragma mark - 协议方法
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return self.dataArr.count;
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+    static NSString *cellID = @"MaskCell";
+    MaskCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+    if (cell == nil) {
+        cell = [[MaskCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID totalWidth:ScreenSize.width totalHeight:TableHeight];
+        tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        cell.selectionStyle = UITableViewCellSelectionStyleNone;
+        cell.textAlignment = UITextAlignmentCenter;
+        cell.textLabel.text=self.dataArr[indexPath.row];
+        cell.Commitbtn.hidden = YES;
+    }
+
+    return cell;
+
+   
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    return 40;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    NSString *ChosePackaging = self.dataArr[indexPath.row];
+    //block  回调
+    self.chosePackaging(ChosePackaging);
+    [self PopViewControllerAnimated:YES];
+    
+}
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

XFFruit/ViewControllers/PurchaseNotice/ShopDetaileViewController.h → XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.h

@@ -8,7 +8,11 @@
 
 #import "ICRBaseViewController.h"
 #import "Survey.h"
+#import "ShopDetail.h"
+typedef void(^ChoseShopDetail)(ShopDetail *shopDetail);
 @interface ShopDetaileViewController : ICRBaseViewController
 @property (nonatomic,strong)Survey *survey;
+@property (nonatomic,strong)ShopDetail *shopDetail;
+@property (nonatomic,strong)ChoseShopDetail choseShopDetail;
 @property (nonatomic,strong)NSString *navTitle;
 @end

XFFruit/ViewControllers/Survey/controllers/ChooseProductViewController.m

@@ -79,6 +79,7 @@
         if (self.dataArr.count > 0) {
             if (_currentIndexPath) {
                 Product *product = self.dataArr[_currentIndexPath.row];
+             //block  回调
                 self.choseProduct(product);
             }
         }

XFFruit/en.lproj/Localizable.strings

@@ -50,7 +50,7 @@
 "Survey7"                                 = "新建发运单";
 "Survey8"                                 = "查看发运单";
 "Survey9"                                 = "新建加工单";
-"EditorShopDetail"                              ="编辑商品明细";
+"EditorShopDetail"                        ="编辑商品明细";
 "AddShopDetail"                           ="添加商品明细";
 
 // Store
@@ -195,5 +195,21 @@
 "AddSurvey"                              = "新建行情调研";
 "AddPurchase"                            = "新建采购单";
 "Purchase"                               = "采购单";
+//Business
+"Business"                              = "业务";
+"Announcement"                          = "公告";
+"AddSurvey"                              = "新建行情调研";
+"Survey"                                 = "查看行情调研";
+"Survey1"                                 = "填写行情反馈";
+"Survey2"                                 = "新建采购通知";
+"Survey3"                                 = "查看采购通知";
+"Survey4"                                 = "新建采购单";
+"Survey5"                                 = "查看采购单";
+"Survey6"                                 = "审核采购单";
+"Survey7"                                 = "新建发运单";
+"Survey8"                                 = "查看发运单";
+"Survey9"                                 = "新建加工单";
+"EditorShopDetail"                        ="编辑商品明细";
+"AddShopDetail"                           ="添加商品明细";
 
 

XFFruit/zh-Hans.lproj/Localizable.strings

@@ -182,6 +182,24 @@
 "AddPurchase"                            = "新建采购单";
 "Purchase"                               = "采购单";
 
+//Business
+"Business"                              = "业务";
+"Announcement"                          = "公告";
+"AddSurvey"                              = "新建行情调研";
+"Survey"                                 = "查看行情调研";
+"Survey1"                                 = "填写行情反馈";
+"Survey2"                                 = "新建采购通知";
+"Survey3"                                 = "查看采购通知";
+"Survey4"                                 = "新建采购单";
+"Survey5"                                 = "查看采购单";
+"Survey6"                                 = "审核采购单";
+"Survey7"                                 = "新建发运单";
+"Survey8"                                 = "查看发运单";
+"Survey9"                                 = "新建加工单";
+"EditorShopDetail"                        ="编辑商品明细";
+"AddShopDetail"                           ="添加商品明细";
+
+
 
 
 
@@ -193,3 +211,4 @@
 "VendorTitle"                              = "供应商";
 "WarehouseTitle"                            = "加工工厂";
 "ProductUnitTitle"                            = "商品单位";
+