This commit is contained in:
linfso 2025-02-18 17:31:52 +08:00
parent bbeac2d2ce
commit b4beac8c02

View File

@ -103,7 +103,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
@Override
@Transactional
public int insertEmisTmsCostFee(EmisTmsCostFee emisTmsCostFee) throws EmisBizError {
// billRelList
if(CollectionUtils.isEmpty(emisTmsCostFee.getBillRelList())){
throw new EmisBizError(EmisBizErrorType.FAIL,"关联单号不能为空");
}
@ -111,29 +110,22 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
String costNo = WaybillHelper.genCostNo();
emisTmsCostFee.setCostNo(costNo);
// 插入关联单号
for (EmisTmsCostFeeRel costFeeRel:emisTmsCostFee.getBillRelList()) {
EmisTmsCostFeeRel newCostFeeRel = new EmisTmsCostFeeRel();
newCostFeeRel.setCostNo(costNo);
newCostFeeRel.setBillCode(costFeeRel.getBillCode());
emisTmsCostFeeRelMapper.insertEmisTmsCostFeeRel(newCostFeeRel);
for (EmisTmsCostFeeRel costFeeRelItem:emisTmsCostFee.getBillRelList()) {
costFeeRelItem.setId(null);
costFeeRelItem.setCostNo(costNo);
emisTmsCostFeeRelMapper.insertEmisTmsCostFeeRel(costFeeRelItem);
}
emisTmsCostFeeMapper.insertEmisTmsCostFee(emisTmsCostFee);
// 插入关联费用
for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()
) {
EmisTmsCostFeeFeeitem newFeeItem = new EmisTmsCostFeeFeeitem();
newFeeItem.setCostNo(costNo);
newFeeItem.setFeeType(feeItem.getFeeType());
newFeeItem.setPrice(feeItem.getPrice());
newFeeItem.setFee(feeItem.getFee());
newFeeItem.setCurrency(feeItem.getCurrency());
emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(newFeeItem);
for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()) {
feeItem.setId(null);
feeItem.setCostNo(costNo);
emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
}
// 计算分摊费用
// reCalcSplitCostFee(costNo);
// reCalcSplitCostFee(costNo);
return 1;
}
@ -182,7 +174,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 计算分摊成本
for (EmisTmsCostFeeRel billCodeItem: listBillCodeRel) {
// 循环费用类型
for (EmisTmsCostFeeFeeitem feeItem: listFeeItemRel) {
EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
@ -305,13 +296,9 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 插入关联费用
for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()
) {
EmisTmsCostFeeFeeitem newFeeItem = new EmisTmsCostFeeFeeitem();
newFeeItem.setCostNo(costNo);
newFeeItem.setFeeType(feeItem.getFeeType());
newFeeItem.setFee(feeItem.getFee());
newFeeItem.setPrice(feeItem.getPrice());
newFeeItem.setCurrency(feeItem.getCurrency());
emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(newFeeItem);
feeItem.setId(null);
feeItem.setCostNo(costNo);
emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
}
emisTmsCostFeeMapper.updateEmisTmsCostFee(emisTmsCostFee);