From 2effc74c751109be5c7b80036140e551a2f0495d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 17 Nov 2023 14:57:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8FI848=E6=B7=BB=E5=8A=A0=E7=A8=8E?= =?UTF-8?q?=E7=8E=87=E4=BF=AE=E6=AD=A3=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E6=AD=A3sap=E4=BC=A0=E8=BE=93=E7=A8=8E=E7=8E=87=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/common/enums}/KjkmTaxEnmu.java | 2 +- .../service/frJob/RecordToQueryServiceImpl.java | 5 +---- .../frJob/VoucherRecordItemServiceImpl.java | 7 +------ .../dxhy/erp/controller/InterfaceController.java | 2 +- .../service/impl/VoucherRecordServiceImpl.java | 16 +++++++++++++++- 5 files changed, 19 insertions(+), 13 deletions(-) rename {dxhy-core/src/main/java/com/dxhy/core/enmu => dxhy-common/src/main/java/com/dxhy/common/enums}/KjkmTaxEnmu.java (97%) diff --git a/dxhy-core/src/main/java/com/dxhy/core/enmu/KjkmTaxEnmu.java b/dxhy-common/src/main/java/com/dxhy/common/enums/KjkmTaxEnmu.java similarity index 97% rename from dxhy-core/src/main/java/com/dxhy/core/enmu/KjkmTaxEnmu.java rename to dxhy-common/src/main/java/com/dxhy/common/enums/KjkmTaxEnmu.java index 549961a6..368d72ac 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/enmu/KjkmTaxEnmu.java +++ b/dxhy-common/src/main/java/com/dxhy/common/enums/KjkmTaxEnmu.java @@ -1,4 +1,4 @@ -package com.dxhy.core.enmu; +package com.dxhy.common.enums; import com.google.common.collect.Maps; diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java index bd2b663e..8aedf774 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java @@ -2,13 +2,10 @@ package com.dxhy.core.service.frJob; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dxhy.common.constant.DbConstant; -import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.core.dao.frTask.RecordToQueryDao; -import com.dxhy.core.enmu.KjkmTaxEnmu; +import com.dxhy.common.enums.KjkmTaxEnmu; import com.dxhy.core.entity.frJob.FpTaxAmount; import com.dxhy.core.entity.frJob.VoucherRecordQuery; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.SimpleDateFormat; diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java index b2e6e102..19224569 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java @@ -1,17 +1,12 @@ package com.dxhy.core.service.frJob; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dxhy.common.constant.DbConstant; -import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.core.dao.frTask.VoucherRecordItemDao; -import com.dxhy.core.enmu.KjkmTaxEnmu; +import com.dxhy.common.enums.KjkmTaxEnmu; import com.dxhy.core.entity.frJob.VoucherRecordItemEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; import java.util.List; import java.util.Map; diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index d7a954cf..3923d86a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1186,7 +1186,7 @@ public class InterfaceController extends AbstractController { outPut.setES_OUTPUT(esOutPutResp); return JsonUtils.getInstance().toJsonString(outPut); }catch (Exception e){ - e.printStackTrace(); + log.error("FI848报错信息为：{}",e); EsOutPutResp esOutPutResp = new EsOutPutResp(); esOutPutResp.setBSKEY(requestParam.getIS_INPUT().getBSKEY()); esOutPutResp.setSAPKEY(requestParam.getIS_INPUT().getSAPKEY()); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/VoucherRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/VoucherRecordServiceImpl.java index db156e16..5045e3e5 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/VoucherRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/VoucherRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.dxhy.erp.service.impl; +import com.dxhy.common.enums.KjkmTaxEnmu; import com.dxhy.common.service.impl.MpBaseServiceImpl; import com.dxhy.erp.dao.VoucherRecordDao; import com.dxhy.erp.dao.VoucherRecordItemDao; @@ -8,11 +9,13 @@ import com.dxhy.erp.entity.VoucherRecordItem; import com.dxhy.erp.service.VoucherRecordItemService; import com.dxhy.erp.service.VoucherRecordService; import com.dxhy.erp.utils.DistributedKeyMaker; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -101,7 +104,18 @@ public class VoucherRecordServiceImpl extends MpBaseServiceImpl taxMap = KjkmTaxEnmu.getTaxMap(); + for (VoucherRecordItem addItem : addItems) { + if (StringUtils.isNotBlank(taxMap.get(addItem.getRacct()))) { + addItem.setKbetr(taxMap.get(addItem.getRacct())); + } + //将主营业务收入税率的格式统一为整数 + if (StringUtils.isNotBlank(addItem.getRacct()) && addItem.getRacct().startsWith("6001")){ + addItem.setKbetr(StringUtils.isBlank(addItem.getKbetr()) ? addItem.getKbetr() : new BigDecimal(addItem.getKbetr()).stripTrailingZeros().toString()); + } + } + b = voucherRecordItemService.inserBatch(addItems); } return b; }