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

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

Browse Source
This commit is contained in:
张秉卓
2026-01-19 10:57:13 +08:00
parent e4803f8ec5 4b63caba3a
commit 221679927d
4 changed files with 165 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,9 @@ import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
/**
* @title: 表单出参
* @Author test01
@ -39,8 +42,9 @@ public class LngPngDemandPurVo extends com.xjrsoft.common.model.base.BaseModel{
* 供应商
*/
@ApiModelProperty("供应商")
@Trans(type = TransType.SUPPLIER, transToFieldName = "suName")
private String suCode;
private String suName;
/**
* 采购合同-主信息主键
@ -60,8 +64,9 @@ public class LngPngDemandPurVo extends com.xjrsoft.common.model.base.BaseModel{
* 上载点
*/
@ApiModelProperty("上载点")
@Trans(type = TransType.LNG_STATION, transToFieldName = "pointUpName")
private String pointUpCode;
private String pointUpName;
/**
* 自主托运(Y-是，N-否)

9
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;
import lombok.Getter;
@ -66,15 +69,17 @@ public class LngPngDemandVo extends com.xjrsoft.common.model.base.BaseModel{
* 客户编码
*/
@ApiModelProperty("客户编码")
@Trans(type = TransType.CUSTOMER, transToFieldName = "cuName")
private String cuCode;
private String cuName;
/**
* 交易主体编码(天然气公司/惠贸；只读从合同带)
*/
@ApiModelProperty("交易主体编码(天然气公司/惠贸；只读从合同带)")
@Trans(type = TransType.DEPT, transToFieldName = "comName")
private Long comId;
private String comName;
/**
* 合同-主信息主键（销售）(lng_contract)