From 488aec478a3355594ae8447d558acb1f61978d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Wed, 1 Apr 2026 14:22:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/dto/UpdateLngContractSalesPngDto.java | 4 ++++ .../module/contract/vo/LngContractSalesPngVo.java | 10 ++++++++++ .../module/contract/entity/LngContractSalesPng.java | 7 +++++++ 3 files changed, 21 insertions(+) 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; /**