鲜丰正式版2.0.18 新建发运单修改商品数量总金额数量不变

XFFruit/Controllers/DataBaseController/ICRDataBaseController.m

@@ -352,6 +352,22 @@ static NSString *ICRDataBasePath = @"";
             [db executeUpdate:addTable];
         }
         
+        /*
+         2018-05-07
+         Warehouse 增加了isspecial字段
+         */
+        if (![db columnExists:@"isspecial" inTableWithName:@"Warehouse"]) {
+            CLog(@"没有isspecial字段");
+            
+            NSString *sql = @"DROP TABLE IF EXISTS 'Warehouse'";
+            [db executeUpdate:sql];
+            
+            NSString *addTable = [Warehouse SQLForCreateTable];
+            [db executeUpdate:addTable];
+        }
+        
+        
+        
         
         
 //        [db close];

XFFruit/Controllers/HTTPController/ICRHTTPController.h

@@ -8,6 +8,8 @@
 
 #import "IBTObject.h"
 #import "ICRAnnouncement.h"
+#import "AFNetworking.h"
+
 #define HTTP [ICRHTTPController sharedController]
 typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
     kAttachmentBoard = 0,
@@ -23,6 +25,13 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
 
 + (instancetype)sharedController;
 
+- (void)POST:(NSString *)urlStr
+  parameters:(id)parameters
+   needToken:(BOOL)bIsNeedToken
+acceptTypeJson:(BOOL)bAcceptJson
+     success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))succ
+     failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))fail;
+
 // Restful API
 
 // User

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -8,7 +8,6 @@
 
 #import "ICRHTTPController.h"
 #import "ICRUserUtil.h"
-#import "AFNetworking.h"
 #import "Base64.h"
 #import "AFNetworkActivityIndicatorManager.h"
 #import "NSDate+FormatterAdditions.h"

XFFruit/General/Categories/ChineseLogHelper.h

+//
+//  ChineseLogHelper.h
+//  RealEstateManagement
+//
+//  Created by Javen on 2016/11/21.
+//  Copyright © 2016年 上海勾芒信息科技. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSArray (Log)
+
+@end
+
+@interface NSDictionary (Log)
+
+@end

XFFruit/General/Categories/ChineseLogHelper.m

+//
+//  ChineseLogHelper.m
+//  RealEstateManagement
+//
+//  Created by Javen on 2016/11/21.
+//  Copyright © 2016年 上海勾芒信息科技. All rights reserved.
+//
+
+#import "ChineseLogHelper.h"
+
+@implementation NSArray (Log)
+
+- (NSString *)descriptionWithLocale:(id)locale
+{
+    NSMutableString *strM = [NSMutableString stringWithString:@"(\n"];
+    
+    [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        [strM appendFormat:@"\t%@,\n", obj];
+    }];
+    
+    [strM appendString:@")"];
+    
+    return strM;
+}
+
+@end
+
+@implementation NSDictionary (Log)
+
+- (NSString *)descriptionWithLocale:(id)locale
+{
+    NSMutableString *strM = [NSMutableString stringWithString:@"{\n"];
+    
+    [self enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+        [strM appendFormat:@"\t%@ = %@;\n", key, obj];
+    }];
+    
+    [strM appendString:@"}\n"];
+    
+    return strM;
+}
+
+@end

XFFruit/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.15</string>
+	<string>2.0.19</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.15</string>
+	<string>2.0.19</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

XFFruit/Macro/ICRAppMacro.h

@@ -37,8 +37,8 @@
 #elif XFFruit_DEV
 
 //********开发环境********
-#define HTTP_REST_API_BASE_URL  @"http://gomoredev:8090/cruiser-server/rest"
-#define HTTP_REST_REPORT_BASE_URL @"http://gomoredev:8090"
+#define HTTP_REST_API_BASE_URL  @"http://dev.gomoretech.com/cruiser-server/rest"
+#define HTTP_REST_REPORT_BASE_URL @"http://dev.gomoretech.com"
 
 #elif XFFruit_TEST
 //********测试环境********

XFFruit/Utilities/IBTUIKit/IBTConstants.h

@@ -206,6 +206,8 @@
 
 //转运单状态
 #define TRANSFER_STATE_INITIAL                  @"initial"   //未提交
+#define TRANSFER_STATE_WAITCHECK                  @"waitCheck"   //未提交
+#define TRANSFER_STATE_REJECT                @"rejected"   //未提交
 #define TRANSFER_STATE_UNRECEIVED               @"unreceived"//待收货
 #define TRANSFER_STATE_RECEIVED                 @"received"  //已收货
 #define TRANSFER_STATE_ABORTED                  @"aborted"   //已废用
@@ -226,6 +228,7 @@
 
 //转运单
 #define TRANSFER_ACTION_ABORT                     @"500605"    //作废权
+#define TRANSFER_ACTION_CHECK                   @"500606"    //审批权
 #define RECEIVE_ACTION_RECEIVE                    @"500803"    //收货权
 #define TRANSFER_ACTION_NEW                       @"500601"    //新建权
 

XFFruit/Vendors/BaseAlertCardViewController.h

+//
+//  BaseAlertCardViewController.h
+//  patrol
+//
+//  Created by Javen on 2017/3/3.
+//  Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+static NSInteger const shadowTag = 1111;
+
+@interface BaseAlertCardViewController : UIViewController
+@property (weak, nonatomic) UIViewController *superVC;
+
+/** 弹出框 */
+@property (weak, nonatomic) IBOutlet UIView *alertCard;
+
+
+- (void)show;
+- (void)hide;
+/** 提前触发viewDidLoad方法*/
+- (void)layoutAlertView;
+- (IBAction)actionHide:(id)sender;
+- (void)actionTap:(UITapGestureRecognizer *)tap;
+@end

XFFruit/Vendors/BaseAlertCardViewController.m

+//
+//  BaseAlertCardViewController.m
+//  patrol
+//
+//  Created by Javen on 2017/3/3.
+//  Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseAlertCardViewController.h"
+
+@interface BaseAlertCardViewController () <UIGestureRecognizerDelegate>
+
+@end
+
+@implementation BaseAlertCardViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.alertCard.transform = CGAffineTransformMakeScale(0.1, 0.1);
+    self.view.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0];
+    // Do any additional setup after loading the view.
+    self.view.tag = shadowTag;
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(actionTap:)];
+    UIView *tapView = [[UIView alloc] initWithFrame:self.view.bounds];
+    tapView.backgroundColor = [UIColor colorWithWhite:0.01 alpha:0.01];
+    [self.view insertSubview:tapView belowSubview:self.alertCard];
+    [tapView addGestureRecognizer:tap];
+}
+
+- (void)actionTap:(UITapGestureRecognizer *)tap {
+    [self hide];
+}
+
+- (IBAction)actionHide:(id)sender {
+    [self hide];
+    [self.superVC.view endEditing:true];
+}
+
+- (void)setSuperVC:(UIViewController *)superVC {
+    _superVC = superVC;
+    [superVC addChildViewController:self];
+}
+
+/**
+ 显示整个确认框
+ */
+- (void)show {
+    self.view.frame = self.superVC.view.bounds;
+
+    [self.superVC.view addSubview:self.view];
+
+    [UIView animateWithDuration:0.5
+                          delay:0
+         usingSpringWithDamping:0.7
+          initialSpringVelocity:1.0
+                        options:UIViewAnimationOptionCurveEaseOut
+                     animations:^{
+                         self.view.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.5];
+                         self.alertCard.transform = CGAffineTransformMakeScale(1, 1);
+                     }
+                     completion:nil];
+}
+
+/**
+ 隐藏整个确认框
+ */
+- (void)hide {
+    [UIView animateWithDuration:0.5
+        delay:0
+        usingSpringWithDamping:0.9
+        initialSpringVelocity:1.0
+        options:UIViewAnimationOptionCurveEaseOut
+        animations:^{
+            self.view.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.0];
+            self.alertCard.transform = CGAffineTransformMakeScale(0.01, 0.01);
+        }
+        completion:^(BOOL finished) {
+            [self.view removeFromSuperview];
+        }];
+}
+
+- (void)layoutAlertView {
+    [self 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/ChooseViewController/ChooseWarehouseViewController.m

@@ -50,7 +50,7 @@
         NSInteger pageCount = [pageDict[@"pageCount"] integerValue];
         if (pageCount <= self.currentPage) {
             [self endRefreshing];
-            [IBTLoadingView hideHUDWithText:nil];
+//            [IBTLoadingView hideHUDWithText:nil];
 //            [self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE];
             self.currentPage = 0;
             

XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m

@@ -488,11 +488,11 @@ typedef enum : NSUInteger {
     shopDetail.product_uuid = billProduct.product_uuid;
     shopDetail.product_code = billProduct.product_code;
     shopDetail.merchandise  = billProduct.product_name;
-    shopDetail.packageSpecification  =  [CalculateHelper getMoneyStringFrom:billProduct.qpc Lenth:0 isSeparate:NO];
+    shopDetail.packageSpecification  =  [CalculateHelper decimalNumber:billProduct.qpc].stringValue;
     shopDetail.packageUnit = billProduct.unit;
-    shopDetail.packageQuantity = [CalculateHelper getMoneyStringFrom:billProduct.qty Lenth:0 isSeparate:NO];
+    shopDetail.packageQuantity = [CalculateHelper decimalNumber:billProduct.qty].stringValue;
     shopDetail.packageUnitPrice  = billProduct.price;
-    shopDetail.foundationQuantity= [CalculateHelper getMoneyStringFrom:billProduct.baseQty Lenth:0 isSeparate:NO];
+    shopDetail.foundationQuantity= [CalculateHelper decimalNumber:billProduct.baseQty].stringValue;
     shopDetail.foundationUnitPrice= billProduct.basePrice;
     shopDetail.totalMoney= billProduct.total;
     shopDetail.remark  = billProduct.remark;

XFFruit/ViewControllers/Purchase/Models/Warehouse.h

@@ -22,4 +22,5 @@
 //20170508z增加是否wms仓和是否产品中心仓的判断字段
 @property (nonatomic, assign) BOOL iswms;
 @property (nonatomic, assign) BOOL isProductCenter;
+@property (nonatomic, assign) BOOL isSpecial;
 @end

XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.h

@@ -33,4 +33,9 @@ typedef void(^ChoseShopDetail)(ShopDetail *shopDetail);
 @property (nonatomic,strong)ChoseShopDetail choseShopDetail;
 @property (nonatomic,strong)NSString *navTitle;
 @property (assign, nonatomic) ShopDetailInterType intertype;
+
+/**
+ 是否禁止编辑基础单价
+ */
+@property (assign, nonatomic) BOOL isLockBasePrice;
 @end

XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m

@@ -121,11 +121,11 @@ typedef enum : NSUInteger {
     UIView *footView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 50)];
     
     
-        UIButton *saveBtn =  [IBTCustomButtom creatButtonWithFrame:CGRectMake(LeftMargin, 10, (ScreenSize.width - LeftMargin*3)/2, BtnHeight) target:self sel:@selector(btnClick:) tag:SaveTag image:nil title:@"删除" titleColor: [UIColor whiteColor] isCorner:YES corner:CornerRadius bgColor:GXF_SAVE_COLOR];
-        [footView addSubview:saveBtn];
-        
-        UIButton *commitBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(saveBtn.frame.origin.x + saveBtn.frame.size.width + LeftMargin, 10, (ScreenSize.width - LeftMargin*3)/2, BtnHeight) target:self sel:@selector(btnClick:) tag:CommitTag image:nil title:@"保存" titleColor: [UIColor whiteColor] isCorner:YES corner:CornerRadius bgColor:GXF_COMMIT_COLOR];
-        [footView addSubview:commitBtn];
+    UIButton *saveBtn =  [IBTCustomButtom creatButtonWithFrame:CGRectMake(LeftMargin, 10, (ScreenSize.width - LeftMargin*3)/2, BtnHeight) target:self sel:@selector(btnClick:) tag:SaveTag image:nil title:@"删除" titleColor: [UIColor whiteColor] isCorner:YES corner:CornerRadius bgColor:GXF_SAVE_COLOR];
+    [footView addSubview:saveBtn];
+    
+    UIButton *commitBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(saveBtn.frame.origin.x + saveBtn.frame.size.width + LeftMargin, 10, (ScreenSize.width - LeftMargin*3)/2, BtnHeight) target:self sel:@selector(btnClick:) tag:CommitTag image:nil title:@"保存" titleColor: [UIColor whiteColor] isCorner:YES corner:CornerRadius bgColor:GXF_COMMIT_COLOR];
+    [footView addSubview:commitBtn];
     
     _tableView.tableFooterView = footView;
     [self.view addSubview:_tableView];
@@ -174,8 +174,9 @@ typedef enum : NSUInteger {
         }
         
         _checkTotalTextField.text = self.shopDetail.checkTotal.doubleValue > 0 ? self.shopDetail.checkTotal.stringValue : @"0.0000";
-        
+        self.checkTotal = self.shopDetail.checkTotal;
         _checkPriceTextField.text = self.shopDetail.checkPrice.doubleValue > 0 ? self.shopDetail.checkPrice.stringValue : @"0.0000";
+        self.checkPrice = self.shopDetail.checkPrice;
         
         self.totalPrice = self.shopDetail.totalMoney;
         //备注
@@ -346,12 +347,12 @@ typedef enum : NSUInteger {
         return NO;
     }
     
-//    double max = self.shopDetail.receivedQty.doubleValue - self.shopDetail.shippedQty.doubleValue;
-//    if (packageQuantity.text.doubleValue > max && self.shopDetail.receivedQty != nil && self.shopDetail.shippedQty != nil){
-//        NSString *info = [NSString stringWithFormat:@"包装数量不得大于可运包装数[%.0f]", max];
-//        ShowMessage(info);
-//        return NO;
-//    }
+    //    double max = self.shopDetail.receivedQty.doubleValue - self.shopDetail.shippedQty.doubleValue;
+    //    if (packageQuantity.text.doubleValue > max && self.shopDetail.receivedQty != nil && self.shopDetail.shippedQty != nil){
+    //        NSString *info = [NSString stringWithFormat:@"包装数量不得大于可运包装数[%.0f]", max];
+    //        ShowMessage(info);
+    //        return NO;
+    //    }
     if (self.packageUintStr.length == 0) {
         ShowMessage(@"包装单位不能为空");
         return NO;
@@ -402,14 +403,14 @@ typedef enum : NSUInteger {
     }
     [cell setTitleStr:_dataArr[indexPath.row]];
     
-
+    
     return cell;
 }
 
 -  (void)createViewInCell:(SurveyCell *)cell indexPath:(NSIndexPath *)indexPath{
-        if (self.intertype == ShopDetailInterTypeTransport || self.intertype == ShopDetailInterTypeTranfer){
-            cell.userInteractionEnabled = NO;
-        }
+    if (self.intertype == ShopDetailInterTypeTransport || self.intertype == ShopDetailInterTypeTranfer){
+        cell.userInteractionEnabled = NO;
+    }
     NSString *title = _dataArr[indexPath.row];
     if ([title isEqualToString:@"商品"] || [title isEqualToString:@"包装单位"]) {
         
@@ -471,7 +472,7 @@ typedef enum : NSUInteger {
             textField.tag =111;
             
             textField.userInteractionEnabled = self.intertype != ShopDetailInterTypeTranfer;
-
+            
             [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
             packageSpecification=textField;//包装规格
         }else if ([title isEqualToString:@"包装数量"]) {
@@ -495,7 +496,7 @@ typedef enum : NSUInteger {
             [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
             foundationUnitPrice=textField; //基础单价
             if (self.intertype == ShopDetailInterTypeTranfer){
-                cell.userInteractionEnabled = YES;
+                cell.userInteractionEnabled = !self.isLockBasePrice;
             }
         }else if ([title isEqualToString:@"包装单价"]) {
             label.text = @"元";
@@ -673,7 +674,7 @@ typedef enum : NSUInteger {
         self.totalPrice = [CalculateHelper decimalNumber:totalMoney.text];
         [self setUnitAndPackPrice];
     }else if (textField == _checkPriceTextField){
-        self.checkPrice = [CalculateHelper decimalNumber:_checkPriceTextField.text];
+        self.checkPrice = [CalculateHelper calculateNum1:_checkPriceTextField.text num2:@(1) type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:2];
         
         self.checkTotal = [CalculateHelper calculateNum1:_checkPriceTextField.text num2:foundationQuantity.text type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:2];
         _checkTotalTextField.text = self.checkTotal.stringValue;

XFFruit/ViewControllers/Transfer/Controllers/CheckAlertViewController.h

+//
+//  CheckAlertViewController.h
+//  XFFruit
+//
+//  Created by Javen on 2018/4/1.
+//  Copyright © 2018年 Xummer. All rights reserved.
+//
+
+#import "BaseAlertCardViewController.h"
+
+@interface CheckAlertViewController : BaseAlertCardViewController
+//@property (strong, nonatomic) NSString *content;
+@property (strong, nonatomic) NSString *text;
+@property (copy, nonatomic) void (^blockConfirm)(void);
+
+- (void)configWithContent:(NSString *)content isHasTextField:(BOOL)isHasTextField;
+@end

XFFruit/ViewControllers/Transfer/Controllers/CheckAlertViewController.m

+//
+//  CheckAlertViewController.m
+//  XFFruit
+//
+//  Created by Javen on 2018/4/1.
+//  Copyright © 2018年 Xummer. All rights reserved.
+//
+
+#import "CheckAlertViewController.h"
+
+@interface CheckAlertViewController ()
+@property (weak, nonatomic) IBOutlet UILabel *labelContent;
+@property (weak, nonatomic) IBOutlet UITextField *textField;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *constraintHeight;
+@property (weak, nonatomic) IBOutlet UILabel *labelTitle;
+
+@end
+
+@implementation CheckAlertViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    for (UIButton *view in self.alertCard.subviews) {
+        if ([view isKindOfClass:[UIButton class]]){
+            view.layer.cornerRadius = 4;
+        }
+    }
+    // Do any additional setup after loading the view.
+}
+
+- (void)configWithContent:(NSString *)content isHasTextField:(BOOL)isHasTextField {
+    [self layoutAlertView];
+    
+    if (!isHasTextField) {
+        self.constraintHeight.constant = 140;
+        self.textField.hidden = true;
+    }
+    self.labelTitle.backgroundColor = [UIColor redColor];
+    self.labelContent.text = content;
+}
+- (IBAction)actionConfirm:(id)sender {
+    [self.view endEditing:true];
+    if (self.blockConfirm) {
+        self.blockConfirm();
+    }
+    
+}
+
+- (NSString *)text {
+    return self.textField.text;
+}
+- (IBAction)actionCancel:(id)sender {
+    [self hide];
+}
+
+- (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/Transfer/Controllers/NewTransferViewController.m

@@ -483,6 +483,7 @@ typedef enum : NSUInteger {
     
     ShopDetaileViewController *svc = [[ShopDetaileViewController alloc] init];
     svc.intertype = ShopDetailInterTypeTranfer;
+    svc.isLockBasePrice = _sheetView.selectedWareHouse.isSpecial;
     if (billProduct) {
         svc.navTitle = @"编辑商品";
         ShopDetail *shopDetail=[self coverShopDetail:billProduct];
@@ -491,10 +492,10 @@ typedef enum : NSUInteger {
             TransferPdtDetail *tdetail = [self coverTransportPdtDetail:Detail];
             if (Detail.IsDeleted) {
                 [_bottomView refreshDelProduct:tdetail tag:indexTag];
-                [self resetCache];
             }else{
                 [_bottomView refreshEditProduct:tdetail tag:indexTag];
             }
+            [self resetCache];
         };
         svc.shopDetail=shopDetail;
     }else{

XFFruit/ViewControllers/Transfer/Controllers/TransferViewController.m

@@ -277,7 +277,7 @@ typedef enum : NSUInteger {
                 _boltView.backgroundColor = XXFBgColor;
                 _boltView.delegate = self;
                 
-                _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"未提交",@"待收货",@"已收货",@"已作废",@"提交系统处理",@"系统处理失败",nil];
+                _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"未提交",@"待审核", @"已拒绝", @"待收货", @"提交系统处理",@"系统处理失败", @"已收货",@"已作废",nil];
                 [_maskView addSubview:_boltView];
                 [UIView animateWithDuration:0.25 animations:^{
                     CGRect sortFrame = _boltView.frame;

XFFruit/ViewControllers/Transfer/Models/Transfer.h

@@ -35,6 +35,8 @@
 @property (nonatomic,strong)NSString *lastModify_time;//最后修改时间
 @property (nonatomic,strong)NSString *lastModify_id;	//最后修改人代码
 @property (nonatomic,strong)NSString *lastModify_operName;//最后修改人名称
-
-
+@property (nonatomic,strong)NSString *rejectCause;//拒绝原因
+@property (nonatomic,strong)NSString *approved;//批准时间
+@property (nonatomic,strong)NSString *approvId;//
+@property (nonatomic,strong)NSString *approver;
 @end

XFFruit/ViewControllers/Transfer/Views/TopTransferView.h

@@ -28,7 +28,7 @@
 
 
 @property (nonatomic,weak)id <TopTransferViewDelegate>delegate;
-
+@property (strong, nonatomic) Warehouse *selectedWareHouse;
 @property (nonatomic,strong)NSString *warehouseUuid;
 @property (nonatomic,strong)NSString *warehouseCode;
 @property (nonatomic,strong)NSString *warehouseName;

XFFruit/ViewControllers/Transfer/Views/TopTransferView.m

@@ -193,6 +193,7 @@
         cvc.choseBaseInfo = ^(NSArray *warehouses){
             if (warehouses.count > 0) {
                 Warehouse *warehouse = warehouses[0];
+                self.selectedWareHouse = warehouse;
                 self.warehouseLabel.text = [NSString stringWithFormat:@"%@[%@]",warehouse.name,warehouse.code];
                 self.warehouseLabel.textColor = GXF_CONTENT_COLOR;
                 self.warehouseUuid = warehouse.uuid;

XFFruit/ViewControllers/Transfer/Views/TransferBoltView.m

@@ -249,20 +249,24 @@
     _currentIndexPath = indexPath;
     
     //initial(未提交)submitted(已提交)rejected(已拒绝)approved(已审批)shipping(发运中)finished(已完成)
-    
+    NSString *title = self.dataArr[indexPath.row];
     NSString *stateStr = @"";
-    if (indexPath.row == 0) {
+    if ([title isEqualToString:@"未提交"]) {
         stateStr = TRANSFER_STATE_INITIAL;
-    }else if(indexPath.row == 1){
+    }else if([title isEqualToString:@"待收货"]){
         stateStr = TRANSFER_STATE_UNRECEIVED;
-    }else if(indexPath.row == 2){
+    }else if([title isEqualToString:@"已收货"]){
         stateStr = TRANSFER_STATE_RECEIVED;
-    }else if(indexPath.row == 3){
+    }else if([title isEqualToString:@"已作废"]){
         stateStr = TRANSFER_STATE_ABORTED;
-    }else if(indexPath.row == 4){
+    }else if([title isEqualToString:@"提交系统处理"]){
         stateStr = TRANSFER_STATE_PROCESS;
-    }else if(indexPath.row == 5){
+    }else if([title isEqualToString:@"系统处理失败"]){
         stateStr = TRANSFER_STATE_PROCESSFAIL;
+    }else if([title isEqualToString:@"待审核"]){
+        stateStr = TRANSFER_STATE_WAITCHECK;
+    }else if([title isEqualToString:@"已拒绝"]){
+        stateStr = TRANSFER_STATE_REJECT;
     }
     [self.delegate getBoltValueSelectRow:stateStr];
 }

XFFruit/ViewControllers/Transfer/Views/TransferCell.m

@@ -103,6 +103,12 @@
     }else if ([transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) {
         stateStr = @"系统处理失败";
         [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+    }else if ([transfer.state isEqualToString:TRANSFER_STATE_WAITCHECK]) {
+        stateStr = @"待审核";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
+    }else if ([transfer.state isEqualToString:TRANSFER_STATE_REJECT]) {
+        stateStr = @"已拒绝";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
     }
     [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
 }

XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m

@@ -539,7 +539,7 @@ typedef enum : NSUInteger {
     billProduct.packprice = shopDetail.packageUnitPrice;
     billProduct.price = shopDetail.foundationUnitPrice;
     billProduct.baseQty = [NSDecimalNumber decimalNumberWithString:shopDetail.foundationQuantity];
-    billProduct.total = shopDetail.total;
+    billProduct.total = shopDetail.totalMoney;
     billProduct.note = shopDetail.remark;
     billProduct.qpcStr = shopDetail.packageQpcStr ? shopDetail.packageQpcStr : @"无" ;
     billProduct.baseUnit = shopDetail.packageQpcUnit;

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m

@@ -350,6 +350,9 @@ NSInteger purchaseStockCheckNumber = 0;
             detail.total = [CalculateHelper calculateNum1:detail.qty num2:detail.packprice type:(CalculateTypeMul) roundingType:NSRoundBankers cutLenth:4];
             detail.checkPrice = detail.price;
             detail.checkTotal = detail.total;
+            detail.price = [CalculateHelper calculateNum1:detail.price num2:@(1) type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:4];
+            detail.checkPrice = [CalculateHelper calculateNum1:detail.checkPrice num2:@(1) type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:4];
+            detail.checkTotal = [CalculateHelper calculateNum1:detail.checkTotal num2:@(1) type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:4];
             [arr addObject:detail];
         }
         

XFFruit_TEST.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.15</string>
+	<string>2.0.17</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.15</string>
+	<string>2.0.17</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>