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-06-30 23:10:44 +08:00
parent 91363c361e
commit 4388209f50
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,6 +285,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 总成本费用=本次取件费 // 总成本费用=本次取件费
splitItem.setTransCostFee(splitCostFee); splitItem.setTransCostFee(splitCostFee);
splitItem.setCnyFee(splitCostFee);
// 插入分摊明细数据 // 插入分摊明细数据
emisTmsCostFeeSplitMapper.insertEmisTmsCostFeeSplit(splitItem); emisTmsCostFeeSplitMapper.insertEmisTmsCostFeeSplit(splitItem);
@ -319,7 +320,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 供应商 // 供应商
splitItem.setSupplierCode("10214"); // 供应商 splitItem.setSupplierCode("10214"); // 供应商
splitItem.setTransSignNo(waybill.getTakePieceEmployeeCode()); // 运输号 splitItem.setTransSignNo(waybill.getDispatchManName()); // 运输号
// 目的网点到客户现场 // 目的网点到客户现场
splitItem.setSendPlace(waybill.getDispatchUnderlingSiteName()); splitItem.setSendPlace(waybill.getDispatchUnderlingSiteName());
@ -354,6 +355,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 总成本费用=本次取件费 // 总成本费用=本次取件费
splitItem.setTransCostFee(splitCostFee); splitItem.setTransCostFee(splitCostFee);
splitItem.setCnyFee(splitCostFee);
// 插入分摊明细数据 // 插入分摊明细数据
emisTmsCostFeeSplitMapper.insertEmisTmsCostFeeSplit(splitItem); emisTmsCostFeeSplitMapper.insertEmisTmsCostFeeSplit(splitItem);
@ -420,6 +422,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 总成本费用 // 总成本费用
splitItem.setTransCostFee(totalDbCostFee); splitItem.setTransCostFee(totalDbCostFee);
splitItem.setCnyFee(totalDbCostFee);
// 插入分摊明细数据 // 插入分摊明细数据
emisTmsCostFeeSplitMapper.insertEmisTmsCostFeeSplit(splitItem); emisTmsCostFeeSplitMapper.insertEmisTmsCostFeeSplit(splitItem);
@ -645,10 +648,15 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
splitItem.setSplitType(oldCostFee.getSplitType()); // 按重量分摊 splitItem.setSplitType(oldCostFee.getSplitType()); // 按重量分摊
splitItem.setFeeItemId(feeItem.getId()); // 无成本费用项来源 splitItem.setFeeItemId(feeItem.getId()); // 无成本费用项来源
splitItem.setSplitValue(waybill.getBillWeight()); splitItem.setSplitValue(waybill.getBillWeight());
splitItem.setPrice(feeItem.getPrice());
splitItem.setCurrency(feeItem.getCurrency());
splitItem.setCurrecyToCnyRate(feeItem.getCurrecyToCnyRate());
splitItem.setCnyFee(feeItem.getCnyFee());
splitItem.setTransCostFee(feeItem.getFee());
// 总成本费用 // 总成本费用,使用人民币分摊
BigDecimal totalDbCostFee=feeItem.getCnyFee(); BigDecimal totalDbCostFee=feeItem.getCnyFee();
splitItem.setTransCostFee(totalDbCostFee);
String itemCalcExpr=""; String itemCalcExpr="";
String calcExprStr=""; String calcExprStr="";