Browse Source

更改

master
ligaode 2 months ago
parent
commit
1755f8f1d0
  1. 10
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java

10
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java

@ -235,17 +235,17 @@ public class AppFirstShelvesService {
smsGoodsDto.setSupplierName(wmsInitialDetail.getSupplierName());
smsGoodsDto.setUnit(wmsGoodsTag.getUnit());
smsGoodsDto.setCost(wmsInitialDetail.getInCost().toString());
BigDecimal saleGuidePrice = wmsInitialDetail.getSaleGuidePrice();
BigDecimal inCost = wmsInitialDetail.getInCost();
SmsPricestrategyBillDetailDetailsVo data = smsPricestrategyBillFeign.selByGoodsTypeSid(wmsInitialDetail.getGoodsTypeSid()).getData();
if (data == null) {
smsGoodsDto.setPrice(saleGuidePrice.toString());
smsGoodsDto.setPrice(inCost.toString());
} else {
List<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailDetailsVos = data.getSmsPricestrategyBillGoodstypedetailList();
for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) {
if (saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
if (inCost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && inCost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
saleGuidePrice = saleGuidePrice.add(saleGuidePrice.multiply(markupRate).divide(new BigDecimal("100")));
smsGoodsDto.setPrice(saleGuidePrice.toString());
inCost = inCost.add(inCost.multiply(markupRate).divide(new BigDecimal("100")));
smsGoodsDto.setPrice(inCost.toString());
}
}
}

Loading…
Cancel
Save