aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-03-16 18:43:52 +08:00
parent bf91ab29ab
commit a42263827c
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -1328,18 +1328,28 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
String calcExprStr=""; String calcExprStr="";
for (EmisCommissionExpression exprItem : exprList) { for (EmisCommissionExpression exprItem : exprList) {
log.info("计算项目表达式:" + JSONObject.toJSONString(exprItem));
String calcExp = exprItem.getCalculateExpression();
double profitMoney = 0.0D; double profitMoney = 0.0D;
// 按柜内票数
if ("5".equals(quoteItem.getCalcType())) { if (exprItem.getStartWeight().doubleValue() < siteBatch.getTotalWaybillQty().doubleValue()
calcExprStr = calcExp.replaceAll("w", siteBatch.getTotalWaybillQty().toString()) && exprItem.getEndWeight().doubleValue() >= siteBatch.getTotalWaybillQty().doubleValue()
.replaceAll("s", exprItem.getInitialWeight().toString()) ) {
.replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("计算项目表达式:" + JSONObject.toJSONString(exprItem));
log.info("按柜内票数:计算公式:" + calcExprStr + ",按柜内票数:"+siteBatch.getTotalWaybillQty()); String calcExp = exprItem.getCalculateExpression();
profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString());
// 按柜内票数
if ("5".equals(quoteItem.getCalcType())) {
calcExprStr = calcExp.replaceAll("w", siteBatch.getTotalWaybillQty().toString())
.replaceAll("s", exprItem.getInitialWeight().toString())
.replaceAll("d", exprItem.getAdditionalWeight().toString());
log.info("按柜内票数:计算公式:" + calcExprStr + ",按柜内票数:"+siteBatch.getTotalWaybillQty());
profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString());
}
}else{
continue;
} }
// 插入参与分成人员 // 插入参与分成人员
String empName=quoteItem.getEmpName(); String empName=quoteItem.getEmpName();