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

日计划管道气销售结算

Browse Source
This commit is contained in:
shunyi.kuang
2026-02-10 15:54:46 +08:00
parent 4c90f45ab8
commit a50834f302
15 changed files with 155 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java
View File

@ -55,63 +55,63 @@ public class UpdateLngPngSettleSalesDtlDto implements Serializable {
/**
* 主计量单位(从lng_png_settle_sales带)
*/
@LogField(name="主计量单位(从lng_png_settle_sales带)",index=4)
@LogField(name="主计量单位",index=4)
@ApiModelProperty("主计量单位(从lng_png_settle_sales带)")
private String uomCode;
/**
* 阶梯量（吉焦）
*/
@LogField(name="阶梯量（吉焦）",index=5)
@LogField(name="阶梯量",index=5)
@ApiModelProperty("阶梯量（吉焦）")
private BigDecimal rateQtyGj;
/**
* 阶梯量（方）
*/
@LogField(name="阶梯量（方）",index=6)
@LogField(name="阶梯量",index=6)
@ApiModelProperty("阶梯量（方）")
private BigDecimal rateQtyM3;
/**
* 比值(方/吉焦)
*/
@LogField(name="比值(方/吉焦)",index=7)
@LogField(name="比值",index=7)
@ApiModelProperty("比值(方/吉焦)")
private BigDecimal rateM3Gj;
/**
* 结算数量(吉焦)
*/
@LogField(name="结算数量(吉焦)",index=8)
@LogField(name="结算数量",index=8)
@ApiModelProperty("结算数量(吉焦)")
private BigDecimal qtySettleGj;
/**
* 结算数量(方)
*/
@LogField(name="结算数量(方)",index=9)
@LogField(name="结算数量",index=9)
@ApiModelProperty("结算数量(方)")
private BigDecimal qtySettleM3;
/**
* 价格(元/吉焦)
*/
@LogField(name="价格(元/吉焦)",index=10)
@LogField(name="价格",index=10)
@ApiModelProperty("价格(元/吉焦)")
private BigDecimal priceGj;
/**
* 价格(元/方)
*/
@LogField(name="价格(元/方)",index=11)
@ApiModelProperty("价格(元/方)")
@LogField(name="价格",index=11)
@ApiModelProperty("价格")
private BigDecimal priceM3;
/**
* 金额(自动计算)
*/
@LogField(name="金额(自动计算)",index=12)
@LogField(name="金额",index=12)
@ApiModelProperty("金额(自动计算)")
private BigDecimal amount;

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

@ -4,6 +4,9 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
import io.swagger.annotations.ApiModelProperty;
@ -29,6 +32,7 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode
* 结算月
*/
@ApiModelProperty("结算月")
@JsonFormat(pattern = "yyyy-MM")
private LocalDateTime settleMonth;
@ -36,6 +40,7 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
@ -43,6 +48,7 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;
@ -50,22 +56,30 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
@Trans(type = TransType.DIC, id = "2016806282214830081",transToFieldName = "discTypeName")
private String settleTypeCode;
private String settleTypeName;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
@Trans(type = TransType.SUPPLIER, transToFieldName = "cpName")
private String cpCode;
private String cpName;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
@Trans(type = TransType.DEPT, transToFieldName = "comName")
private Long comId;
private String comName;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
@ -108,6 +122,8 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode
@ApiModelProperty("审批状态")
private String approCode;
private String approName;
/**
* 结算说明

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

@ -4,6 +4,9 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
import io.swagger.annotations.ApiModelProperty;
@ -29,6 +32,7 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{
* 结算月
*/
@ApiModelProperty("结算月")
@JsonFormat(pattern = "yyyy-MM")
private LocalDateTime settleMonth;
@ -36,6 +40,7 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
@ -43,6 +48,7 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;
@ -57,15 +63,21 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
@Trans(type = TransType.CUSTOMER, transToFieldName = "cpName")
private String cpCode;
private String cpName;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
@Trans(type = TransType.DEPT, transToFieldName = "comName")
private Long comId;
private String comName;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)

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

@ -4,6 +4,8 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -55,6 +57,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{
* 结算月
*/
@ApiModelProperty("结算月")
@JsonFormat(pattern = "yyyy-MM")
private LocalDateTime settleMonth;
@ -69,6 +72,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{
* 计划日期(从lng_png_sales_pur带)
*/
@ApiModelProperty("计划日期(从lng_png_sales_pur带)")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime datePlan;
@ -76,6 +80,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{
* 计量日期(从lng_png_sales_pur带)
*/
@ApiModelProperty("计量日期(从lng_png_sales_pur带)")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateMea;

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

@ -4,6 +4,10 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -41,6 +45,7 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel
* 结算月(从主表带)
*/
@ApiModelProperty("结算月(从主表带)")
@JsonFormat(pattern = "yyyy-MM")
private LocalDateTime settleMonth;
@ -55,6 +60,7 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel
* 计划日期(从lng_png_sales带)
*/
@ApiModelProperty("计划日期(从lng_png_sales带)")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime datePlan;
@ -62,6 +68,7 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel
* 计量日期(从lng_png_sales带)
*/
@ApiModelProperty("计量日期(从lng_png_sales带)")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateMea;
@ -69,8 +76,9 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel
* 客户(从lng_png_sales带)
*/
@ApiModelProperty("客户(从lng_png_sales带)")
@Trans(type = TransType.CUSTOMER, transToFieldName = "cuName")
private String cuCode;
private String cuName;
/**
* 合同主键(从lng_png_sales带)
@ -90,8 +98,11 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel
* 交割点(从lng_png_sales带)
*/
@ApiModelProperty("交割点(从lng_png_sales带)")
@Trans(type = TransType.LNG_STATION, transToFieldName = "pointDelyName")
private String pointDelyCode;
private String pointDelyName;
/**
* 主计量单位(从lng_png_sales带)