修改查询库存精度问题／查看采购单、发运单／收货单显示规格

XFFruit.xcodeproj/project.pbxproj

@@ -4464,7 +4464,7 @@
 			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;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;

XFFruit/Info.plist

@@ -15,18 +15,42 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.41</string>
+	<string>2.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.41</string>
+	<string>2.0.1</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>App需要您的同意,才能访问媒体资料库</string>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>App需要您的同意,才能访问蓝牙</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>App需要您的同意,才能访问日历</string>
+	<key>NSCameraUsageDescription</key>
+	<string>App需要您的同意,才能访问相机</string>
+	<key>NSHealthShareUsageDescription</key>
+	<string>App需要您的同意,才能访问健康分享</string>
+	<key>NSHealthUpdateUsageDescription</key>
+	<string>App需要您的同意,才能访问健康更新 </string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>App需要您的同意,才能始终访问位置</string>
+	<key>NSLocationUsageDescription</key>
+	<string>App需要您的同意,才能访问位置</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string>App需要您的同意,才能在使用期间访问位置</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>App需要您的同意,才能访问麦克风</string>
+	<key>NSMotionUsageDescription</key>
+	<string>App需要您的同意,才能访问运动与健身</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>App需要您的同意,才能访问相册</string>
+	<key>NSRemindersUsageDescription</key>
+	<string>App需要您的同意,才能访问提醒事项</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -37,32 +61,6 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
-    <key>NSAppleMusicUsageDescription</key>
-    <string>App需要您的同意,才能访问媒体资料库</string>
-    <key>NSBluetoothPeripheralUsageDescription</key>
-    <string>App需要您的同意,才能访问蓝牙</string>
-    <key>NSCalendarsUsageDescription</key>
-    <string>App需要您的同意,才能访问日历</string>
-    <key>NSCameraUsageDescription</key>
-    <string>App需要您的同意,才能访问相机</string>
-    <key>NSHealthShareUsageDescription</key>
-    <string>App需要您的同意,才能访问健康分享</string>
-    <key>NSHealthUpdateUsageDescription</key>
-    <string>App需要您的同意,才能访问健康更新 </string>
-    <key>NSLocationAlwaysUsageDescription</key>
-    <string>App需要您的同意,才能始终访问位置</string>
-    <key>NSLocationUsageDescription</key>
-    <string>App需要您的同意,才能访问位置</string>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>App需要您的同意,才能在使用期间访问位置</string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>App需要您的同意,才能访问麦克风</string>
-    <key>NSMotionUsageDescription</key>
-    <string>App需要您的同意,才能访问运动与健身</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>App需要您的同意,才能访问相册</string>
-    <key>NSRemindersUsageDescription</key>
-    <string>App需要您的同意,才能访问提醒事项</string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

XFFruit/Macro/ICRAppMacro.h

@@ -33,12 +33,11 @@
 //#define HTTP_REST_API_BASE_URL  @"http://gomoredev:8090/cruiser-server/rest"
 
 //********测试环境********
-#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
+//#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
 
 //********正式环境*********
-//#define HTTP_REST_API_BASE_URL
-//@"http://122.224.171.126:7380/cruiser-server/rest"
-#define HTTP_REST_REPORT_BASE_URL @"http://122.224.171.126:7380"
+#define HTTP_REST_API_BASE_URL @"http://app.xianfengsg.com:7380/cruiser-server/rest"
+#define HTTP_REST_REPORT_BASE_URL @"http://app.xianfengsg.com:7380"
 #endif
 
 // HTTP

XFFruit/ViewControllers/Purchase/Views/ProductBillCell.m

@@ -160,7 +160,7 @@
     self.showCountLabel.text = [NSString stringWithFormat:@"包装数量：%@%@",billProduct.qty,billProduct.unit];
     self.showBaseCountLabel.text =[NSString stringWithFormat:@"基础数量：%@%@",billProduct.baseQty ,billProduct.baseUnit];
     self.showPriceLabel.text = [NSString stringWithFormat:@"包装单价：%.2f元",[billProduct.price floatValue]];
-    self.showBasePriceLabel.text = [NSString stringWithFormat:@"基础单价：%.2f元",[billProduct.basePrice floatValue]];
+    self.showBasePriceLabel.text = [NSString stringWithFormat:@"基础单价：%.4f元",[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];

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];
+    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/Views/ShopDetaileViewController.m

@@ -217,7 +217,7 @@ typedef enum : NSUInteger {
         [hud hide:YES];
         [IBTLoadingView hideHUDForView:weakSelf.view];
         if (![succ[@"data"] isKindOfClass:[NSArray class]]) {
-            NSString *msg = [NSString stringWithFormat:@"该批次<%@>在总部系统的库存不足！", billNumber];
+            NSString *msg = [NSString stringWithFormat:@"采购单<%@>在总部系统的库存不足！", billNumber];
             ShowMessage(msg);
             return ;
         }
@@ -229,7 +229,7 @@ typedef enum : NSUInteger {
                 
                 if (self.shopDetail.foundationQuantity.floatValue > model.qty.floatValue) {
                     CLog(@"库存不足");
-                    NSString *msg = [NSString stringWithFormat:@"该批次<%@>在总部系统的库存不足！", billNumber];
+                    NSString *msg = [NSString stringWithFormat:@"采购单<%@>在总部系统的库存不足！", billNumber];
                     ShowMessage(msg);
                     return ;
                 }
@@ -566,7 +566,7 @@ typedef enum : NSUInteger {
     //    kLOG(@"----%@", futureString);
     NSInteger flag = 0;
     NSInteger pointNum = 0;//用于标记小数点的数量，只能有一个小数点
-    const NSInteger limited = 2;//限制小数点后面的位数
+    const NSInteger limited = 4;//限制小数点后面的位数
     
     for (int i = (int)futureString.length - 1; i>=0; i--) {
         
@@ -671,13 +671,13 @@ typedef enum : NSUInteger {
 - (void)setUnitAndPackPrice{
     if (totalMoney.text.length > 0) {
         if (packageQuantity.text.length > 0 && [packageQuantity.text floatValue] > 0) {
-            NSDecimalNumber *packagePrice = [CalculateHelper calculateNum1:self.totalPrice num2:packageQuantity.text type:CalculateTypeDiv roundingType:NSRoundBankers cutLenth:2];
+            NSDecimalNumber *packagePrice = [CalculateHelper calculateNum1:self.totalPrice num2:packageQuantity.text type:CalculateTypeDiv roundingType:NSRoundBankers cutLenth:4];
             
             packageUnitPrice.text = packagePrice.stringValue;
             self.packPrice = packagePrice;
         }
         if (foundationQuantity.text.length > 0 && [foundationQuantity.text floatValue] > 0) {
-            NSDecimalNumber *packagePrice = [CalculateHelper calculateNum1:self.totalPrice num2:foundationQuantity.text type:CalculateTypeDiv roundingType:NSRoundBankers cutLenth:2];
+            NSDecimalNumber *packagePrice = [CalculateHelper calculateNum1:self.totalPrice num2:foundationQuantity.text type:CalculateTypeDiv roundingType:NSRoundBankers cutLenth:4];
             foundationUnitPrice.text = packagePrice.stringValue;
             self.basePrice = packagePrice;
         }

XFFruit/ViewControllers/Receiving/Controllers/ReceiveProductViewController.m

@@ -79,7 +79,7 @@
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     [self.view addSubview:self.tableView];
     
-    NSArray *arr = @[@"商品",@"待收包装数",@"已收包装数"];
+    NSArray *arr = @[@"商品",@"规格", @"待收包装数",@"已收包装数"];
     
     HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenAdd];
     [self.view addSubview:headCell];

XFFruit/ViewControllers/Receiving/Views/ReceiveProductCell.h

@@ -15,6 +15,7 @@
 @property (nonatomic,strong)UILabel *titleLabel;
 @property (nonatomic,strong)UILabel *dscountLabel;
 @property (nonatomic,strong)UILabel *yscountLabel;
+@property (strong, nonatomic) UILabel *qpcLabel;
 @property (nonatomic,strong)UILabel *lineLabel;
 
 @property (nonatomic,strong)UIView *showView;

XFFruit/ViewControllers/Receiving/Views/ReceiveProductCell.m

@@ -32,7 +32,7 @@
 - (void)bulidLayout
 {
     
-    CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (3 -1))/3;
+    CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (4 -1))/4;
     
     self.smallImageView = [[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - SmallSize)/2 , SmallSize, SmallSize)];
     self.smallImageView.image = [UIImage imageNamed:@"arrowright"];
@@ -48,7 +48,12 @@
     self.titleLabel.textColor = GXF_CONTENT_COLOR;
     self.titleLabel.font = GXF_SIXTEENTEH_SIZE;
     
-    self.dscountLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.titleLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+    self.qpcLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.titleLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+    self.qpcLabel.textAlignment = NSTextAlignmentCenter;
+    self.qpcLabel.textColor = GXF_CONTENT_COLOR;
+    self.qpcLabel.font = GXF_SIXTEENTEH_SIZE;
+    
+    self.dscountLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.qpcLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
     self.dscountLabel.textAlignment = NSTextAlignmentCenter;
     self.dscountLabel.textColor = GXF_CONTENT_COLOR;
     self.dscountLabel.font = GXF_SIXTEENTEH_SIZE;
@@ -139,6 +144,7 @@
     [self.contentView addSubview:self.smallImageView];
     [self.contentView addSubview:self.seqLabel];
     [self.contentView addSubview:self.titleLabel];
+    [self.contentView addSubview:self.qpcLabel];
     [self.contentView addSubview:self.dscountLabel];
     [self.contentView addSubview:self.yscountLabel];
     [self.contentView addSubview:self.editBtn];
@@ -166,6 +172,7 @@
 {
     self.seqLabel.text = [NSString stringWithFormat:@"%@",@(row+1)];
     self.titleLabel.text = transferProduct.productName;
+    self.qpcLabel.text = [transferProduct.qpcStr stringByAppendingString:transferProduct.baseUnit];
     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.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",[transferProduct.qpc stringValue],transferProduct.baseUnit];

XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m

@@ -279,7 +279,7 @@ typedef enum : NSUInteger {
     [HTTP purchaseStockWithPurchaseUuid:billNum success:^(id succ) {
         if (![succ[@"data"] isKindOfClass:[NSArray class]]) {
             [IBTLoadingView hideHUDWithText:@""];
-            NSString *msg = [NSString stringWithFormat:@"该批次<%@>在总部系统的库存不足！", billNum];
+            NSString *msg = [NSString stringWithFormat:@"采购单<%@>在总部系统的库存不足！", billNum];
             ShowMessage(msg);
             return ;
         }
@@ -294,7 +294,7 @@ typedef enum : NSUInteger {
                         CLog(@"库存不足");
                         [IBTLoadingView hideHUDWithText:@""];
                         self.purchaseAddStockCheckNumber = 0;
-                        NSString *msg = [NSString stringWithFormat:@"该批次<%@>的商品%@在总部系统的库存不足！", billNum, detail.productName];
+                        NSString *msg = [NSString stringWithFormat:@"采购单<%@>的商品%@在总部系统的库存不足！", billNum, detail.productName];
                         ShowMessage(msg);
                         return ;
                     }

XFFruit/ViewControllers/Transfer/Controllers/TransferProductViewController.m

@@ -51,7 +51,7 @@
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     [self.view addSubview:self.tableView];
     
-    NSArray *arr = @[@"商品",@"待收包装数",@"已收包装数量"];
+    NSArray *arr = @[@"商品",@"规格",@"待收包装数",@"已收包装数量"];
     
     HeaderCell *headCell = [[HeaderCell alloc] initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenEdit];
     [self.view addSubview:headCell];

XFFruit/ViewControllers/Transfer/Views/TransferProductCell.h

@@ -16,6 +16,7 @@
 @property (nonatomic,strong)UILabel *titleLabel;
 @property (nonatomic,strong)UILabel *priceLabel;
 @property (nonatomic,strong)UILabel *countLabel;
+@property (strong, nonatomic) UILabel *qpcLabel;
 @property (nonatomic, strong) UILabel *transferedCount;
 @property (nonatomic,strong)UILabel *lineLabel;
 @property (strong, nonatomic) UILabel *showBasePrice;

XFFruit/ViewControllers/Transfer/Views/TransferProductCell.m

@@ -31,7 +31,7 @@
 
 - (void)bulidLayout
 {
-    CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin * (3 - 1)) / 3;
+    CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin * (4 - 1)) / 4;
     
     self.smallImageView = [[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - SmallSize)/2 , SmallSize, SmallSize)];
     self.smallImageView.image = [UIImage imageNamed:@"arrowright"];
@@ -47,7 +47,12 @@
     self.titleLabel.textColor = GXF_CONTENT_COLOR;
     self.titleLabel.font = GXF_SIXTEENTEH_SIZE;
     
-    self.priceLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.titleLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+    self.qpcLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.titleLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+    self.qpcLabel.textAlignment = NSTextAlignmentCenter;
+    self.qpcLabel.textColor = GXF_CONTENT_COLOR;
+    self.qpcLabel.font = GXF_SIXTEENTEH_SIZE;
+    
+    self.priceLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.qpcLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
     self.priceLabel.textAlignment = NSTextAlignmentCenter;
     self.priceLabel.textColor = GXF_CONTENT_COLOR;
     self.priceLabel.font = GXF_SIXTEENTEH_SIZE;
@@ -131,6 +136,7 @@
     [self.contentView addSubview:self.countLabel];
     [self.contentView addSubview:self.editBtn];
     [self.contentView addSubview:self.showView];
+    [self.contentView addSubview:self.qpcLabel];
     
     [self.showView addSubview:self.showNameLabel];
     [self.showView addSubview:self.showStandLabel];
@@ -151,8 +157,9 @@
 - (void)setPdtDetail:(TransferPdtDetail *)pdtDetail row:(NSInteger)row{
     self.seqLabel.text = [NSString stringWithFormat:@"%@",@(row+1)];
     self.titleLabel.text = pdtDetail.productName;
-    self.priceLabel.text =  [NSString stringWithFormat:@"%.0f",pdtDetail.qty.doubleValue - pdtDetail.rctQty.doubleValue];
-    self.countLabel.text = [NSString stringWithFormat:@"%.0f",pdtDetail.rctQty.doubleValue];
+    self.qpcLabel.text = [pdtDetail.qpcStr stringByAppendingString:pdtDetail.baseUnit];
+    self.priceLabel.text =  [NSString stringWithFormat:@"%.0f%@",pdtDetail.qty.doubleValue - pdtDetail.rctQty.doubleValue, pdtDetail.unit];
+    self.countLabel.text = [NSString stringWithFormat:@"%.0f%@",pdtDetail.rctQty.doubleValue, pdtDetail.unit];
     //已转运
     self.showNameLabel.text = [NSString stringWithFormat:@"商品：%@[%@]",pdtDetail.productName,pdtDetail.productCode];
     self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",[pdtDetail.qpc stringValue],pdtDetail.baseUnit];

XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m

@@ -236,7 +236,7 @@ typedef enum : NSUInteger {
     [HTTP purchaseStockWithPurchaseUuid:billNum success:^(id succ) {
         if (![succ[@"data"] isKindOfClass:[NSArray class]]) {
                                 [IBTLoadingView hideHUDWithText:@""];
-            NSString *msg = [NSString stringWithFormat:@"该批次<%@>在总部系统的库存不足！", billNum];
+            NSString *msg = [NSString stringWithFormat:@"采购单<%@>在总部系统的库存不足！", billNum];
             ShowMessage(msg);
             return ;
         }
@@ -247,11 +247,11 @@ typedef enum : NSUInteger {
             for (TransportPdtDetail *detail in arrProducts) {
                 if ([detail.productCode isEqualToString:model.productCode]) {
                     
-                    if (detail.baseQty.floatValue > model.qty.floatValue) {
+                    if (detail.baseQty.doubleValue > model.qty.doubleValue) {
                         CLog(@"库存不足");
                         [IBTLoadingView hideHUDWithText:@""];
                         purchaseAddStockCheckNumber = 0;
-                        NSString *msg = [NSString stringWithFormat:@"该批次<%@>的商品%@在总部系统的库存不足！", billNum, detail.productName];
+                        NSString *msg = [NSString stringWithFormat:@"采购单<%@>的商品%@在总部系统的库存不足！", billNum, detail.productName];
                         ShowMessage(msg);
                         return ;
                     }
@@ -548,7 +548,7 @@ typedef enum : NSUInteger {
     billProduct.qty = [NSNumber numberWithFloat:[shopDetail.packageQuantity floatValue]];
     billProduct.packprice = [NSNumber numberWithFloat:[shopDetail.packageUnitPrice floatValue]];
     billProduct.price = [NSNumber numberWithFloat:[shopDetail.foundationUnitPrice floatValue]];
-    billProduct.baseQty = [NSNumber numberWithFloat:[shopDetail.foundationQuantity floatValue]];
+    billProduct.baseQty = [NSNumber numberWithDouble:[shopDetail.foundationQuantity doubleValue]];
 //    billProduct.total = [NSNumber numberWithFloat:[shopDetail.totalMoney floatValue]];
     billProduct.note = shopDetail.remark;
     billProduct.qpcStr = shopDetail.packageQpcStr ? shopDetail.packageQpcStr : @"无" ;

XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.m

@@ -80,7 +80,7 @@
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     [self.view addSubview:self.tableView];
     
-    NSArray *arr = @[@"商品",@"待收包装数",@"已收包装数"];
+    NSArray *arr = @[@"商品",@"规格",@"待收包装数",@"已收包装数"];
     
     HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr withHiddenEdit:self.isHiddenEdit];
     [self.view addSubview:headCell];

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m

@@ -12,6 +12,7 @@
 #import "TransportPdtDetail.h"
 #import "MJRefresh.h"
 #import "ProductStockModel.h"
+#import "CalculateHelper.h"
 #define TopMargin 50
 #define TableHeight 50
 NSInteger purchaseStockCheckNumber = 0;
@@ -345,8 +346,10 @@ NSInteger purchaseStockCheckNumber = 0;
         for (TransportPdtDetail *detail in self.indexArr) {
             detail.purchasePdtDetail = detail.uuid;
             detail.uuid = nil;
-            detail.baseQty = @(detail.qpc.floatValue * detail.qty.floatValue);
-            detail.total = @(detail.qty.doubleValue * detail.packprice.doubleValue);
+            detail.baseQty = [CalculateHelper calculateNum1:detail.qpc num2:detail.qty type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:4];
+//            detail.baseQty = @(detail.qpc.doubleValue * detail.qty.doubleValue);
+            detail.total = [CalculateHelper calculateNum1:detail.qty num2:detail.packprice type:(CalculateTypeMul) roundingType:NSRoundBankers cutLenth:4];
+//            detail.total = @(detail.qty.doubleValue * detail.packprice.doubleValue);
             [arr addObject:detail];
         }
         
@@ -419,7 +422,7 @@ NSInteger purchaseStockCheckNumber = 0;
         
         if (![succ[@"data"] isKindOfClass:[NSArray class]]) {
             [IBTLoadingView hideHUDWithText:@""];
-            NSString *msg = [NSString stringWithFormat:@"该批次<%@>在总部系统的库存不足！", billNum];
+            NSString *msg = [NSString stringWithFormat:@"采购单<%@>在总部系统的库存不足！", billNum];
             purchaseStockCheckNumber = 0;
             ShowMessage(msg);
             return ;
@@ -435,7 +438,7 @@ NSInteger purchaseStockCheckNumber = 0;
                         [IBTLoadingView hideHUDWithText:@""];
                         CLog(@"库存不足");
                         purchaseStockCheckNumber = 0;
-                        NSString *msg = [NSString stringWithFormat:@"该批次<%@>的商品%@在总部系统的库存不足！", billNum, detail.productName];
+                        NSString *msg = [NSString stringWithFormat:@"采购单<%@>的商品%@在总部系统的库存不足！", billNum, detail.productName];
                         ShowMessage(msg);
                         return ;
                     }

XFFruit/ViewControllers/Transport/Views/TransportCreateProductCell.h

@@ -22,7 +22,7 @@
  *  已收包装数
  */
 @property (nonatomic,strong)UILabel *recievedQtyLabel;
-@property (nonatomic,strong)UILabel *shippedQtyLabel;
+@property (nonatomic,strong)UILabel *qpcLabel;
 @property (nonatomic,strong)UILabel *lineLabel;
 @property (strong, nonatomic) UILabel *showBasePrice;
 @property (nonatomic,strong)UIView *showView;

XFFruit/ViewControllers/Transport/Views/TransportCreateProductCell.m

@@ -31,7 +31,7 @@
 
 - (void)bulidLayout
 {
-    CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (3 -1))/3;
+    CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (4 -1))/4;
     
     self.smallImageView = [[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - SmallSize)/2 , SmallSize, SmallSize)];
     self.smallImageView.image = [UIImage imageNamed:@"arrowright"];
@@ -48,7 +48,13 @@
     self.titleLabel.text = @"苹果桃子";
     self.titleLabel.font = GXF_SIXTEENTEH_SIZE;
     
-    self.waitRecieveQtyLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.titleLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+    self.qpcLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.titleLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+    self.qpcLabel.textAlignment = NSTextAlignmentCenter;
+    self.qpcLabel.textColor = GXF_CONTENT_COLOR;
+    self.qpcLabel.font = GXF_SIXTEENTEH_SIZE;
+    self.qpcLabel.text = @"规格";
+    
+    self.waitRecieveQtyLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.qpcLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
     self.waitRecieveQtyLabel.textAlignment = NSTextAlignmentCenter;
     self.waitRecieveQtyLabel.textColor = GXF_CONTENT_COLOR;
     self.waitRecieveQtyLabel.text = @"80";
@@ -60,10 +66,7 @@
     self.recievedQtyLabel.textColor = GXF_CONTENT_COLOR;
     self.recievedQtyLabel.font = GXF_SIXTEENTEH_SIZE;
     
-//    self.shippedQtyLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.recievedQtyLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
-//    self.shippedQtyLabel.textAlignment = NSTextAlignmentCenter;
-//    self.shippedQtyLabel.textColor = GXF_CONTENT_COLOR;
-//    self.shippedQtyLabel.font = GXF_SIXTEENTEH_SIZE;
+
     
     
     
@@ -158,7 +161,7 @@
     [self.contentView addSubview:self.titleLabel];
     [self.contentView addSubview:self.waitRecieveQtyLabel];
     [self.contentView addSubview:self.recievedQtyLabel];
-    [self.contentView addSubview:self.shippedQtyLabel];
+    [self.contentView addSubview:self.qpcLabel];
     [self.contentView addSubview:self.editBtn];
     [self.contentView addSubview:self.showView];
     
@@ -187,11 +190,11 @@
     self.recievedQtyLabel.text = @"0";
 
     self.showNameLabel.text = [NSString stringWithFormat:@"商品：%@[%@]",pdtDetail.productName,pdtDetail.productCode];
-    
+    self.qpcLabel.text = [pdtDetail.qpcStr stringByAppendingString:pdtDetail.baseUnit];
     self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",[pdtDetail.qpc stringValue],pdtDetail.baseUnit];
     self.showCountLabel.text = [NSString stringWithFormat:@"包装数量：%@%@",[pdtDetail.qty stringValue],pdtDetail.unit];
     self.showBaseCountLabel.text =[NSString stringWithFormat:@"基础数量：%@%@",pdtDetail.baseQty,
-                                   pdtDetail.unit];
+                                   pdtDetail.baseUnit];
     self.showBasePrice.text = [NSString stringWithFormat:@"基础单价：%@元", pdtDetail.price];
     self.showPriceLabel.text = [NSString stringWithFormat:@"包装单价：%.2f元",[pdtDetail.packprice floatValue]];
     self.showPurchaseLabel.text = [NSString stringWithFormat:@"采购单号：%@",pdtDetail.purchasebillnumber.length > 0 ? pdtDetail.purchasebillnumber: @"无"];

XFFruit/ViewControllers/Transport/Views/TransportPurductCell.m

@@ -179,7 +179,7 @@
 - (void)setPdtDetail:(TransportPdtDetail *)pdtDetail row:(NSInteger)row{
     self.seqLabel.text = [NSString stringWithFormat:@"%@",@(row+1)];
     self.titleLabel.text = pdtDetail.productName;
-    self.qpcLabel.text =  [NSString stringWithFormat:@"%.1f",[pdtDetail.qpc floatValue]];
+    self.qpcLabel.text =  [NSString stringWithFormat:@"%.2f",[pdtDetail.qpc floatValue]];
     self.countLabel.text = [NSString stringWithFormat:@"%@",pdtDetail.receivedQty];
     NSInteger validShioCount = pdtDetail.receivedQty.integerValue - pdtDetail.shippedQty.integerValue;
      self.shippedQtyLabel.text = [NSString stringWithFormat:@"%lu", validShioCount];