修改
This commit is contained in:
@ -102,4 +102,16 @@ public class LngPngApproPageDto extends PageInput {
|
||||
@ApiModelProperty("审批状态(XS-待销售确认/JSZ-待接收站/GD-待管道确认/YSP-已确认)")
|
||||
private String approCode;
|
||||
|
||||
/**
|
||||
* 拟稿日期开始时间
|
||||
*/
|
||||
@ApiModelProperty("计划开始时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime datePlanStart;
|
||||
/**
|
||||
* 拟稿日期结束时间
|
||||
*/
|
||||
@ApiModelProperty("计划结束时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime datePlanEnd;
|
||||
}
|
||||
|
||||
@ -2,16 +2,9 @@ package com.xjrsoft.module.dayPlan.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.xjrsoft.module.dayPlan.dto.AddLngPngMeasureSalesPurDto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
@ -69,6 +62,12 @@ public class LngPngApproPurVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("供应商")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 供应商
|
||||
*/
|
||||
@ApiModelProperty("供应商")
|
||||
private String suName;
|
||||
|
||||
|
||||
/**
|
||||
@ -76,6 +75,12 @@ public class LngPngApproPurVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("采购合同-主信息主键")
|
||||
private Long kpId;
|
||||
|
||||
/**
|
||||
* 采购合同名称
|
||||
*/
|
||||
@ApiModelProperty("采购合同名称")
|
||||
private Long kpName;
|
||||
|
||||
|
||||
/**
|
||||
@ -90,6 +95,12 @@ public class LngPngApproPurVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("上载点")
|
||||
private String pointUpCode;
|
||||
|
||||
/**
|
||||
* 上载点
|
||||
*/
|
||||
@ApiModelProperty("上载点")
|
||||
private String pointUpName;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@ -2,17 +2,11 @@ package com.xjrsoft.module.dayPlan.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import com.xjrsoft.module.dayPlan.dto.AddLngPngMeasureSalesPurDto;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author test01
|
||||
@ -62,6 +56,12 @@ public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("变更标识(I/U/D对原始计划的增改删)")
|
||||
private String alterSign;
|
||||
|
||||
/**
|
||||
* 变更标识(I/U/D对原始计划的增改删)
|
||||
*/
|
||||
@ApiModelProperty("变更标识(I/U/D对原始计划的增改删)")
|
||||
private String alterName;
|
||||
|
||||
|
||||
/**
|
||||
@ -76,6 +76,18 @@ public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("客户编码")
|
||||
private String cuCode;
|
||||
|
||||
/**
|
||||
* 客户简称
|
||||
*/
|
||||
@ApiModelProperty("客户简称")
|
||||
private String cuSname;
|
||||
|
||||
/**
|
||||
* 客户名称
|
||||
*/
|
||||
@ApiModelProperty("客户名称")
|
||||
private String cuName;
|
||||
|
||||
|
||||
/**
|
||||
@ -83,6 +95,12 @@ public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("交易主体编码(天然气公司/惠贸)")
|
||||
private Long comId;
|
||||
|
||||
/**
|
||||
* 交易主体名称(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("交易主体名称(天然气公司/惠贸)")
|
||||
private Long comName;
|
||||
|
||||
|
||||
/**
|
||||
@ -104,6 +122,12 @@ public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("交割点")
|
||||
private String pointDelyCode;
|
||||
|
||||
/**
|
||||
* 交割点名称
|
||||
*/
|
||||
@ApiModelProperty("交割点名称")
|
||||
private String pointDelyName;
|
||||
|
||||
|
||||
/**
|
||||
@ -279,6 +303,12 @@ public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
*/
|
||||
@ApiModelProperty("审批状态(XS-待销售确认/JSZ-待接收站/GD-待管道确认/YSP-已确认)")
|
||||
private String approCode;
|
||||
|
||||
/**
|
||||
* 审批状态(XS-待销售确认/JSZ-待接收站/GD-待管道确认/YSP-已确认)
|
||||
*/
|
||||
@ApiModelProperty("审批状态(XS-待销售确认/JSZ-待接收站/GD-待管道确认/YSP-已确认)")
|
||||
private String approName;
|
||||
|
||||
|
||||
/**
|
||||
@ -352,4 +382,16 @@ public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{
|
||||
@ApiModelProperty("lngPngApproPur子表")
|
||||
private List<LngPngApproPurVo> lngPngApproPurList;
|
||||
|
||||
|
||||
/**
|
||||
* 标记
|
||||
*/
|
||||
@ApiModelProperty("标记")
|
||||
private String daysSign;
|
||||
|
||||
/**
|
||||
* 合同
|
||||
*/
|
||||
@ApiModelProperty("合同")
|
||||
private String kName;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user