From 1755f8f1d068da646e4ddcef3f507548ce4d8526 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 7 Mar 2025 10:37:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/as/firstshelves/AppFirstShelvesService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java index d27e82fc1c..a47c9567c7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java +++ b/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 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()); } } }