geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

国内png采购 lng销售合同增加字段

Browse Source
This commit is contained in:
shunyi.kuang
2026-03-31 18:01:24 +08:00
parent 8a8250755a
commit c5bce060a8
23 changed files with 73 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurDto.java
View File

@ -12,6 +12,8 @@ import com.pictc.annotations.datalog.LogJoin;
import com.pictc.annotations.datalog.LogJoinColumn;
import com.pictc.annotations.datalog.LogTable;
import com.pictc.annotations.datalog.ValueDirectionType;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.common.model.base.BaseModel;
import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
@ -178,6 +180,8 @@ public class UpdateLngContractPurDto extends BaseModel implements Serializable {
@LogField(name="备注",index=20)
@ApiModelProperty("备注")
private String note;
/**
* lngContractPurPng

10
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPurPngDto.java
View File

@ -45,7 +45,7 @@ public class UpdateLngContractPurPngDto extends BaseModel implements Serializabl
*
*/
@LogField(name="",index=1)
@ApiModelProperty("")
@ApiModelProperty("合同主键")
private Long kId;
/**
@ -66,13 +66,17 @@ public class UpdateLngContractPurPngDto extends BaseModel implements Serializabl
*
*/
@LogField(name="",index=4)
@ApiModelProperty("")
@ApiModelProperty("计量单位")
private String uomCode;
/**
*
*/
@LogField(name="",index=5)
@ApiModelProperty("")
@ApiModelProperty("备注")
private String note;
@LogField(name="长协/现货/年度合同",index=20)
@ApiModelProperty("长协/现货/年度合同")
private String longSpotCode;
}

3
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java
View File

@ -184,6 +184,9 @@ public class UpdateLngContractSalesDto extends BaseModel implements Serializable
@LogField(name="备注",index=20)
@ApiModelProperty("备注")
private String note;
/**
* lngContractSalesLng

4
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDto.java
View File

@ -71,4 +71,8 @@ public class UpdateLngContractSalesLngDto extends BaseModel implements Serializa
@LogField(name="备注",index=6)
@ApiModelProperty("备注")
private String note;
@LogField(name="长协/现货/年度合同",index=21)
@ApiModelProperty("长协/现货/年度合同")
private String longSpotCode;
}

9
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPngVo.java
View File

@ -2,6 +2,9 @@ package com.xjrsoft.module.contract.vo;
import java.time.LocalDateTime;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -104,6 +107,12 @@ public class LngContractPurPngVo extends com.xjrsoft.common.model.base.BaseModel
@ApiModelProperty("数据权限id")
private Long ruleUserId;
@ApiModelProperty("长协/现货/年度合同")
@Trans(type = TransType.DIC, id = "2028679301643411457",transToFieldName = "longSpotName")
private String longSpotCode;
private String longSpotName;

1
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java
View File

@ -167,6 +167,7 @@ public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
private String approCode;
/**
* 备注

7
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngVo.java
View File

@ -123,7 +123,12 @@ public class LngContractSalesLngVo extends com.xjrsoft.common.model.base.BaseMod
private Long ruleUserId;
@ApiModelProperty("长协/现货/年度合同")
@Trans(type = TransType.DIC, id = "2028679301643411457",transToFieldName = "longSpotName")
private String longSpotCode;
private String longSpotName;
}

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java
View File

@ -172,7 +172,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
*/
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
private String approCode;
/**
* 备注

5
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java
View File

@ -4,6 +4,9 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -215,7 +218,7 @@ public class LngPngDemandVo extends com.xjrsoft.common.model.base.BaseModel{
* 审批状态(待提交/审批中/已审批/已驳回)
*/
@ApiModelProperty("审批状态(待提交/审批中/已审批/已驳回)")
//@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
private String approCode;
private String approName;

10
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationLngPageVo.java
View File

@ -1,14 +1,10 @@
package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @title: 分页列表出参

48
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001PageVo.java
View File

@ -1,48 +0,0 @@
package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页列表出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow001PageVo {
/**
*
*/
@ApiModelProperty("")
private String id;
/**
* 客户
*/
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

100
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001Vo.java
View File

@ -1,100 +0,0 @@
package com.xjrsoft.module.mdm.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
* @title: 表单出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow001Vo {
/**
*
*/
@ApiModelProperty("")
private Long id;
/**
* 客户
*/
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
*
*/
@ApiModelProperty("")
private Long createUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime createDate;
/**
*
*/
@ApiModelProperty("")
private Long modifyUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime modifyDate;
/**
*
*/
@ApiModelProperty("")
private Integer enabledMark;
/**
*
*/
@ApiModelProperty("")
private Long tenantId;
}

43
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003PageVo.java
View File

@ -1,43 +0,0 @@
package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页列表出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow003PageVo {
/**
*
*/
@ApiModelProperty("")
private String id;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

93
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003Vo.java
View File

@ -1,93 +0,0 @@
package com.xjrsoft.module.mdm.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
* @title: 表单出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow003Vo {
/**
*
*/
@ApiModelProperty("")
private Long id;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
*
*/
@ApiModelProperty("")
private Long createUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime createDate;
/**
*
*/
@ApiModelProperty("")
private Long modifyUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime modifyDate;
/**
*
*/
@ApiModelProperty("")
private Integer enabledMark;
/**
*
*/
@ApiModelProperty("")
private Long tenantId;
}