规格单位数据

XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m

@@ -334,6 +334,7 @@ typedef enum : NSUInteger {
     billProduct.total = [NSNumber numberWithFloat:[shopDetail.totalMoney floatValue]];
     billProduct.remark = shopDetail.remark;
     billProduct.qpcStr = shopDetail.packageQpcStr ? shopDetail.packageQpcStr : @"无";
+    billProduct.baseUnit = shopDetail.packageQpcUnit;
     return billProduct;
 }
 - (ShopDetail *)coverShopDetail:(PurchaseBillProduct *)billProduct{
@@ -351,7 +352,7 @@ typedef enum : NSUInteger {
     shopDetail.totalMoney= [billProduct.total stringValue];
     shopDetail.remark  = billProduct.remark;
     shopDetail.packageQpcStr = billProduct.qpcStr;
-    
+    shopDetail.packageQpcUnit = billProduct.baseUnit;
     return shopDetail;
 }
 - (NSMutableArray *)coverPurchaseBillProduct:(NSArray *)arr{
@@ -362,6 +363,7 @@ typedef enum : NSUInteger {
         billProduct.product_name = product.productName;
         billProduct.product_uuid  = product.productUuid;
         billProduct.product_code = product.productCode;
+        billProduct.baseUnit = product.baseUnit;
         billProduct.qpc = product.qpc;
         billProduct.unit = product.packUnit;
         billProduct.qty = [NSNumber numberWithFloat:0];
@@ -370,6 +372,7 @@ typedef enum : NSUInteger {
         billProduct.basePrice = [NSNumber numberWithFloat:0];
         billProduct.total = [NSNumber numberWithFloat:0];
         billProduct.remark = product.remark;
+#warning 包装规格说明是不是少了在NoticeProduct
         billProduct.qpcStr = @"无";
         [billArr addObject:billProduct];
     }

XFFruit/ViewControllers/Purchase/Models/PurchaseBillProduct.h

@@ -20,6 +20,7 @@
 @property (nonatomic,strong)NSNumber *price;//包装单价
 @property (nonatomic,strong)NSNumber *baseQty;//基础数量
 @property (nonatomic,strong)NSNumber *basePrice;//基础单价
+@property (nonatomic,strong)NSString *baseUnit;//规格单位
 @property (nonatomic,strong)NSNumber *total;//　金额
 @property (nonatomic,strong)NSString *remark;//备注
 @property (nonatomic,strong)NSNumber *shippedFlag;//发运标志，0 未发运，1已发运

XFFruit/ViewControllers/Purchase/Views/ProductBillCell.m

@@ -142,11 +142,11 @@
 {
     self.seqLabel.text = [NSString stringWithFormat:@"%@",@(row+1)];
     self.titleLabel.text = billProduct.product_name;
-    self.priceLabel.text = [NSString stringWithFormat:@"%@元",billProduct.price];
+    self.priceLabel.text = [NSString stringWithFormat:@"%@元",billProduct.basePrice];
     self.countLabel.text = [NSString stringWithFormat:@"%@%@",billProduct.qty,billProduct.unit];
-    self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@",billProduct.qpc];
+    self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",billProduct.qpc,billProduct.baseUnit];
     self.showCountLabel.text = [NSString stringWithFormat:@"包装数量：%@%@",billProduct.qty,billProduct.unit];
-    self.showBaseCountLabel.text =[NSString stringWithFormat:@"基础数量：%@%@",billProduct.baseQty,@"斤"];
+    self.showBaseCountLabel.text =[NSString stringWithFormat:@"基础数量：%@%@",billProduct.baseQty,billProduct.baseUnit];
     self.showPriceLabel.text = [NSString stringWithFormat:@"包装单价：%@元",billProduct.price];
     self.showBasePriceLabel.text = [NSString stringWithFormat:@"基础单价：%@元",billProduct.basePrice];
     self.showTotalLabel.text = [NSString stringWithFormat:@"总金额：%@元",billProduct.total];

XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m

@@ -154,7 +154,7 @@ typedef enum : NSUInteger {
     _tableView.delegate = self;
     _tableView.dataSource = self;
     
-    mingXiTableView=[[UITableView alloc]initWithFrame:CGRectMake(0, 2*LeftMargin+_tableView.frame.size.height, ScreenSize.width, ScreenSize.height-_tableView.height-ScreenSize.height/5)];
+    mingXiTableView=[[UITableView alloc]initWithFrame:CGRectMake(0, 2*LeftMargin+_tableView.frame.size.height, ScreenSize.width, ScreenSize.height-_tableView.height-ScreenSize.height/5 - 50)];
     mingXiTableView.backgroundColor = [UIColor whiteColor];
     mingXiTableView.tag=1002;
     mingXiTableView.delegate=self;
@@ -412,12 +412,12 @@ typedef enum : NSUInteger {
     NoticeProduct *noticeProduct=[_shopeArr objectAtIndex:indexPath.row];
     Cell.SpLabel.text=noticeProduct.productName;//商品
     
-    Cell.BzggLabel.text= [NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,@"斤"];//包装规格
+    Cell.BzggLabel.text= [NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,noticeProduct.baseUnit];//包装规格
     Cell.packageUnit.text=noticeProduct.packUnit;//包装单位
     Cell.BzslLabel.text=[NSString stringWithFormat:@"%@%@",noticeProduct.qpcQuantity,noticeProduct.packUnit];//包装数量
     Cell.packageQuantity.text=[NSString stringWithFormat:@"%@%@",noticeProduct.qpcQuantity,noticeProduct.packUnit];
-    Cell.packageSpecification.text=[NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,@"斤"];//包装规格
-    Cell.foundationQuantity.text= [NSString stringWithFormat:@"%@%@",noticeProduct.quantity,@"斤"];//基础数量
+    Cell.packageSpecification.text=[NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,noticeProduct.baseUnit];//包装规格
+    Cell.foundationQuantity.text= [NSString stringWithFormat:@"%@%@",noticeProduct.quantity,noticeProduct.baseUnit];//基础数量
     Cell.remark.text=noticeProduct.remark;//备注
     
 }

XFFruit/ViewControllers/PurchaseNotice/Controllers/SeePurchaseNoticeViewController.m

@@ -493,25 +493,25 @@ typedef enum : NSUInteger {
     NoticeProduct *noticeProduct=[_shopeArr objectAtIndex:indexPath.row];
     Cell.SpLabel.text=noticeProduct.productName;//商品
    
-    Cell.BzggLabel.text= [NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,@"斤"];//包装规格
+    Cell.BzggLabel.text= [NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,noticeProduct.baseUnit];//包装规格
     Cell.packageUnit.text=noticeProduct.packUnit;//包装单位
     Cell.BzslLabel.text=[NSString stringWithFormat:@"%@%@",noticeProduct.qpcQuantity,noticeProduct.packUnit];//包装数量
     Cell.packageQuantity.text=[NSString stringWithFormat:@"%@%@",noticeProduct.qpcQuantity,noticeProduct.packUnit];
-    Cell.packageSpecification.text=[NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,@"斤"];//包装规格
-    Cell.foundationQuantity.text= [NSString stringWithFormat:@"%@%@",noticeProduct.quantity,@"斤"];//基础数量
+    Cell.packageSpecification.text=[NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,noticeProduct.baseUnit];//包装规格
+    Cell.foundationQuantity.text= [NSString stringWithFormat:@"%@%@",noticeProduct.quantity,noticeProduct.baseUnit];//基础数量
 
     
-    Cell.BzggLabel.text=[NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,@"斤"];//包装规格
+    Cell.BzggLabel.text=[NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,noticeProduct.baseUnit];//包装规格
     Cell.BzslLabel.text=[NSString stringWithFormat:@"%@%@",noticeProduct.qpcQuantity,noticeProduct.packUnit];//包装数量
-    Cell.packageSpecification.text=[NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,@"斤"];//包装规格
+    Cell.packageSpecification.text=[NSString stringWithFormat:@"1*%@%@",noticeProduct.qpc,noticeProduct.baseUnit];//包装规格
      Cell.YcgslLabel.text=[noticeProduct.purchasedQuantity stringValue];//已采购数量
     Cell.packageUnit.text=noticeProduct.packUnit;//包装单位
     Cell.packageQuantity.text=[NSString stringWithFormat:@"%@%@",noticeProduct.qpcQuantity,noticeProduct.packUnit];//包装数量
     Cell.YcgslLabel.text=[noticeProduct.purchasedQuantity stringValue];//已采购数量
-    Cell.foundationQuantity.text=[NSString stringWithFormat:@"%@%@",noticeProduct.quantity,@"斤"];//基础数量
+    Cell.foundationQuantity.text=[NSString stringWithFormat:@"%@%@",noticeProduct.quantity,noticeProduct.baseUnit];//基础数量
     Cell.remark.text=noticeProduct.remark;//备注
     if (Cell.YcgslLabel.text==nil) {
-        Cell.YcgslLabel.text=@"暂无";//已采购数量
+        Cell.YcgslLabel.text=@"0";//已采购数量
     }
 }
 //编辑

XFFruit/ViewControllers/PurchaseNotice/Models/NoticeProduct.h

@@ -17,6 +17,7 @@
 @property (nonatomic,strong)NSString *packUnit;//包装单位
 @property (nonatomic,strong)NSNumber *qpcQuantity;//包装数量
 @property (nonatomic,strong)NSNumber *quantity;//基础数量
+@property (nonatomic,strong)NSString *baseUnit;//规格单位
 @property (nonatomic,strong)NSNumber *purchasedQuantity;//已采购数量
 @property (nonatomic,strong)NSString *remark;//备注
 

XFFruit/ViewControllers/PurchaseNotice/Views/NoticeProductViewController.m

@@ -151,6 +151,7 @@ typedef enum : NSUInteger {
     self.noticeProduct.productName = self.productNameStr;
     self.noticeProduct.productUuid = self.productUuidStr;
     
+    self.noticeProduct.baseUnit = _qpcLabel.text;//规格单位
     self.noticeProduct.packUnit = _choosePackUnitLabel.text;
     self.noticeProduct.qpc = [NSNumber numberWithFloat:[_qpcField.text floatValue]];
     self.noticeProduct.qpcQuantity = [NSNumber numberWithFloat:[_qpcQuantityField.text floatValue]];
@@ -270,7 +271,7 @@ typedef enum : NSUInteger {
             self.productNameStr = product.name;
             self.productUuidStr = product.uuid;
             self.productCodeStr = product.code;
-            _qpcLabel.text = product.measureUnit ? product.measureUnit : @"斤";
+            _qpcLabel.text = product.measureUnit;
             _baseCountLabel.text = _qpcLabel.text;
         };
         cvc.isMoreChose = NO;

XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m

@@ -331,11 +331,14 @@ typedef enum : NSUInteger {
     billProduct.qpc = [NSNumber numberWithFloat:[shopDetail.packageSpecification floatValue]];
     billProduct.unit = shopDetail.packageUnit;
     billProduct.qty = [NSNumber numberWithFloat:[shopDetail.packageQuantity floatValue]];
-    billProduct.price = [NSNumber numberWithFloat:[shopDetail.packageUnitPrice floatValue]];
+    billProduct.packprice = [NSNumber numberWithFloat:[shopDetail.packageUnitPrice floatValue]];
+    billProduct.price = [NSNumber numberWithFloat:[shopDetail.foundationUnitPrice floatValue]];
     billProduct.baseQty = [NSNumber numberWithFloat:[shopDetail.foundationQuantity floatValue]];
     billProduct.total = [NSNumber numberWithFloat:[shopDetail.totalMoney floatValue]];
     billProduct.note = shopDetail.remark;
     billProduct.qpcStr = shopDetail.packageQpcStr ? shopDetail.packageQpcStr : @"无" ;
+    billProduct.baseUnit = shopDetail.packageQpcUnit;
+    
     return billProduct;
 }
 - (ShopDetail *)coverShopDetail:(TransportPdtDetail *)billProduct{
@@ -347,10 +350,9 @@ typedef enum : NSUInteger {
     shopDetail.packageSpecification  =  [billProduct.qpc stringValue];
     shopDetail.packageUnit = billProduct.unit;
     shopDetail.packageQuantity = [billProduct.qty stringValue];
-    shopDetail.packageUnitPrice  = [billProduct.price stringValue];
-#warning 少一个包装单价
-    shopDetail.foundationQuantity= [billProduct.price stringValue];
-    shopDetail.foundationUnitPrice= [billProduct.baseQty  stringValue];
+    shopDetail.packageUnitPrice  = [billProduct.packprice stringValue];
+    shopDetail.foundationUnitPrice= [billProduct.price stringValue];
+    shopDetail.foundationQuantity= [billProduct.baseQty  stringValue];
     shopDetail.totalMoney= [billProduct.total stringValue];
     shopDetail.remark  = billProduct.note;
     return shopDetail;

XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m

@@ -128,6 +128,7 @@
         detail.productCode = arrDict[@"product_code"];
         detail.productName = arrDict[@"product_name"];
         detail.price = arrDict[@"basePrice"];
+        detail.packprice = arrDict[@"price"];
         detail.note = arrDict[@"remark"];
         [transArr addObject:detail];
     }

XFFruit/ViewControllers/Transport/Models/TransportPdtDetail.h

@@ -20,6 +20,8 @@
 @property (nonatomic,strong)NSString *unit;//包装单位
 @property (nonatomic,strong)NSNumber *qty;//发运的包装数量
 @property (nonatomic,strong)NSNumber *price;//基础单价
+@property (nonatomic,strong)NSNumber *packprice;// 包装单价
+@property (nonatomic,strong)NSString *baseUnit;//规格单位
 @property (nonatomic,strong)NSNumber *baseQty;//发运的基础数量
 @property (nonatomic,strong)NSNumber *total;//发运合计金额
 @property (nonatomic,strong)NSString *note;//备注

XFFruit/ViewControllers/Transport/Views/TransportPurductCell.m

@@ -145,10 +145,10 @@
     self.titleLabel.text = pdtDetail.productName;
     self.priceLabel.text =  [NSString stringWithFormat:@"%@元",[pdtDetail.price stringValue]];
     self.countLabel.text = [NSString stringWithFormat:@"%@%@",pdtDetail.qty,pdtDetail.unit];
-    self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@",pdtDetail.qpc];
+    self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",pdtDetail.qpc,pdtDetail.baseUnit];
     self.showCountLabel.text = [NSString stringWithFormat:@"包装数量：%@%@",pdtDetail.qty,pdtDetail.unit];
-    self.showBaseCountLabel.text =[NSString stringWithFormat:@"基础数量：%@%@",pdtDetail.baseQty,@"斤"];
-    self.showPriceLabel.text = [NSString stringWithFormat:@"包装单价：%@元",pdtDetail.price];
+    self.showBaseCountLabel.text =[NSString stringWithFormat:@"基础数量：%@%@",pdtDetail.baseQty,pdtDetail.baseUnit];
+    self.showPriceLabel.text = [NSString stringWithFormat:@"包装单价：%@元",pdtDetail.packprice];
     self.showPurchaseLabel.text = [NSString stringWithFormat:@"采购单号：%@",pdtDetail.purchasebillnumber.length > 0 ? pdtDetail.purchasebillnumber: @"无"];
     self.showTotalLabel.text = [NSString stringWithFormat:@"总金额：%@元",pdtDetail.total];