修改bug

XFFruit.xcodeproj/project.pbxproj

@@ -4363,7 +4363,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PROVISIONING_PROFILE = "";
@@ -4402,7 +4402,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
@@ -4423,7 +4423,7 @@
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4432,7 +4432,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "d5f475ae-9bae-4ae0-a45a-673e85b7e684";
+				PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -4443,12 +4443,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				COPYING_PRESERVES_HFS_DATA = NO;
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4457,7 +4457,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "d5f475ae-9bae-4ae0-a45a-673e85b7e684";
+				PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;

XFFruit/Info.plist

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

XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m

@@ -249,7 +249,7 @@ typedef enum : NSUInteger {
     NSInteger indexTag = [[[fication userInfo] objectForKey:@"indexTag"] integerValue];
     
     ShopDetaileViewController *svc = [[ShopDetaileViewController alloc] init];
-    
+    svc.intertype = ShopDetailInterTypePurchase;
     if (billProduct) {
         svc.navTitle = @"编辑商品";
         ShopDetail *shopDetail=[self coverShopDetail:billProduct];
@@ -477,6 +477,7 @@ typedef enum : NSUInteger {
     billProduct.remark = shopDetail.remark;
     billProduct.qpcStr = shopDetail.packageQpcStr ? shopDetail.packageQpcStr : @"无";
     billProduct.baseUnit = shopDetail.packageQpcUnit;
+    billProduct.vnum = shopDetail.vnum;
     return billProduct;
 }
 - (ShopDetail *)coverShopDetail:(PurchaseBillProduct *)billProduct{
@@ -495,6 +496,7 @@ typedef enum : NSUInteger {
     shopDetail.remark  = billProduct.remark;
     shopDetail.packageQpcStr = billProduct.qpcStr;
     shopDetail.packageQpcUnit = billProduct.baseUnit;
+    shopDetail.vnum = billProduct.vnum;
     return shopDetail;
 }
 - (NSMutableArray *)coverPurchaseBillProduct:(NSArray *)arr{

XFFruit/ViewControllers/Purchase/Controllers/ProductBillViewController.m

@@ -12,7 +12,7 @@
 #import "ProductBillCell.h"
 #import "PurchaseBillProduct.h"
 #define TableHeight 44
-#define ShowHeight  130
+#define ShowHeight  140
 
 @interface ProductBillViewController ()<UITableViewDataSource,UITableViewDelegate,FooterCellDelegate,HeaderCellDelegate>
 {

XFFruit/ViewControllers/Purchase/Models/PurchaseBillProduct.h

@@ -28,6 +28,10 @@
 @property (nonatomic,strong)NSNumber *shippedBaseQty;//发运基础数量
 @property (strong, nonatomic) NSNumber *receivedQty;//收货数量
 @property (strong, nonatomic) NSNumber *receivedBaseQty;//收货基础数量
+/**
+ *  柜号
+ */
+@property (strong, nonatomic) NSString *vnum;
 
 
 

XFFruit/ViewControllers/Purchase/Views/ProductBillCell.h

@@ -28,9 +28,12 @@
 @property (nonatomic,strong)UILabel *showBasePriceLabel;
 @property (nonatomic,strong)UILabel *showTotalLabel;
 @property (nonatomic,strong)UILabel *showNoteLabel;
+
+
 @property (nonatomic,strong)UILabel *showShippedFlag;//发运标志
 @property (nonatomic,strong)UILabel *showShippedQty;//发运包装数量
 @property (nonatomic,strong)UILabel *showShippedBaseQty;//发运基础数量
+@property (strong, nonatomic) UILabel *showCounterNum;//柜号
 
 @property (nonatomic,assign)BOOL isShowShipping;//是否发运
 

XFFruit/ViewControllers/Purchase/Views/ProductBillCell.m

@@ -103,7 +103,12 @@
     self.showTotalLabel.textColor = GXF_PLACEHOLDER_COLOR;
     self.showTotalLabel.font = GXF_THREETEENTH_SIZE;
     
-    self.showNoteLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showBasePriceLabel.frame), ShowWidth, ShowHeight))];
+    self.showCounterNum = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showBasePriceLabel.frame), ShowWidth, ShowHeight))];
+    self.showCounterNum.textAlignment = NSTextAlignmentLeft;
+    self.showCounterNum.textColor = GXF_PLACEHOLDER_COLOR;
+    self.showCounterNum.font = GXF_THREETEENTH_SIZE;
+    
+    self.showNoteLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showCounterNum.frame), ShowWidth, ShowHeight))];
     self.showNoteLabel.textAlignment = NSTextAlignmentLeft;
     self.showNoteLabel.textColor = GXF_PLACEHOLDER_COLOR;
     self.showNoteLabel.font = GXF_THREETEENTH_SIZE;
@@ -135,7 +140,7 @@
     [self.showView addSubview:self.showPriceLabel];
     [self.showView addSubview:self.showBasePriceLabel];
     [self.showView addSubview:self.showTotalLabel];
-
+    [self.showView addSubview:self.showCounterNum];
     [self.showView addSubview:self.showNoteLabel];
     [self.contentView addSubview:self.lineLabel];
     
@@ -158,30 +163,32 @@
     self.showBasePriceLabel.text = [NSString stringWithFormat:@"基础单价：%.2f元",[billProduct.basePrice floatValue]];
     self.showTotalLabel.text = [NSString stringWithFormat:@"总金额：%@元",[billProduct.total stringValue]];
     self.showNoteLabel.text =[NSString stringWithFormat:@"备注：%@",billProduct.remark ? billProduct.remark :@"无" ];
+    self.showCounterNum.text = [NSString stringWithFormat:@"柜号：%@", billProduct.vnum];
     [self isShowShippingQty:billProduct];
 }
 
 - (void)isShowShippingQty:(PurchaseBillProduct *)billProduct{
     if(self.editBtn.hidden){
-        self.showShippedFlag = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showBasePriceLabel.frame), ShowWidth, ShowHeight))];
+        self.showShippedFlag.frame = CGRectMake(CGRectGetMinX(self.showCountLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth, ShowHeight);
         self.showShippedFlag.textAlignment = NSTextAlignmentLeft;
         self.showShippedFlag.textColor = GXF_PLACEHOLDER_COLOR;
         self.showShippedFlag.text = @"是否发运：未";
         self.showShippedFlag.font = GXF_THREETEENTH_SIZE;
+        //showStandLabel是包装规格，showCountLabel是包装数量
+        self.showShippedBaseQty.frame = (CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showCounterNum.frame), ShowWidth, ShowHeight));
+        self.showShippedBaseQty.textAlignment = NSTextAlignmentLeft;
+        self.showShippedBaseQty.textColor = GXF_PLACEHOLDER_COLOR;
+        self.showShippedBaseQty.text = @"发运基础数量：";
+        self.showShippedBaseQty.font = GXF_THREETEENTH_SIZE;
         
-        self.showShippedQty = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showCountLabel.frame), CGRectGetMaxY(self.showBasePriceLabel.frame), ShowWidth, ShowHeight))];
+        self.showShippedQty.frame = (CGRectMake(CGRectGetMinX(self.showCountLabel.frame), CGRectGetMaxY(self.showShippedFlag.frame), ShowWidth, ShowHeight));
         self.showShippedQty.textAlignment = NSTextAlignmentLeft;
         self.showShippedQty.textColor = GXF_PLACEHOLDER_COLOR;
         self.showShippedQty.text = @"发运包装数量：";
         self.showShippedQty.font = GXF_THREETEENTH_SIZE;
         
-        self.showShippedBaseQty = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showShippedFlag.frame), ShowWidth, ShowHeight))];
-        self.showShippedBaseQty.textAlignment = NSTextAlignmentLeft;
-        self.showShippedBaseQty.textColor = GXF_PLACEHOLDER_COLOR;
-        self.showShippedBaseQty.text = @"发运基础数量：";
-        self.showShippedBaseQty.font = GXF_THREETEENTH_SIZE;
         
-        self.showNoteLabel.frame = CGRectMake(CGRectGetMinX(self.showCountLabel.frame), CGRectGetMaxY(self.showShippedFlag.frame), ShowWidth, ShowHeight);
+        self.showNoteLabel.frame = CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showShippedBaseQty.frame), ShowWidth, ShowHeight);
     }
     NSMutableAttributedString *attributeStr1 = [IBTCommon setTextViewFontOfString:@"发运状态：" paragraphStyle:0 fontSize:13 color:GXF_CELL_COLOR];
     NSString *str = [NSString stringWithFormat:@"%@",[billProduct.shippedFlag integerValue] == 0 ? @"未完成":@"已完成"];
@@ -195,6 +202,29 @@
     [self.showView addSubview:self.showShippedBaseQty];
 }
 
+- (UILabel *)showShippedFlag {
+    if (!_showShippedFlag) {
+        _showShippedFlag = [UILabel new];
+        [_showView addSubview:_showShippedFlag];
+    }
+    return _showShippedFlag;
+}
+
+- (UILabel *)showShippedQty {
+    if (!_showShippedQty) {
+        _showShippedQty = [UILabel new];
+        [_showView addSubview:_showShippedQty];
+    }
+    return _showShippedQty;
+}
+
+- (UILabel *)showShippedBaseQty {
+    if (!_showShippedBaseQty) {
+        _showShippedBaseQty = [UILabel new];
+        [_showView addSubview:_showShippedBaseQty];
+    }
+    return _showShippedBaseQty;
+}
 - (void)awakeFromNib {
 }
 

XFFruit/ViewControllers/PurchaseNotice/Models/ShopDetail.h

@@ -31,6 +31,10 @@
 @property (nonatomic,strong)NSString *sourceBillNumber;//来源单号
 @property (nonatomic,strong)NSString *sourceDetail;//来源单号id
 @property (nonatomic,strong)NSString *sourceType;//来源类型
+/**
+ *  柜号
+ */
+@property (strong, nonatomic) NSString *vnum;
 
 
 @end

XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m

@@ -42,10 +42,12 @@ typedef enum : NSUInteger {
     UITextField *foundationUnitPrice; //基础单价
     UITextField *packageUnitPrice;    //包装单价
     UITextField *totalMoney;          //总金额
+    UITextField *counterNum;//柜台
     HPGrowingTextView *remark;        //备注
     UILabel *_measureUnitLabel;  //默认规格单位
     UILabel *_packageCountLabel; //包装数量
     UILabel *_baseCountLabel;    //基础数量
+    UILabel *_counterNum;//柜台
 
 }
 @property (nonatomic,strong)NSString *productCodeStr;//商品代码
@@ -84,6 +86,9 @@ typedef enum : NSUInteger {
     [_dataArr addObject:@"基础单价"];
     [_dataArr addObject:@"包装单价"];
     [_dataArr addObject:@"总金额"];
+    if (self.intertype == ShopDetailInterTypePurchase) {
+        [_dataArr addObject:@"柜号"];
+    }
     [_dataArr addObject:@"备注"];
     
 }
@@ -154,12 +159,13 @@ typedef enum : NSUInteger {
         
         _productLabel.textColor=GXF_CONTENT_COLOR;
         _PackagingLable.textColor=GXF_CONTENT_COLOR;
-        
+        counterNum.text = self.shopDetail.vnum;
         self.productCodeStr = self.shopDetail.product_code;
         self.productUuidStr = self.shopDetail.product_uuid;
         self.productNameStr = self.shopDetail.merchandise;
         self.packageQpcStr =  self.shopDetail.packageQpcStr;
         self.packageUintStr = self.shopDetail.packageUnit;
+        
         self.productMeasureUnit = self.shopDetail.packageQpcUnit.length > 0 ? self.shopDetail.packageQpcUnit : @"斤";
     }
 }
@@ -291,13 +297,13 @@ typedef enum : NSUInteger {
     self.shopDetail.packageUnit = self.packageUintStr;
     self.shopDetail.packageQuantity = packageQuantity.text;
     self.shopDetail.packageUnitPrice = self.packPrice;
-
+    
     self.shopDetail.foundationQuantity = foundationQuantity.text;
     self.shopDetail.foundationUnitPrice = self.basePrice;
     NSString *totalPrices = totalMoney.text;
     self.shopDetail.totalMoney = [NSDecimalNumber decimalNumberWithString:totalPrices];
     self.shopDetail.remark = remark.text;
-    
+    self.shopDetail.vnum = counterNum.text;
     if (self.productNameStr.length == 0 ) {
         ShowMessage(@"商品不能为空");
         return NO;
@@ -363,7 +369,9 @@ typedef enum : NSUInteger {
 }
 
 -  (void)createViewInCell:(SurveyCell *)cell indexPath:(NSIndexPath *)indexPath{
-    if (indexPath.row == 0||indexPath.row==1) {
+    NSString *title = _dataArr[indexPath.row];
+    if ([title isEqualToString:@"商品"] || [title isEqualToString:@"包装单位"]) {
+        
         UILabel *contentLabel = [[UILabel alloc]initWithFrame:(CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableHeight))];
         contentLabel.textAlignment= NSTextAlignmentRight;
         contentLabel.textColor = GXF_PLACEHOLDER_COLOR;
@@ -377,8 +385,8 @@ typedef enum : NSUInteger {
             _PackagingLable = contentLabel;
             contentLabel.text = @"选择包装单位";
         }
+    }else if ([title isEqualToString:@"备注"]){
         
-    }else if(indexPath.row == 8){
         HPGrowingTextView * remarkTextView = [[HPGrowingTextView alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableHeight)];
         remarkTextView.contentInset = UIEdgeInsetsMake(5, 5, 5, 0);
         remarkTextView.minNumberOfLines = 1;
@@ -405,8 +413,7 @@ typedef enum : NSUInteger {
         label.textColor = GXF_CONTENT_COLOR;
         label.font = GXF_FIFTEENTEN_SIZE;
         [cell.contentView addSubview:label];
-
-        if (indexPath.row==2) {
+        if ([title isEqualToString:@"包装规格"]) {
             UILabel *labelTwo = [[UILabel alloc]initWithFrame:CGRectMake(100+LeftMargin, 0, 50, TableHeight)];
             labelTwo.text = @"1*";
             labelTwo.textAlignment = NSTextAlignmentRight;
@@ -419,42 +426,47 @@ typedef enum : NSUInteger {
             textField.tag =111;
             [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
             packageSpecification=textField;//包装规格
-            
-        }else if (indexPath.row==3)
-        {
+        }else if ([title isEqualToString:@"包装数量"]) {
             _packageCountLabel = label;
             textField.placeholder = @"输入包装数量";
             [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
             packageQuantity=textField;     //包装数量
-        }else if (indexPath.row==4)
-        {
+        }else if ([title isEqualToString:@"基础数量"]) {
             _baseCountLabel = label;
             [textField setEnabled:NO];
             textField.placeholder = @"基础数量";
             textField.textColor = GXF_NAVIGAYION_COLOR;
             foundationQuantity=textField;  //基础数量
-            
-        }else if (indexPath.row==5)
-        {
+        }else if ([title isEqualToString:@"基础单价"]) {
             label.text = @"元";
             textField.placeholder = @"输入基础单价";
             [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
             foundationUnitPrice=textField; //基础单价
-        }else if (indexPath.row==6)
-        {
+        }else if ([title isEqualToString:@"包装单价"]) {
             label.text = @"元";
             [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
             textField.placeholder = @"输入包装单价";
             packageUnitPrice=textField;    //包装单价
-            
-        }else if (indexPath.row==7)
-        {
+
+        }else if ([title isEqualToString:@"总金额"]) {
             label.text = @"元";
             [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
             textField.placeholder = @"输入总金额";
             totalMoney=textField;          //总金额
+        }else if ([title isEqualToString:@"柜号"]) {
+            _counterNum = label;
+            textField.placeholder = @"输入柜号";
+            [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
+            textField.keyboardType = UIKeyboardTypeDefault;
+            counterNum=textField;     //包装数量
         }
     }
+    
+    
+    
+    
+    
+    
      [self  setviewsData];
 }
 

XFFruit/ViewControllers/Receiving/Views/ReceiveProductCell.h

@@ -30,6 +30,7 @@
 @property (nonatomic,strong)UILabel *showshTotalLabel;
 
 @property (nonatomic,strong)UILabel *showNoteLabel;
+@property (strong, nonatomic) UILabel *showCounterNum;
 
 @property (nonatomic,assign)BOOL isShowShipping;//是否发运
 

XFFruit/ViewControllers/Receiving/Views/ReceiveProductCell.m

@@ -118,7 +118,12 @@
     self.showshTotalLabel.font = GXF_THREETEENTH_SIZE;
     
     
-    self.showNoteLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth*2, ShowHeight))];
+    self.showCounterNum = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth*2, ShowHeight))];
+    self.showCounterNum.textAlignment = NSTextAlignmentLeft;
+    self.showCounterNum.textColor = GXF_PLACEHOLDER_COLOR;
+    self.showCounterNum.font = GXF_THREETEENTH_SIZE;
+    
+    self.showNoteLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showbzdwLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth*2, ShowHeight))];
     self.showNoteLabel.textAlignment = NSTextAlignmentLeft;
     self.showNoteLabel.textColor = GXF_PLACEHOLDER_COLOR;
     self.showNoteLabel.font = GXF_THREETEENTH_SIZE;
@@ -145,7 +150,7 @@
     [self.showView addSubview:self.showshCountLabel];
     [self.showView addSubview:self.showjcCountLabel];
     [self.showView addSubview:self.showshjcCountLabel];
-    
+    [self.showView addSubview:self.showCounterNum];
     [self.showView addSubview:self.showjcPriceLabel];
     
     [self.showView addSubview:self.showbzPriceLabel];
@@ -186,6 +191,8 @@
         self.showshTotalLabel.text = @"总金额[实收]：空";
     }
     
+    self.showCounterNum.text = [NSString stringWithFormat:@"柜号：%@", transferProduct.vnum ? transferProduct.vnum : @""];
+    
     self.showTotalLabel.text = [NSString stringWithFormat:@"总金额：%.2f元",transferProduct.total?[transferProduct.total floatValue]:0.00f];
     self.showNoteLabel.text =[NSString stringWithFormat:@"备注：%@",transferProduct.note ? transferProduct.note :@"无" ];
     if ([state isEqualToString:@"YES"]) {

XFFruit/ViewControllers/Transfer/Models/TransferPdtDetail.h

@@ -58,6 +58,10 @@
 @property (nonatomic,strong)NSNumber *shippedBaseQty;//发运基础数量
 @property (strong, nonatomic) PurchaseBillProduct *purchasePdt;
 @property (strong, nonatomic) TransportPdtDetail *transportPdt;
+/**
+ *  柜号
+ */
+@property (strong, nonatomic) NSString *vnum;
 
 - (PurchaseBillProduct *)changeToPurchasePdt;
 - (TransportPdtDetail *)changeToTransportPdt;

XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m

@@ -205,7 +205,7 @@ typedef enum : NSUInteger {
                     
                     if (detail.baseQty.floatValue > model.qty.floatValue) {
                         CLog(@"库存不足");
-                                            [IBTLoadingView hideHUDWithText:@""];
+                        [IBTLoadingView hideHUDWithText:@""];
                         purchaseAddStockCheckNumber = 0;
                         NSString *msg = [NSString stringWithFormat:@"该批次<%@>的商品%@在总部系统的库存不足！", billNum, detail.productName];
                         ShowMessage(msg);

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m

@@ -336,6 +336,10 @@ NSInteger purchaseStockCheckNumber = 0;
         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];