diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java index f1a8f195d..0e3c0141d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java @@ -100,7 +100,7 @@ public interface IEmisTmsCostFeeService * @return * @throws EmisBizError */ - public int reCalcCostFeeOnlyOne(String costNo,String billCode,boolean isMerge) throws EmisBizError; + public void reCalcCostFeeOnlyOne(String costNo,String billCode,boolean isMerge) throws EmisBizError; /** * 重算批次费用,包含固定费用 @@ -108,7 +108,7 @@ public interface IEmisTmsCostFeeService * @return * @throws EmisBizError */ - public int reCalcCostFeeAll(String costNo) throws EmisBizError; + public void reCalcCostFeeAll(String costNo) throws EmisBizError; /** @@ -117,7 +117,7 @@ public interface IEmisTmsCostFeeService * @return * @throws EmisBizError */ - public int reCalcCostFeeByBillCode(String billCode) throws EmisBizError; + public void reCalcCostFeeByBillCode(String billCode) throws EmisBizError; /** * 合并成本费用 @@ -125,7 +125,7 @@ public interface IEmisTmsCostFeeService * @return * @throws EmisBizError */ - public int mergeCostFeeByBillCode(String billCode) throws EmisBizError; + public void mergeCostFeeByBillCode(String billCode) throws EmisBizError; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java index 49ea422a5..c8f0a4253 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java @@ -219,7 +219,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT @Async @Override @Transactional - public int reCalcCostFeeByBillCode(String billCode) throws EmisBizError { + public void reCalcCostFeeByBillCode(String billCode) throws EmisBizError { long start = System.currentTimeMillis(); // 获取运单基础数据 @@ -262,7 +262,6 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT long end = System.currentTimeMillis(); log.error("==reCalcCostFeeByBillCode==> escape time:" + (end - start) + "ms"); - return 1; } /** @@ -663,7 +662,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT @Async @Override - public int reCalcCostFeeAll(String costNo) throws EmisBizError { + public void reCalcCostFeeAll(String costNo) throws EmisBizError { long start = System.currentTimeMillis(); @@ -704,7 +703,6 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT long end = System.currentTimeMillis(); log.info("==reCalcCostFeeAll==> escape time:" + (end - start) + "ms"); - return 1; } /** @@ -808,7 +806,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT * @throws EmisBizError */ @Override - public int reCalcCostFeeOnlyOne(String costNo,String calcBillCode,boolean isMerge) throws EmisBizError { + public void reCalcCostFeeOnlyOne(String costNo,String calcBillCode,boolean isMerge) throws EmisBizError { long start = System.currentTimeMillis(); // 获取最新的数据 EmisTmsCostFee oldCostFee = emisTmsCostFeeMapper.selectEmisTmsCostFeeByCostNo(costNo); @@ -1009,7 +1007,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT */ @Override @Transactional - public int mergeCostFeeByBillCode(String billCode) throws EmisBizError { + public void mergeCostFeeByBillCode(String billCode) throws EmisBizError { String mainBillCode=billCode; // 判断是虚拟单还是主单