bug fix

XFFruit/Info.plist

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

XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m

@@ -117,7 +117,8 @@ typedef enum : NSUInteger {
     };
     void(^fail)(id) = ^(id data) {
         [IBTLoadingView hideHUDWithText:nil];
-        [IBTLoadingView showTips:data];
+        ShowMessage(((NSError *)data).localizedDescription);
+//        [IBTLoadingView showTips:data];
     };
     [IBTLoadingView showProgressLabel:@"正在加载..."];
     [[ICRHTTPController sharedController] getPurchaseResultWithPurchaseUuid:self.purchaseBill.uuid success:succ failure:fail];
@@ -336,7 +337,8 @@ typedef enum : NSUInteger {
                     }
                 }
             }else{
-                [IBTLoadingView showTips:message];
+                ShowMessage(message);
+//                [IBTLoadingView showTips:message];
             }
         }
     };

XFFruit/ViewControllers/Receiving/Controllers/ReceiveProductViewController.m

@@ -52,7 +52,7 @@
     for (TransferPdtDetail *pdt in self.productArr) {
         NSString *sourceBillNumber = pdt.sourcebillnumber ? pdt.sourcebillnumber : @" ";
         
-        if (![self.arrBillNumber containsObject:pdt.sourcebillnumber]) {
+        if (![self.arrBillNumber containsObject:sourceBillNumber]) {
             [self.arrBillNumber addObject:sourceBillNumber];
         }
         
@@ -64,6 +64,7 @@
         
         [arrTemp addObject:pdt];
     }
+    CLog(@"%@", self.dictData);
 }
 
 

XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m

@@ -374,6 +374,7 @@ typedef enum : NSUInteger {
     
     TransportPurchaseViewController *tpv = [TransportPurchaseViewController new];
     tpv.isTransportIn = NO;
+    tpv.receiveWrhUuid = _sheetView.warehouseUuid;
     tpv.getProchaseProduct = ^(NSArray *products){
         if (products.count > 0) {
             NSMutableArray *arr = [self coverTransferProduct:products];

XFFruit/ViewControllers/Transfer/Views/TopTransferView.m

@@ -126,6 +126,10 @@
         }else if(indexPath.row == 2){
             contentLabel.text = @"选择类型";
             self.typeLabel = contentLabel;
+            self.typeLabel.text = @"普通";
+            self.typeLabel.textColor = GXF_CONTENT_COLOR;
+            self.type = GXF_Normal;
+            self.selectType = GXF_Normal;
             
         }else if(indexPath.row == 5){
             contentLabel.text = @"选择预计到货时间";

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.h

@@ -20,5 +20,9 @@ typedef void(^GetPurchaseProduct)(NSArray *products);
 @property (nonatomic, assign) BOOL isTransportIn;
 
 @property (weak, nonatomic) NSMutableDictionary *dicProduct;
+/**
+ *  采购单的收货仓库（即转运单、发运单的发货仓库）
+ */
+@property (strong, nonatomic) NSString *receiveWrhUuid;
 
 @end

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m

@@ -86,7 +86,7 @@ NSInteger purchaseStockCheckNumber = 0;
     }
     NSDictionary *dict;
     
-//    if (self.isTransportIn) {
+    if (self.isTransportIn) {
         dict = @{
                  @"state":PURCHASE_STATE_RECEIVED,
                  @"queryOrders":orderArr,
@@ -96,17 +96,17 @@ NSInteger purchaseStockCheckNumber = 0;
                  @"isProductCenter":@(1),
                  @"pageNumber":@(_currentPage),
                  @"pageSize":@(20)};
-//    }else{
-//        dict = @{
-//                 @"state":[NSNull null],
-//                 @"stateNotIn":@[PURCHASE_STATE_ABORTED,PURCHASE_STATE_REJECTED],
-//                 @"queryOrders":orderArr,
-//                 @"userUuid":userUtil.userId,
-//                 @"billNumberProductLike":billNumberObject,
-//                 @"fetchParts":@"products",
-//                 @"pageNumber":@(_currentPage),
-//                 @"pageSize":@(20)};
-//    }
+    }else{
+        dict = @{
+                 @"state":PURCHASE_STATE_RECEIVED,
+                 @"queryOrders":orderArr,
+                 @"userUuid":userUtil.userId,
+                 @"billNumberProductLike":billNumberObject,
+                 @"fetchParts":@"products",
+                 @"receiveWrhUuid":self.receiveWrhUuid,
+                 @"pageNumber":@(_currentPage),
+                 @"pageSize":@(20)};
+    }
     [[ICRHTTPController sharedController] queryPurchaseWithData:dict success:succ failure:fail];
 }
 - (void)fetchtPuchaseList:(id)data{