diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index 0b66f3544..0a2d24b12 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -307,9 +307,13 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 转换成po SalaryAcctRecordPO salaryAcctRecordPO = SalaryAcctRecordBO.convert2PO(saveParam, salarySobCycleDTO, (int) acctTimes, (long) user.getUID()); - //检查 // 检查是否能够新建核算 - SalaryAcctTaxAgentPO build = SalaryAcctTaxAgentPO.builder().incomeCategory(salarySobPO.getIncomeCategory()).taxAgentId(salarySobPO.getTaxAgentId()).taxCycle(salaryAcctRecordPO.getTaxCycle()).build(); + SalaryAcctTaxAgentPO build = SalaryAcctTaxAgentPO.builder() + .incomeCategory(salarySobPO.getIncomeCategory()) + .taxAgentId(salarySobPO.getTaxAgentId()) + .salaryMonth(salaryAcctRecordPO.getSalaryMonth()) + .taxCycle(salaryAcctRecordPO.getTaxCycle()) + .build(); List salaryAcctTaxAgents = new ArrayList<>(); salaryAcctTaxAgents.add(build); checkBeforeSave(salaryAcctRecordPO, salaryAcctTaxAgents); @@ -581,10 +585,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe .findAny() .orElse(null); if (Objects.nonNull(calculatedSalaryAcctTaxAgent)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(160506, "个税扣缴义务人「{0}」已经存在薪资所属月「{1}」的薪资核算记录了,无法新建薪资所属月「{2}」的薪资核算") + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(160506, "个税扣缴义务人「{0}」已经存在税款所属期「{1}」的薪资核算记录了,无法新建税款所属期「{2}」的薪资核算") .replace("{0}", taxAgentMap.get(calculatedSalaryAcctTaxAgent.getTaxAgentId())) - .replace("{1}", SalaryDateUtil.getFormatYYYYMM(calculatedSalaryAcctTaxAgent.getSalaryMonth())) - .replace("{2}", SalaryDateUtil.getFormatYYYYMM(salaryAcctTaxAgent.getSalaryMonth()))); + .replace("{1}", SalaryDateUtil.getFormatYYYYMM(calculatedSalaryAcctTaxAgent.getTaxCycle())) + .replace("{2}", SalaryDateUtil.getFormatYYYYMM(salaryAcctTaxAgent.getTaxCycle()))); } } }