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-13 15:32:11 +08:00
parent 77a2dd66d5
commit 1202d0380b
2 changed files with 139 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java
View File

@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.yulichang.annotation.EntityMapping;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -24,6 +26,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@LogTable(source="lng_png_settle_hdr",name="管道气采购结算")
@TableName("lng_png_settle_hdr")
@ApiModel(value = "管道气销售结算对象", description = "管道气销售结算")
public class LngPngSettleHdr implements Serializable {
@ -31,116 +34,132 @@ public class LngPngSettleHdr implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty("主键")
@TableId
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long id;
* 主键
*/
@ApiModelProperty("主键")
@TableId
@LogField(name="主键",index=0)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long id;
/**
* 结算月
*/
@ApiModelProperty("结算月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime settleMonth;
/**
* 结算月
*/
@ApiModelProperty("结算月")
@LogField(name="结算月",index=1)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime settleMonth;
/**
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateFrom;
/**
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
@LogField(name="结算月开始日期",index=2)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateFrom;
/**
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateTo;
/**
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
@LogField(name="结算月结束日期",index=3)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateTo;
/**
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
private String settleTypeCode;
/**
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
@LogField(name="结算类型",index=4)
private String settleTypeCode;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
private String cpCode;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
@LogField(name="供应商/客户",index=5)
private String cpCode;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long comId;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
@LogField(name="交易主体",index=6)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long comId;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleGj;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
@LogField(name="结算总数量",index=7)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleGj;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleM3;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
@LogField(name="结算总数量",index=8)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleM3;
/**
* 结算总金额
*/
@ApiModelProperty("结算总金额")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal amount;
/**
* 结算总金额
*/
@ApiModelProperty("结算总金额")
@LogField(name="结算总金额",index=9)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal amount;
/**
* 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
*/
@ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
private String rpSign;
/**
* 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
*/
@ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
@LogField(name="账期内含预收付款",index=10)
private String rpSign;
/**
* 对账单(不显示，挂对账单附件用)
*/
@ApiModelProperty("对账单(不显示，挂对账单附件用)")
private String billAccount;
/**
* 对账单(不显示，挂对账单附件用)
*/
@ApiModelProperty("对账单(不显示，挂对账单附件用)")
@LogField(name="对账单",index=11)
private String billAccount;
/**
* 审批状态
*/
@ApiModelProperty("审批状态")
private String approCode;
/**
* 审批状态
*/
@ApiModelProperty("审批状态")
@LogField(name="审批状态",index=12)
private String approCode;
/**
* 结算说明
*/
@ApiModelProperty("结算说明")
private String settleDesc;
/**
* 结算说明
*/
@ApiModelProperty("结算说明")
@LogField(name="结算说明",index=13)
private String settleDesc;
/**
* 备注
*/
@ApiModelProperty("备注")
@LogField(name="备注",index=14)
private String note;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
* 创建人id
*/
@ApiModelProperty("创建人id")
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
@TableField(fill = FieldFill.INSERT)
private Long createUserId;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createDate;
/**

23
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java
View File

@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.yulichang.annotation.EntityMapping;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -25,6 +27,7 @@ import lombok.Data;
*/
@Data
@TableName("lng_png_settle_hdr")
@LogTable(source="lng_png_settle_hdr",name="管道气采购结算")
@ApiModel(value = "管道气采购结算对象", description = "管道气采购结算")
public class LngPngSettleHdrPur implements Serializable {
@ -35,6 +38,7 @@ public class LngPngSettleHdrPur implements Serializable {
*/
@ApiModelProperty("主键")
@TableId
@LogField(name="主键",index=0)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long id;
@ -42,6 +46,7 @@ public class LngPngSettleHdrPur implements Serializable {
* 结算月
*/
@ApiModelProperty("结算月")
@LogField(name="结算月",index=1)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime settleMonth;
@ -49,6 +54,7 @@ public class LngPngSettleHdrPur implements Serializable {
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
@LogField(name="结算月开始日期",index=2)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateFrom;
@ -56,6 +62,7 @@ public class LngPngSettleHdrPur implements Serializable {
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
@LogField(name="结算月结束日期",index=3)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateTo;
@ -63,18 +70,21 @@ public class LngPngSettleHdrPur implements Serializable {
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
@LogField(name="结算类型",index=4)
private String settleTypeCode;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
@LogField(name="供应商/客户",index=5)
private String cpCode;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
@LogField(name="交易主体",index=6)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long comId;
@ -82,6 +92,7 @@ public class LngPngSettleHdrPur implements Serializable {
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
@LogField(name="结算总数量",index=7)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleGj;
@ -89,6 +100,7 @@ public class LngPngSettleHdrPur implements Serializable {
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
@LogField(name="结算总数量",index=8)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleM3;
@ -96,6 +108,7 @@ public class LngPngSettleHdrPur implements Serializable {
* 结算总金额
*/
@ApiModelProperty("结算总金额")
@LogField(name="结算总金额",index=9)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal amount;
@ -103,44 +116,49 @@ public class LngPngSettleHdrPur implements Serializable {
* 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
*/
@ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
@LogField(name="账期内含预收付款",index=10)
private String rpSign;
/**
* 对账单(不显示，挂对账单附件用)
*/
@ApiModelProperty("对账单(不显示，挂对账单附件用)")
@LogField(name="对账单",index=11)
private String billAccount;
/**
* 审批状态
*/
@ApiModelProperty("审批状态")
@LogField(name="审批状态",index=12)
private String approCode;
/**
* 结算说明
*/
@ApiModelProperty("结算说明")
@LogField(name="结算说明",index=13)
private String settleDesc;
/**
* 备注
*/
@ApiModelProperty("备注")
@LogField(name="备注",index=14)
private String note;
/**
* 创建人id
*/
@ApiModelProperty("创建人id")
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
@TableField(fill = FieldFill.INSERT)
private Long createUserId;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createDate;
/**
@ -161,6 +179,7 @@ public class LngPngSettleHdrPur implements Serializable {
* 租户id
*/
@ApiModelProperty("租户id")
@LogField(name="租户id",index=15)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long tenantId;