鲜丰水果正式版2.0.4

XFFruit/Info.plist

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

XFFruit/Macro/ICRAppMacro.h

@@ -28,9 +28,12 @@
   @"http://jdcg.demo.hd123.cn:7080/cruiser-server/rest"
 #define HTTP_REST_REPORT_BASE_URL @"http://jdcg.demo.hd123.cn:7080"
 
-#else
+#elif XFFruit_DEV
+
 //********开发环境********
-//#define HTTP_REST_API_BASE_URL  @"http://gomoredev:8090/cruiser-server/rest"
+#define HTTP_REST_API_BASE_URL  @"http://gomoredev:8090/cruiser-server/rest"
+#define HTTP_REST_REPORT_BASE_URL @"http://gomoredev:8090"
+#else
 
 //********测试环境********
 //#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"

XFFruit/Utilities/IBTUIKit/IBTConstants.h

@@ -214,17 +214,19 @@
 #define RECEIVE_STATE_PROCESS                  @"process"//提交系统处理
 #define RECEIVE_STATE_PROCESSFAIL              @"processFail"//系统处理失败
 
-
 //权限列表vendorapprove 采购单
 #define PURCHASE_PERMISSIONS_MANAGEAPPROVE       @"500405"
 #define PURCHASE_PERMISSIONS_VENDORAPPROVE       @"500406"
 #define PURCHASE_PERMISSIONS_FINISH              @"500407"
 #define PURCHASE_PERMISSIONS_ABORT               @"500408"
+#define PURCHASE_PERMISSIONS_REVCEIVE            @"500409"//采购单收货权
 
 //转运单
 #define TRANSFER_ACTION_ABORT                     @"500605"    //作废权
 #define RECEIVE_ACTION_RECEIVE                    @"500803"    //收货权
 #define TRANSFER_ACTION_NEW                       @"500601"    //新建权
+
+
 //采购通知单权限
 #define NOTICE_PERMISSIONS_ACCEPTTASK             @"500304"//接受任务
 #define NOTICE_PERMISSIONS_CREATEBILL             @"500305"//新建权
@@ -233,7 +235,7 @@
 #define TRANSPORT_ACTION_FINISH                   @"500504"  //结束权
 #define TRANSPORT_ACTION_ABORT                    @"500505"   //作废权
 #define TRANSPORT_ACTION_NEW                      @"500501" //新建权
-
+#define TRANSPORT_ACTION_RECEIVE                  @"500506" //发运单收货权
 
 //选中的颜色
 #define BASESELECT_COLOR                          RGBA(255, 127, 0, 1)

XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m

@@ -241,7 +241,7 @@ typedef enum : NSUInteger {
             [self hiddenTwoBtn];
         }
     }else if ([self.bill.state isEqualToString:PURCHASE_STATE_WAITE_RECIEVE]){
-        if ([IBTCommon checkIsPermission:RECEIVE_ACTION_RECEIVE]) {
+        if ([IBTCommon checkIsPermission:PURCHASE_PERMISSIONS_REVCEIVE]) {
             [self createBtnWithArr:@[@"保存",@"收货"]];
         }else{
             [self hiddenTwoBtn];

XFFruit/ViewControllers/Purchase/Views/PurchaseReceiveProductCell.m

@@ -191,7 +191,7 @@
     self.titleLabel.text = transferProduct.productName;
     self.dscountLabel.text = [NSString stringWithFormat:@"%lu%@",transferProduct.qty.integerValue - transferProduct.rctQty.integerValue,transferProduct.unit];
     self.yscountLabel.text = [NSString stringWithFormat:@"%@%@",transferProduct.rctQty?[transferProduct.rctQty stringValue]:@"0",transferProduct.unit];
-    self.labelShipPkgCount.text = [NSString stringWithFormat:@"%lu, %@", transferProduct.shippedQty.integerValue, transferProduct.unit];
+    self.labelShipPkgCount.text = [NSString stringWithFormat:@"%lu%@", transferProduct.shippedQty.integerValue, transferProduct.unit];
     self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",[transferProduct.qpc stringValue],transferProduct.baseUnit];
     self.showbzdwLabel.text = [NSString stringWithFormat:@"包装单位：%@",transferProduct.unit];
     

XFFruit/ViewControllers/PurchaseNotice/Models/ShopDetail.h

@@ -24,6 +24,7 @@
 @property (nonatomic,strong)NSNumber *foundationUnitPrice;//基础单价
 @property (nonatomic,strong)NSNumber *packageUnitPrice;//包装单价
 @property (nonatomic,strong)NSNumber *totalMoney;//总金额
+@property (nonatomic,strong)NSNumber *total;
 @property (nonatomic,strong)NSString *remark;//备注
 @property (nonatomic,assign)BOOL IsDeleted;//是否删除
 @property (nonatomic,assign)BOOL IsXiuGai;//是否删除

XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m

@@ -466,6 +466,9 @@ typedef enum : NSUInteger {
             textField.placeholder = @"输入基础单价";
             [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
             foundationUnitPrice=textField; //基础单价
+            if (self.intertype == ShopDetailInterTypeTranfer){
+                cell.userInteractionEnabled = YES;
+            }
         }else if ([title isEqualToString:@"包装单价"]) {
             label.text = @"元";
             [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];

XFFruit/ViewControllers/Receiving/Controllers/ReceiveProductViewController.m

@@ -88,8 +88,13 @@
 }
 
 - (void)editClick:(UIButton *)btn{
-    TransferPdtDetail *billProduct = self.productArr[btn.tag];
-    [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_EditReceiveProduct object:nil userInfo:@{@"transferPdtDetail":billProduct,@"indexPath":@(btn.tag)}];
+    NSInteger section = btn.tag / 1000;
+    NSInteger row = btn.tag % 1000;
+    NSMutableArray *arrSection = [self.dictData objectForKey:self.arrBillNumber[section]];
+    
+    TransferPdtDetail *pdDetail = arrSection[row];
+    NSInteger index = [self.productArr indexOfObject:pdDetail];
+    [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_EditReceiveProduct object:nil userInfo:@{@"transferPdtDetail":pdDetail,@"indexTag":@(index)}];
 }
 #pragma mark - 协议方法
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -162,7 +167,7 @@
         cell.showView.frame = showfrmame;
         cell.backgroundColor = [UIColor whiteColor];
     }
-    cell.editBtn.tag = indexPath.row;
+    cell.editBtn.tag = indexPath.section * 1000 + indexPath.row;
     [cell.editBtn addTarget:self action:@selector(editClick:) forControlEvents:UIControlEventTouchUpInside];
     
     if (self.productArr.count > 0) {

XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m

@@ -549,7 +549,7 @@ typedef enum : NSUInteger {
     billProduct.packprice = [NSNumber numberWithFloat:[shopDetail.packageUnitPrice floatValue]];
     billProduct.price = [NSNumber numberWithFloat:[shopDetail.foundationUnitPrice floatValue]];
     billProduct.baseQty = [NSNumber numberWithDouble:[shopDetail.foundationQuantity doubleValue]];
-//    billProduct.total = [NSNumber numberWithFloat:[shopDetail.totalMoney floatValue]];
+    billProduct.total = shopDetail.total;
     billProduct.note = shopDetail.remark;
     billProduct.qpcStr = shopDetail.packageQpcStr ? shopDetail.packageQpcStr : @"无" ;
     billProduct.baseUnit = shopDetail.packageQpcUnit;
@@ -573,6 +573,7 @@ typedef enum : NSUInteger {
     shopDetail.foundationUnitPrice= billProduct.price;
     shopDetail.foundationQuantity= [billProduct.baseQty  stringValue];
     shopDetail.totalMoney= billProduct.total;
+    shopDetail.total = billProduct.total;
     shopDetail.remark  = billProduct.note;
     shopDetail.sourceDetail = billProduct.purchasePdtDetail;
     shopDetail.sourceBillNumber = billProduct.purchasebillnumber;

XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m

@@ -411,7 +411,7 @@ typedef enum : NSUInteger {
         }else{
             [self createBtnWithArr:arr];
         }
-    }else if ([self.transport.state isEqualToString:TRANSPORT_STATE_UNRECEIVED] && !self.isWms && [IBTCommon checkIsPermission:RECEIVE_ACTION_RECEIVE]){
+    }else if ([self.transport.state isEqualToString:TRANSPORT_STATE_UNRECEIVED] && !self.isWms && [IBTCommon checkIsPermission:TRANSPORT_ACTION_RECEIVE]){
         
             [self createBtnWithArr:@[@"保存",@"收货"]];
         
@@ -598,7 +598,7 @@ typedef enum : NSUInteger {
 
 - (void)editReceiveProduct:(NSNotification *)fination{
     NewReceiveProductViewController *nvc = [NewReceiveProductViewController new];
-    NSInteger indexTag = [[[fination userInfo] objectForKey:@"indexPath"] integerValue];
+    NSInteger indexTag = [[[fination userInfo] objectForKey:@"indexTag"] integerValue];
     TransferPdtDetail *transferPdtDetail = [[fination userInfo] objectForKey:@"transferPdtDetail"];
     if (transferPdtDetail) {
         nvc.navTitle = @"商品明细";