diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java index d658b3a04..8c7f16214 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java @@ -53,6 +53,9 @@ public class EmisTmsTransPlan extends BaseEntity private String transLineTypeName; private String productTypeName; + // 累计时效 + private BigDecimal totalEstCostDay; + private EmisTransLine transLine; private List stepList; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlanDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlanDtl.java index 4913a22c3..25319a8fc 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlanDtl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlanDtl.java @@ -33,6 +33,7 @@ public class EmisTmsTransPlanDtl extends BaseEntity { private static final long serialVersionUID = 1L; + /* id */ private Long id; /* 计划id */ @@ -44,7 +45,7 @@ public class EmisTmsTransPlanDtl extends BaseEntity /* 运输方式 陆运,空运海运 */ private String transType; /* 预估运输时间 day */ - private String estCostDay; + private BigDecimal estCostDay; /* 顺序号 */ private Integer orderNum; /* 状态 1-启用 0-不启用 */ diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml index a6f4fc0fc..d7f5b0d9d 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml @@ -25,6 +25,8 @@ + + @@ -43,6 +45,10 @@ select a.name from emis_country a where a.code = #{code} + +