God 10 months ago
parent
commit
a3f8e1647a
  1. 1
      src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java
  2. 3
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java

1
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java

@ -353,6 +353,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
for (PurchaseBillDetailDetailsVo purchaseBillDetailDetailsVo : purchaseBillDetailDetailsVos) { for (PurchaseBillDetailDetailsVo purchaseBillDetailDetailsVo : purchaseBillDetailDetailsVos) {
purchaseBillDetailDetailsVo.setCost1(purchaseBillDetailDetailsVo.getCost()); purchaseBillDetailDetailsVo.setCost1(purchaseBillDetailDetailsVo.getCost());
purchaseBillDetailDetailsVo.setCount1(purchaseBillDetailDetailsVo.getCount()); purchaseBillDetailDetailsVo.setCount1(purchaseBillDetailDetailsVo.getCount());
purchaseBillDetailDetailsVo.setDiscountRate1(purchaseBillDetailDetailsVo.getDiscountRate());
for (PurchaseBillBatchDetailsVo purchaseBillBatchDetailsVo : purchaseBillBatchDetailsVos) { for (PurchaseBillBatchDetailsVo purchaseBillBatchDetailsVo : purchaseBillBatchDetailsVos) {
purchaseBillDetailDetailsVo.setBatchNumber(purchaseBillBatchDetailsVo.getBatchNumber()); purchaseBillDetailDetailsVo.setBatchNumber(purchaseBillBatchDetailsVo.getBatchNumber());
purchaseBillDetailDetailsVo.setExpireDate(purchaseBillBatchDetailsVo.getExpireDate()); purchaseBillDetailDetailsVo.setExpireDate(purchaseBillBatchDetailsVo.getExpireDate());

3
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java

@ -77,7 +77,8 @@ public class PurchaseBillDetailDetailsVo implements Vo {
@ApiModelProperty("吊牌价") @ApiModelProperty("吊牌价")
private BigDecimal tagPrice; private BigDecimal tagPrice;
@ApiModelProperty("折扣率") @ApiModelProperty("折扣率")
private BigDecimal discountRate; // 折扣率 private BigDecimal discountRate;
private BigDecimal discountRate1;
@ApiModelProperty("折后单价") @ApiModelProperty("折后单价")
private BigDecimal discountPrice; // 折后单价 private BigDecimal discountPrice; // 折后单价
@ApiModelProperty("分摊金额") @ApiModelProperty("分摊金额")

Loading…
Cancel
Save