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 2025-02-18 18:35:44 +08:00
parent 952e319b56
commit bc23a82969
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
View File

@ -117,11 +117,16 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
} }
emisTmsCostFeeMapper.insertEmisTmsCostFee(emisTmsCostFee); emisTmsCostFeeMapper.insertEmisTmsCostFee(emisTmsCostFee);
// 插入关联费用 // 插入关联费用,只保存费用大于0的费用
for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()) { for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()) {
feeItem.setId(null); if(
feeItem.setCostNo(costNo); (feeItem.getFee()!=null && feeItem.getFee().compareTo(BigDecimal.ZERO)>0)
emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem); || (feeItem.getPrice()!=null && feeItem.getPrice().compareTo(BigDecimal.ZERO)>0)
) {
feeItem.setId(null);
feeItem.setCostNo(costNo);
emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
}
} }
// 计算分摊费用 // 计算分摊费用
@ -159,7 +164,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
throw new EmisBizError(EmisBizErrorType.FAIL,"费用为空，请检查"); throw new EmisBizError(EmisBizErrorType.FAIL,"费用为空，请检查");
} }
Integer pieceNumber = 0; Integer pieceNumber = 0;
// 计算总重量 // 计算总重量
for (EmisTmsCostFeeRel billCodeRel: listBillCodeRel) { for (EmisTmsCostFeeRel billCodeRel: listBillCodeRel) {
@ -296,9 +300,14 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 插入关联费用 // 插入关联费用
for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList() for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()
) { ) {
feeItem.setId(null); if(
feeItem.setCostNo(costNo); (feeItem.getFee()!=null && feeItem.getFee().compareTo(BigDecimal.ZERO)>0)
emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem); || (feeItem.getPrice()!=null && feeItem.getPrice().compareTo(BigDecimal.ZERO)>0)
) {
feeItem.setId(null);
feeItem.setCostNo(costNo);
emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
}
} }
emisTmsCostFeeMapper.updateEmisTmsCostFee(emisTmsCostFee); emisTmsCostFeeMapper.updateEmisTmsCostFee(emisTmsCostFee);