测试版1.6.46 采购单／转运单 提交前检查库存比较错误问题。缓存数据问题。

XFFruit/General/CalculateHelper.h

@@ -35,4 +35,5 @@ typedef NS_ENUM(NSInteger, CalculateType) {
 + (NSDecimalNumber *)calculateNum1:(id)num1 num2:(id)num2 type:(CalculateType)type roundingType:(NSRoundingMode)roundingType cutLenth:(NSInteger)coutLenth;
 + (NSString *)getMoneyStringFrom:(id)num Lenth:(NSInteger)cutLenth;
 + (NSString *)getMoneyStringFrom:(id)num;
++ (NSDecimalNumber *)changeType:(id)num1;
 @end

XFFruit/ViewControllers/ChooseViewController/ChooseVendorViewController.m

@@ -45,7 +45,7 @@
         [IBTLoadingView showProgressLabel:@"正在加载..."];
     }
     [[ICRHTTPController sharedController] getVendorWithStartDate:startDate
-     Page_number:self.currentPage page_size:100 success:succ failure:fail];
+     Page_number:self.currentPage page_size:100000 success:succ failure:fail];
 }
 - (void)getLastDateFromServer:(id)data
 {

XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m

@@ -19,6 +19,7 @@
 #import "ChooseTransportViewController.h"
 #import "ChooseTransferViewController.h"
 #import "ProductStockModel.h"
+#import "CalculateHelper.h"
 typedef enum : NSUInteger {
     SaveTag = 7000,
     CommitTag,
@@ -110,6 +111,10 @@ typedef enum : NSUInteger {
     [_bottomView refreshCost:self.transfer.accountDetails];
     [_bottomView refreshTranProduct:self.transfer.pdtDetails];
     
+    [self resetCache];
+}
+
+- (void)resetCache {
     //清空缓存，重新
     [self.dicProduct removeAllObjects];
     for (TransferPdtDetail *pdtDetail in _bottomView.productVC.transferProductArr) {
@@ -290,7 +295,7 @@ typedef enum : NSUInteger {
             for (TransportPdtDetail *detail in arrProducts) {
                 if ([detail.productCode isEqualToString:model.productCode]) {
                     
-                    if (detail.baseQty.floatValue > model.qty.floatValue) {
+                    if ([detail.baseQty compare: [CalculateHelper changeType:model.qty]] == NSOrderedDescending) {
                         CLog(@"库存不足");
                         [IBTLoadingView hideHUDWithText:@""];
                         self.purchaseAddStockCheckNumber = 0;
@@ -482,17 +487,7 @@ typedef enum : NSUInteger {
             TransferPdtDetail *tdetail = [self coverTransportPdtDetail:Detail];
             if (Detail.IsDeleted) {
                 [_bottomView refreshDelProduct:tdetail tag:indexTag];
-                //清空缓存，重新
-                [self.dicProduct removeAllObjects];
-                for (TransferPdtDetail *pdtDetail in _bottomView.productVC.transferProductArr) {
-                    NSMutableArray *arrProduct = [self.dicProduct objectForKey:pdtDetail.sourcebillnumber];
-                    if (!arrProduct) {
-                        arrProduct = [NSMutableArray array];
-                        [self.dicProduct setObject:arrProduct forKey:pdtDetail.sourcebillnumber];
-                    }
-                    
-                    [arrProduct addObject:pdtDetail];
-                }
+                [self resetCache];
             }else{
                 [_bottomView refreshEditProduct:tdetail tag:indexTag];
             }

XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m

@@ -17,6 +17,7 @@
 #import "ShopDetaileViewController.h"
 #import "PurchaseBill.h"
 #import "ProductStockModel.h"
+#import "CalculateHelper.h"
 NSInteger purchaseAddStockCheckNumber = 0;
 typedef enum : NSUInteger {
     SaveTag = 7000,
@@ -113,16 +114,8 @@ typedef enum : NSUInteger {
     [_bottomView refreshTranProduct:self.transport.pdtDetails];
     
     //清空缓存，重新
-    [self.dicProduct removeAllObjects];
-    for (TransportPdtDetail *pdtDetail in _bottomView.productVC.transportProductArr) {
-        NSMutableArray *arrProduct = [self.dicProduct objectForKey:pdtDetail.purchasebillnumber];
-        if (!arrProduct) {
-            arrProduct = [NSMutableArray array];
-            [self.dicProduct setObject:arrProduct forKey:pdtDetail.purchasebillnumber];
-        }
-        
-        [arrProduct addObject:pdtDetail];
-    }
+    [self resetCache];
+
 }
 
 - (void)deleteInPurchase:(NSNotification *)noti {
@@ -147,20 +140,24 @@ typedef enum : NSUInteger {
 //    }else{
         _bottomView.productVC.transportProductArr = orign;
         [_bottomView.productVC refresh];
-        //清空缓存，重新
-        [self.dicProduct removeAllObjects];
-        for (TransportPdtDetail *pdtDetail in _bottomView.productVC.transportProductArr) {
-            NSMutableArray *arrProduct = [self.dicProduct objectForKey:pdtDetail.purchasebillnumber];
-            if (!arrProduct) {
-                arrProduct = [NSMutableArray array];
-                [self.dicProduct setObject:arrProduct forKey:pdtDetail.purchasebillnumber];
-            }
-            
-            [arrProduct addObject:pdtDetail];
-        }
+    [self resetCache];
 //    }
 }
 
+- (void)resetCache {
+    //清空缓存，重新
+    [self.dicProduct removeAllObjects];
+    for (TransportPdtDetail *pdtDetail in _bottomView.productVC.transportProductArr) {
+        NSMutableArray *arrProduct = [self.dicProduct objectForKey:pdtDetail.purchasebillnumber];
+        if (!arrProduct) {
+            arrProduct = [NSMutableArray array];
+            [self.dicProduct setObject:arrProduct forKey:pdtDetail.purchasebillnumber];
+        }
+        
+        [arrProduct addObject:pdtDetail];
+    }
+}
+
 - (void)bulidLayout{
     self.view.backgroundColor  = XXFBgColor;
     _scrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0,0, ScreenSize.width, ScreenSize.height- 64 - BottomViewHeight )];
@@ -205,6 +202,7 @@ typedef enum : NSUInteger {
                 WS(weakSelf);
                 //判断数量问题
                 [IBTLoadingView showProgressLabel:@""];
+                [self resetCache];
                 [self stockValidWithDic:self.dicProduct billNumbers:array complete:^{
                     [IBTLoadingView hideHUDWithText:@""];
                     UIAlertView *alertView = [[UIAlertView alloc]initWithTitle:@"温馨提示" message:@"请确认提交" delegate:weakSelf cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil];
@@ -247,7 +245,7 @@ typedef enum : NSUInteger {
             for (TransportPdtDetail *detail in arrProducts) {
                 if ([detail.productCode isEqualToString:model.productCode]) {
                     
-                    if (detail.baseQty.doubleValue > model.qty.doubleValue) {
+                    if ([detail.baseQty compare:[CalculateHelper changeType:model.qty]] == NSOrderedDescending) {
                         CLog(@"库存不足");
                         [IBTLoadingView hideHUDWithText:@""];
                         purchaseAddStockCheckNumber = 0;
@@ -497,7 +495,7 @@ typedef enum : NSUInteger {
 }
 - (void)addPurchaseProduct:(NSNotification *)fication{
     TransportPdtDetail *billProduct = [[fication userInfo] objectForKey:@"transportPdtDetail"];
-    NSInteger indexTag = [[[fication userInfo] objectForKey:@"indexTag"] integerValue];
+    NSInteger indexTag = [[[fication userInfo] objectForKey:@"indexPath"] integerValue];
     
     ShopDetaileViewController *svc = [[ShopDetaileViewController alloc] init];
     if (billProduct) {
@@ -510,16 +508,8 @@ typedef enum : NSUInteger {
             if (Detail.IsDeleted) {
                 [_bottomView refreshDelProduct:tdetail tag:indexTag];
                 //清空缓存，重新
-                [self.dicProduct removeAllObjects];
-                for (TransportPdtDetail *pdtDetail in _bottomView.productVC.transportProductArr) {
-                    NSMutableArray *arrProduct = [self.dicProduct objectForKey:pdtDetail.purchasebillnumber];
-                    if (!arrProduct) {
-                        arrProduct = [NSMutableArray array];
-                        [self.dicProduct setObject:arrProduct forKey:pdtDetail.purchasebillnumber];
-                    }
-                    
-                    [arrProduct addObject:pdtDetail];
-                }
+                [self resetCache];
+                
             }else{
                 [_bottomView refreshEditProduct:tdetail tag:indexTag];
             }

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m

@@ -365,53 +365,6 @@ NSInteger purchaseStockCheckNumber = 0;
                 break;
             }
         }
-        
-//        return;
-//    }
-//    
-//    //******************发运单要检查库存**********************
-//    __weak TransportPurchaseViewController *weakSelf = self;
-//    //判断数量问题
-//    [IBTLoadingView showProgressLabel:@""];
-//    [self stockValidWithDic:dicProduct billNumbers:array complete:^{
-//        [IBTLoadingView hideHUDWithText:@""];
-//        
-//        //库存足够时，把临时数据放入正式的缓存数据中
-//        for (NSString *key in dicProduct.allKeys) {
-//            NSMutableArray *arrTemp = [dicProduct objectForKey:key];
-//            NSMutableArray *arrData = [weakSelf.dicProduct objectForKey:key];
-//            if (!arrData) {
-//                arrData = [NSMutableArray array];
-//                [weakSelf.dicProduct setObject:arrData forKey:key];
-//            }
-//            [arrData addObjectsFromArray:arrTemp];
-//        }
-//        [weakSelf PopViewControllerAnimated:YES];
-//        NSMutableArray*arr = [NSMutableArray array];
-//        for (TransportPdtDetail *detail in weakSelf.indexArr) {
-//            detail.purchasePdtDetail = detail.uuid;
-//            detail.uuid = nil;
-//            [arr addObject:detail];
-//        }
-//        
-//        if (weakSelf.getProchaseProduct) {
-//            weakSelf.getProchaseProduct(arr);
-//        }
-//        
-//        for (PurchaseBill *bill in self.dataArr) {
-//            if ([array containsObject:bill.billNumber]) {
-//                if (weakSelf.blockFirstWarehouse) {
-//                    weakSelf.blockFirstWarehouse(@[bill]);
-//                }
-//                break;
-//            }
-//        }
-//    }];
-
-    
-    
-    
-    
 }
 
 - (void)stockValidWithDic:(NSMutableDictionary *)dic billNumbers:(NSArray *)billNumbers complete:(void (^)(void))complete {
@@ -434,7 +387,7 @@ NSInteger purchaseStockCheckNumber = 0;
             for (TransportPdtDetail *detail in arrProducts) {
                 if ([detail.productCode isEqualToString:model.productCode]) {
                     
-                    if (detail.baseQty.floatValue > model.qty.floatValue) {
+                    if ([detail.baseQty compare: model.qty] == NSOrderedDescending) {
                         [IBTLoadingView hideHUDWithText:@""];
                         CLog(@"库存不足");
                         purchaseStockCheckNumber = 0;