Commit dab6eada authored by lemin's avatar lemin

commit

parent 906402aa
...@@ -16,7 +16,9 @@ public class ProductSalesDto { ...@@ -16,7 +16,9 @@ public class ProductSalesDto {
private String productId; private String productId;
private String productName; private String productName;
private String productComment; private String productComment;
private BigDecimal price; private BigDecimal orgPrice;
private BigDecimal ratePrice;
private BigDecimal discountRate;
private String salesChannel; private String salesChannel;
private String whId; private String whId;
private String whName; private String whName;
......
...@@ -66,7 +66,9 @@ public class SalesService { ...@@ -66,7 +66,9 @@ public class SalesService {
dto.setProductId(tempPE.getId()); dto.setProductId(tempPE.getId());
dto.setProductName(tempPE.getName()); dto.setProductName(tempPE.getName());
dto.setProductComment(tempPE.getComment()); dto.setProductComment(tempPE.getComment());
dto.setPrice(tempPE.getPrice().multiply(tempPE.getChannel().getDiscountRate().add(new BigDecimal(1)))); dto.setOrgPrice(tempPE.getPrice());
dto.setDiscountRate(tempPE.getChannel().getDiscountRate());
dto.setRatePrice(tempPE.getPrice().multiply(tempPE.getChannel().getDiscountRate().add(new BigDecimal(1))));
dto.setSalesChannel(tempPE.getChannel().getName()); dto.setSalesChannel(tempPE.getChannel().getName());
dto.setWhId(tempPE.getInventory().getWhid()); dto.setWhId(tempPE.getInventory().getWhid());
dto.setWhName(tempPE.getInventory().getWhName()); dto.setWhName(tempPE.getInventory().getWhName());
......
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