From 4388209f50345ca3a7e8711c53f00f8c81f050c3 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 30 Jun 2025 23:10:44 +0800 Subject: [PATCH] md --- .../service/impl/EmisTmsCostFeeServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java index 0bc2f0dc6..78302b1c2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java @@ -285,6 +285,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService // 总成本费用=本次取件费 splitItem.setTransCostFee(splitCostFee); + splitItem.setCnyFee(splitCostFee); // 插入分摊明细数据 emisTmsCostFeeSplitMapper.insertEmisTmsCostFeeSplit(splitItem); @@ -319,7 +320,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService // 供应商 splitItem.setSupplierCode("10214"); // 供应商 - splitItem.setTransSignNo(waybill.getTakePieceEmployeeCode()); // 运输号 + splitItem.setTransSignNo(waybill.getDispatchManName()); // 运输号 // 目的网点到客户现场 splitItem.setSendPlace(waybill.getDispatchUnderlingSiteName()); @@ -354,6 +355,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService // 总成本费用=本次取件费 splitItem.setTransCostFee(splitCostFee); + splitItem.setCnyFee(splitCostFee); // 插入分摊明细数据 emisTmsCostFeeSplitMapper.insertEmisTmsCostFeeSplit(splitItem); @@ -420,6 +422,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService // 总成本费用 splitItem.setTransCostFee(totalDbCostFee); + splitItem.setCnyFee(totalDbCostFee); // 插入分摊明细数据 emisTmsCostFeeSplitMapper.insertEmisTmsCostFeeSplit(splitItem); @@ -645,10 +648,15 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService splitItem.setSplitType(oldCostFee.getSplitType()); // 按重量分摊 splitItem.setFeeItemId(feeItem.getId()); // 无成本费用项来源 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(); - splitItem.setTransCostFee(totalDbCostFee); + String itemCalcExpr=""; String calcExprStr="";