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 2024-08-26 07:15:24 +08:00
parent 48450ff2db
commit cde2f56f36
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -465,7 +465,7 @@ public class EmisSettleBillController extends BaseController
BigDecimal declareFee = BigDecimal.ZERO; BigDecimal declareFee = BigDecimal.ZERO;
String transFeeStr = "0"; String transFeeStr = "";
String cebFeeStr = ""; String cebFeeStr = "";
String declareFeeStr = ""; String declareFeeStr = "";
String otherFeeStr = ""; String otherFeeStr = "";

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

@ -1348,21 +1348,25 @@ public class EmisBaseService {
public void redoGenerateBillFeeItem(String billCode) throws EmisBizError{ public void redoGenerateBillFeeItem(String billCode) throws EmisBizError{
log.error("===>Start 生成费用明细:"+billCode); log.error("===>Start 生成费用明细:"+billCode);
EmisWaybill dt=emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
// 删除旧明细数据 // 删除旧明细数据
emisSettleSubBillFeeitemMapper.deleteEmisSettleSubBillFeeitemByBillCode(billCode); emisSettleSubBillFeeitemMapper.deleteEmisSettleSubBillFeeitemByBillCode(billCode);
// 产生新的费用明细 // 产生新的费用明细
List<EmisWaybillFeeitem> feeitemList = emisWaybillFeeitemMapper.selectFeeitemListByWaybillId(dt.getId()); if(!dt.getCalcFeeType().equals("3")) {
for(EmisWaybillFeeitem feeitem:feeitemList){ List<EmisWaybillFeeitem> feeitemList = emisWaybillFeeitemMapper.selectFeeitemListByWaybillId(dt.getId());
EmisSettleSubBillFeeitem emisSettleSubBillFeeitem =new EmisSettleSubBillFeeitem(); for (EmisWaybillFeeitem feeitem : feeitemList) {
emisSettleSubBillFeeitem.setSubBillNo(billCode); EmisSettleSubBillFeeitem emisSettleSubBillFeeitem = new EmisSettleSubBillFeeitem();
emisSettleSubBillFeeitem.setBillCode(billCode); emisSettleSubBillFeeitem.setSubBillNo(billCode);
emisSettleSubBillFeeitem.setBillFee(feeitem.getRealFee()); emisSettleSubBillFeeitem.setBillCode(billCode);
emisSettleSubBillFeeitem.setCurrency(feeitem.getCurrency()); emisSettleSubBillFeeitem.setBillFee(feeitem.getRealFee());
emisSettleSubBillFeeitem.setFeeCode(feeitem.getFeeCode()); emisSettleSubBillFeeitem.setCurrency(feeitem.getCurrency());
emisSettleSubBillFeeitem.setFeeName(feeitem.getFeeName()); emisSettleSubBillFeeitem.setFeeCode(feeitem.getFeeCode());
emisSettleSubBillFeeitem.setOrigFee(feeitem.getFee()); emisSettleSubBillFeeitem.setFeeName(feeitem.getFeeName());
emisSettleSubBillFeeitem.setRemark(feeitem.getRemark()); emisSettleSubBillFeeitem.setOrigFee(feeitem.getFee());
emisSettleSubBillFeeitemMapper.insertEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem); emisSettleSubBillFeeitem.setRemark(feeitem.getRemark());
emisSettleSubBillFeeitemMapper.insertEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem);
}
} }
log.error("===>End 生成费用明细"); log.error("===>End 生成费用明细");