diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeSplit.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeSplit.java index 0195a46ee..4562abc7c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeSplit.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeSplit.java @@ -54,4 +54,9 @@ public class EmisTmsCostFeeSplit extends BaseEntity /* 计算备注 */ private String calcRemark; + + // 扩展字段: 费用信息 + private EmisTmsCostFeeFeeitem feeItem; + private EmisTmsCostFee costFeeDetail; + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostProfit.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostProfit.java index 0deca76c7..842d7e694 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostProfit.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostProfit.java @@ -21,6 +21,8 @@ import com.xdadan.erp.common.core.domain.TreeEntity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import lombok.Data; @@ -51,4 +53,9 @@ public class EmisTmsCostProfit extends BaseEntity // 扩展参数 private EmisWaybill waybillDetail; + + // 成本费用列表 + private List costFeeSplitList; + + } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml index 70a721884..c54979ff5 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml @@ -15,8 +15,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + select id, cost_no, fee_item_id, bill_code, fee_type, split_type, cost_fee, total_volume, bill_weight, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee_split