Commit b92b6842 authored by Sandy's avatar Sandy

发运单收获金额计算

parent 4c20cc6d
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.2.40</string> <string>1.2.41</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.2.40</string> <string>1.2.41</string>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>
<dict> <dict>
<key>NSAllowsArbitraryLoads</key> <key>NSAllowsArbitraryLoads</key>
......
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
TransferPdtDetail *billP = arrSection[indexPath.row]; TransferPdtDetail *billP = arrSection[indexPath.row];
[cell setBillProduct:billP row:indexPath.row defaultState:self.defaultState[indexPath.row]]; [cell setBillProduct:billP row:indexPath.row defaultState:self.defaultState[indexPath.row]];
} }
cell.backgroundColor = [UIColor redColor]; // cell.backgroundColor = [UIColor redColor];
return cell; return cell;
} }
- (BOOL)isHaveIndexPath:(NSIndexPath *)indexPath{ - (BOOL)isHaveIndexPath:(NSIndexPath *)indexPath{
......
...@@ -186,7 +186,8 @@ ...@@ -186,7 +186,8 @@
self.showbzPriceLabel.text = [NSString stringWithFormat:@"包装单价:%.2f元",[transferProduct.packprice floatValue]]; self.showbzPriceLabel.text = [NSString stringWithFormat:@"包装单价:%.2f元",[transferProduct.packprice floatValue]];
self.showjcPriceLabel.text = [NSString stringWithFormat:@"基础单价:%.2f元",[transferProduct.price floatValue]]; self.showjcPriceLabel.text = [NSString stringWithFormat:@"基础单价:%.2f元",[transferProduct.price floatValue]];
self.showshTotalLabel.text = [NSString stringWithFormat:@"总金额[实收]:%.2f元",transferProduct.rctTotal?[transferProduct.rctTotal floatValue]:0.00f]; self.showshTotalLabel.text = [NSString stringWithFormat:@"总金额[实收]:%.2f元",
transferProduct.rctQty.doubleValue * transferProduct.packprice.doubleValue];
if (transferProduct.rctTotal == nil) { if (transferProduct.rctTotal == nil) {
self.showshTotalLabel.text = @"总金额[实收]:空"; self.showshTotalLabel.text = @"总金额[实收]:空";
} }
......
...@@ -549,7 +549,7 @@ typedef enum : NSUInteger { ...@@ -549,7 +549,7 @@ typedef enum : NSUInteger {
billProduct.packprice = [NSNumber numberWithFloat:[shopDetail.packageUnitPrice floatValue]]; billProduct.packprice = [NSNumber numberWithFloat:[shopDetail.packageUnitPrice floatValue]];
billProduct.price = [NSNumber numberWithFloat:[shopDetail.foundationUnitPrice floatValue]]; billProduct.price = [NSNumber numberWithFloat:[shopDetail.foundationUnitPrice floatValue]];
billProduct.baseQty = [NSNumber numberWithFloat:[shopDetail.foundationQuantity floatValue]]; billProduct.baseQty = [NSNumber numberWithFloat:[shopDetail.foundationQuantity floatValue]];
billProduct.total = [NSNumber numberWithFloat:[shopDetail.totalMoney floatValue]]; // billProduct.total = [NSNumber numberWithFloat:[shopDetail.totalMoney floatValue]];
billProduct.note = shopDetail.remark; billProduct.note = shopDetail.remark;
billProduct.qpcStr = shopDetail.packageQpcStr ? shopDetail.packageQpcStr : @"无" ; billProduct.qpcStr = shopDetail.packageQpcStr ? shopDetail.packageQpcStr : @"无" ;
billProduct.baseUnit = shopDetail.packageQpcUnit; billProduct.baseUnit = shopDetail.packageQpcUnit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment