diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngDto.java index 1324cea..161611b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngDto.java @@ -64,4 +64,8 @@ public class UpdateLngContractSalesPngDto extends BaseModel implements Serializa @LogField(name="备注",index=5) @ApiModelProperty("备注") private String note; + + @LogField(name="长协/现货/年度合同",index=6) + @ApiModelProperty("长协/现货/年度合同") + private String longSpotCode; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngVo.java index 46d680a..ec4239f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngVo.java @@ -1,5 +1,7 @@ package com.xjrsoft.module.contract.vo; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -60,6 +62,14 @@ public class LngContractSalesPngVo { */ @ApiModelProperty("备注") private String note; + + + /** + * 长协/现货/年度合同(长协/现货/年度……) + */ + @Trans(type = TransType.DIC, id = "1980562721538633730",transToFieldName = "longSpotName") + private String longSpotCode; + private String longSpotName; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesPng.java index dfdc8eb..86db883 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesPng.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesPng.java @@ -59,6 +59,13 @@ public class LngContractSalesPng implements Serializable { */ @ApiModelProperty("备注") private String note; + + + /** + * 长协/现货/年度合同(长协/现货/年度……) + */ + @ApiModelProperty("长协/现货/年度合同(长协/现货/年度……)") + private String longSpotCode; /**