diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java
index 0c6ff7f0b..66298b9cf 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java
@@ -13,6 +13,8 @@ package com.xdadan.erp.emis.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.emis.domain.EmisTmsCostFeeSplit;
+import org.apache.ibatis.annotations.Param;
+
/**
* @ClassName EmisTmsCostFeeSplitMapper
* @Description
成本费用分摊明细 Mapper 接口
@@ -80,6 +82,8 @@ public interface EmisTmsCostFeeSplitMapper extends BaseMapper listBillCodeRel=emisTmsCostFeeMapper.selectCostFeeRelListByBillCode(billCode);
if(!CollectionUtil.isEmpty(listBillCodeRel)){
@@ -565,7 +570,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
if(StringUtils.isEmpty(calcBillCode)) {
emisTmsCostFeeSplitMapper.deleteEmisTmsCostFeeSplitByCostNo(costNo);
}else{
- emisTmsCostFeeSplitMapper.deleteEmisTmsCostFeeSplitByBillCode(calcBillCode);
+ emisTmsCostFeeSplitMapper.deleteByCostNoAndBillCode(costNo,calcBillCode);
}
Integer pieceNumber = 0;
@@ -659,9 +664,11 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
costFee = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString());
log.info("按票分摊:计算公式:" + calcExprStr + ",票数:1");
}
- splitItem.setCostFee(BigDecimal.valueOf(costFee));
+ BigDecimal splitCostFee = BigDecimal.valueOf(costFee).setScale(2,BigDecimal.ROUND_HALF_UP);
+
+ splitItem.setCostFee(splitCostFee);
splitItem.setCalcExpr(itemCalcExpr);
- splitItem.setCalcRemark(calcExprStr+"="+String.valueOf(costFee));
+ splitItem.setCalcRemark(calcExprStr+"="+String.valueOf(splitCostFee));
splitItem.setRemark("批次成本分摊费用");
// 插入分摊明细数据
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
index d06908c41..c32dd8bb7 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
@@ -260,6 +260,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update emis_tms_cost_fee_split set del_flag='1' where del_flag='0' and cost_no = #{costNo}
+
+ update emis_tms_cost_fee_split set del_flag='1'
+ where del_flag='0'
+ and cost_no = #{costNo}
+ and bill_code = #{billCode}
+
+
update emis_tms_cost_fee_split set del_flag='1' where id = #{id}