From 43939480654b2c00a567052546d355b6ef544323 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Tue, 3 Feb 2026 17:58:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85LNG=E9=94=80=E5=94=AE?= =?UTF-8?q?=EF=BC=8C=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1=E9=81=93=E6=B0=94?= =?UTF-8?q?=E9=94=80=E5=94=AE=E7=BB=93=E7=AE=97=E7=94=9F=E6=88=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/vo/LngContractFactRelVo.java | 15 ++ .../dayPlan/dto/AddLngPngSettleHdrDto.java | 113 +++++++++ .../dto/AddLngPngSettleSalesDtlDto.java | 103 ++++++++ .../dayPlan/dto/AddLngPngSettleSalesDto.java | 148 +++++++++++ .../dayPlan/dto/LngPngSettleHdrPageDto.java | 88 +++++++ .../dayPlan/dto/UpdateLngPngSettleHdrDto.java | 166 ++++++++++++ .../dto/UpdateLngPngSettleSalesDtlDto.java | 142 +++++++++++ .../dto/UpdateLngPngSettleSalesDto.java | 205 +++++++++++++++ .../dayPlan/vo/LngPngSettleHdrPageVo.java | 79 ++++++ .../module/dayPlan/vo/LngPngSettleHdrVo.java | 186 ++++++++++++++ .../dayPlan/vo/LngPngSettleSalesDtlVo.java | 168 +++++++++++++ .../dayPlan/vo/LngPngSettleSalesVo.java | 231 +++++++++++++++++ .../impl/ContractPurPngServiceImpl.java | 5 +- .../impl/ContractSalesLngServiceImpl.java | 5 +- .../controller/PngSettleHdrController.java | 125 +++++++++ .../dayPlan/entity/LngPngSettleHdr.java | 197 +++++++++++++++ .../dayPlan/entity/LngPngSettleSales.java | 238 ++++++++++++++++++ .../dayPlan/entity/LngPngSettleSalesDtl.java | 181 +++++++++++++ .../dayPlan/mapper/LngPngSettleHdrMapper.java | 17 ++ .../mapper/LngPngSettleSalesDtlMapper.java | 17 ++ .../mapper/LngPngSettleSalesMapper.java | 17 ++ .../dayPlan/service/IPngSettleHdrService.java | 17 ++ .../service/impl/PngSettleHdrServiceImpl.java | 35 +++ 23 files changed, 2494 insertions(+), 4 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDtlDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngSettleHdrPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSalesDtl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java index 1681e26..c7dfdff 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java @@ -88,6 +88,7 @@ public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseMode */ @ApiModelProperty("部门id") private Long deptId; + /** @@ -146,6 +147,20 @@ public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseMode */ @ApiModelProperty("联系电话") private String tel; + + /** + * 业务部门ID + */ + @ApiModelProperty("业务部门ID") + @Trans(type = TransType.DEPT, transToFieldName = "bDeptName") + private Long bDeptId; + + + /** + * 业务部门名称 + */ + @ApiModelProperty("业务部门名称") + private String bDeptName; /** * lngFileUpload diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrDto.java new file mode 100644 index 0000000..408fe90 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrDto.java @@ -0,0 +1,113 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + + + +/** +* @title: 管道气销售结算 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +public class AddLngPngSettleHdrDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + /** + * 结算月开始日期 + */ + @ApiModelProperty("结算月开始日期") + private LocalDateTime dateFrom; + /** + * 结算月结束日期 + */ + @ApiModelProperty("结算月结束日期") + private LocalDateTime dateTo; + /** + * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) + */ + @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + private String settleTypeCode; + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + private String cpCode; + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + private BigDecimal qtySettleGj; + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + private BigDecimal qtySettleM3; + /** + * 结算总金额 + */ + @ApiModelProperty("结算总金额") + private BigDecimal amount; + /** + * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N) + */ + @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)") + private String rpSign; + /** + * 对账单(不显示，挂对账单附件用) + */ + @ApiModelProperty("对账单(不显示，挂对账单附件用)") + private String billAccount; + /** + * 审批状态 + */ + @ApiModelProperty("审批状态") + private String approCode; + /** + * 结算说明 + */ + @ApiModelProperty("结算说明") + private String settleDesc; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngPngSettleSales + */ + @ApiModelProperty("lngPngSettleSales子表") + private List lngPngSettleSalesList; + /** + * lngPngSettleSalesDtl + */ + @ApiModelProperty("lngPngSettleSalesDtl子表") + private List lngPngSettleSalesDtlList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDtlDto.java new file mode 100644 index 0000000..d2795d2 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDtlDto.java @@ -0,0 +1,103 @@ +package com.xjrsoft.module.dayPlan.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 管道气销售结算 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +public class AddLngPngSettleSalesDtlDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 管道气销售日计划-销售结算主键 + */ + @ApiModelProperty("管道气销售日计划-销售结算主键") + private Long settleId; + /** + * 价格类型(基础量/增量) + */ + @ApiModelProperty("价格类型(基础量/增量)") + private String priceCode; + /** + * 优先级 + */ + @ApiModelProperty("优先级") + private Byte sort; + /** + * 主计量单位(从lng_png_settle_sales带) + */ + @ApiModelProperty("主计量单位(从lng_png_settle_sales带)") + private String uomCode; + /** + * 阶梯量（吉焦） + */ + @ApiModelProperty("阶梯量（吉焦）") + private BigDecimal rateQtyGj; + /** + * 阶梯量（方） + */ + @ApiModelProperty("阶梯量（方）") + private BigDecimal rateQtyM3; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 结算数量(吉焦) + */ + @ApiModelProperty("结算数量(吉焦)") + private BigDecimal qtySettleGj; + /** + * 结算数量(方) + */ + @ApiModelProperty("结算数量(方)") + private BigDecimal qtySettleM3; + /** + * 价格(元/吉焦) + */ + @ApiModelProperty("价格(元/吉焦)") + private BigDecimal priceGj; + /** + * 价格(元/方) + */ + @ApiModelProperty("价格(元/方)") + private BigDecimal priceM3; + /** + * 金额(自动计算) + */ + @ApiModelProperty("金额(自动计算)") + private BigDecimal amount; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDto.java new file mode 100644 index 0000000..2118597 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDto.java @@ -0,0 +1,148 @@ +package com.xjrsoft.module.dayPlan.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 管道气销售结算 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +public class AddLngPngSettleSalesDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 结算-管道气-销售-主表主键(lng_png_settle_hdr.id) + */ + @ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)") + private Long settleHdrId; + /** + * 日计划-管道气-销售主键(lng_png_sales_pur.sales_id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)") + private Long salesId; + /** + * 结算月(从主表带) + */ + @ApiModelProperty("结算月(从主表带)") + private LocalDateTime settleMonth; + /** + * 结算类型(I-气费收入) + */ + @ApiModelProperty("结算类型(I-气费收入)") + private String settleTypeCode; + /** + * 计划日期(从lng_png_sales带) + */ + @ApiModelProperty("计划日期(从lng_png_sales带)") + private LocalDateTime datePlan; + /** + * 计量日期(从lng_png_sales带) + */ + @ApiModelProperty("计量日期(从lng_png_sales带)") + private LocalDateTime dateMea; + /** + * 客户(从lng_png_sales带) + */ + @ApiModelProperty("客户(从lng_png_sales带)") + private String cuCode; + /** + * 合同主键(从lng_png_sales带) + */ + @ApiModelProperty("合同主键(从lng_png_sales带)") + private Long ksId; + /** + * 合同-国内销售-管道气-交割点主键(从lng_png_sales带) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)") + private Long ksppId; + /** + * 交割点(从lng_png_sales带) + */ + @ApiModelProperty("交割点(从lng_png_sales带)") + private String pointDelyCode; + /** + * 主计量单位(从lng_png_sales带) + */ + @ApiModelProperty("主计量单位(从lng_png_sales带)") + private String uomCode; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 完成量(吉焦) + */ + @ApiModelProperty("完成量(吉焦)") + private BigDecimal qtyMeaGj; + /** + * 完成量(方) + */ + @ApiModelProperty("完成量(方)") + private BigDecimal qtyMeaM3; + /** + * 结算量(吉焦) + */ + @ApiModelProperty("结算量(吉焦)") + private BigDecimal qtySettleGj; + /** + * 结算量(方) + */ + @ApiModelProperty("结算量(方)") + private BigDecimal qtySettleM3; + /** + * 结算价格(元/吉焦)(金额/总量) + */ + @ApiModelProperty("结算价格(元/吉焦)(金额/总量)") + private BigDecimal priceGj; + /** + * 结算价格(元/方)(金额/总量) + */ + @ApiModelProperty("结算价格(元/方)(金额/总量)") + private BigDecimal priceM3; + /** + * 结算金额(自动计算，子表合计) + */ + @ApiModelProperty("结算金额(自动计算，子表合计)") + private BigDecimal amount; + /** + * 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”) + */ + @ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)") + private String priceDesc; + /** + * 结算次数(第一次结算1，第二次结算2……) + */ + @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)") + private Byte settleTimes; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngSettleHdrPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngSettleHdrPageDto.java new file mode 100644 index 0000000..1b1796d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngSettleHdrPageDto.java @@ -0,0 +1,88 @@ +package com.xjrsoft.module.dayPlan.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngPngSettleHdrPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 结算月 + */ + @ApiModelProperty("结算月") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime settleMonth; + /** + * 结算月开始日期 + */ + @ApiModelProperty("结算月开始日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateFrom; + /** + * 结算月结束日期 + */ + @ApiModelProperty("结算月结束日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateTo; + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + private String cpCode; + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + private BigDecimal qtySettleGj; + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + private BigDecimal qtySettleM3; + /** + * 结算总金额 + */ + @ApiModelProperty("结算总金额") + private BigDecimal amount; + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + /** + * 结算说明 + */ + @ApiModelProperty("结算说明") + private String settleDesc; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + /** + * 审批状态 + */ + @ApiModelProperty("审批状态") + private String approCode; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java new file mode 100644 index 0000000..6796b41 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java @@ -0,0 +1,166 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogField; +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + +/** +* @title: 管道气销售结算 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_settle_hdr",name="管道气销售结算") +public class UpdateLngPngSettleHdrDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 结算月 + */ + @LogField(name="结算月",index=1) + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + + /** + * 结算月开始日期 + */ + @LogField(name="结算月开始日期",index=2) + @ApiModelProperty("结算月开始日期") + private LocalDateTime dateFrom; + + /** + * 结算月结束日期 + */ + @LogField(name="结算月结束日期",index=3) + @ApiModelProperty("结算月结束日期") + private LocalDateTime dateTo; + + /** + * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) + */ + @LogField(name="结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)",index=4) + @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + private String settleTypeCode; + + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @LogField(name="供应商/客户(根据结算类型关联供应商/客户)",index=5) + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + private String cpCode; + + /** + * 交易主体(天然气公司/惠贸) + */ + @LogField(name="交易主体(天然气公司/惠贸)",index=6) + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @LogField(name="结算总数量(吉焦)(不包含二次结算的数量)",index=7) + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + private BigDecimal qtySettleGj; + + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @LogField(name="结算总数量(方)(不包含二次结算的数量)",index=8) + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + private BigDecimal qtySettleM3; + + /** + * 结算总金额 + */ + @LogField(name="结算总金额",index=9) + @ApiModelProperty("结算总金额") + private BigDecimal amount; + + /** + * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N) + */ + @LogField(name="账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)",index=10) + @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)") + private String rpSign; + + /** + * 对账单(不显示，挂对账单附件用) + */ + @LogField(name="对账单(不显示，挂对账单附件用)",index=11) + @ApiModelProperty("对账单(不显示，挂对账单附件用)") + private String billAccount; + + /** + * 审批状态 + */ + @LogField(name="审批状态",index=12) + @ApiModelProperty("审批状态") + private String approCode; + + /** + * 结算说明 + */ + @LogField(name="结算说明",index=13) + @ApiModelProperty("结算说明") + private String settleDesc; + + /** + * 备注 + */ + @LogField(name="备注",index=14) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=15) + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * lngPngSettleSales + */ + @ApiModelProperty("lngPngSettleSales子表") + @LogJoin(name = "lngPngSettleSales子表", + columns = { + @LogJoinColumn(field = "settleHdrId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDto.class, type = JoinType.MANY) + private List lngPngSettleSalesList; + /** + * lngPngSettleSalesDtl + */ + @ApiModelProperty("lngPngSettleSalesDtl子表") + @LogJoin(name = "lngPngSettleSalesDtl子表", + columns = { + @LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDtlDto.class, type = JoinType.MANY) + private List lngPngSettleSalesDtlList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java new file mode 100644 index 0000000..8721fc2 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java @@ -0,0 +1,142 @@ +package com.xjrsoft.module.dayPlan.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 管道气销售结算 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_settle_sales_dtl",name="管道气销售结算") +public class UpdateLngPngSettleSalesDtlDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 管道气销售日计划-销售结算主键 + */ + @LogField(name="管道气销售日计划-销售结算主键",index=1) + @ApiModelProperty("管道气销售日计划-销售结算主键") + private Long settleId; + + /** + * 价格类型(基础量/增量) + */ + @LogField(name="价格类型(基础量/增量)",index=2) + @ApiModelProperty("价格类型(基础量/增量)") + private String priceCode; + + /** + * 优先级 + */ + @LogField(name="优先级",index=3) + @ApiModelProperty("优先级") + private Byte sort; + + /** + * 主计量单位(从lng_png_settle_sales带) + */ + @LogField(name="主计量单位(从lng_png_settle_sales带)",index=4) + @ApiModelProperty("主计量单位(从lng_png_settle_sales带)") + private String uomCode; + + /** + * 阶梯量（吉焦） + */ + @LogField(name="阶梯量（吉焦）",index=5) + @ApiModelProperty("阶梯量（吉焦）") + private BigDecimal rateQtyGj; + + /** + * 阶梯量（方） + */ + @LogField(name="阶梯量（方）",index=6) + @ApiModelProperty("阶梯量（方）") + private BigDecimal rateQtyM3; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值(方/吉焦)",index=7) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 结算数量(吉焦) + */ + @LogField(name="结算数量(吉焦)",index=8) + @ApiModelProperty("结算数量(吉焦)") + private BigDecimal qtySettleGj; + + /** + * 结算数量(方) + */ + @LogField(name="结算数量(方)",index=9) + @ApiModelProperty("结算数量(方)") + private BigDecimal qtySettleM3; + + /** + * 价格(元/吉焦) + */ + @LogField(name="价格(元/吉焦)",index=10) + @ApiModelProperty("价格(元/吉焦)") + private BigDecimal priceGj; + + /** + * 价格(元/方) + */ + @LogField(name="价格(元/方)",index=11) + @ApiModelProperty("价格(元/方)") + private BigDecimal priceM3; + + /** + * 金额(自动计算) + */ + @LogField(name="金额(自动计算)",index=12) + @ApiModelProperty("金额(自动计算)") + private BigDecimal amount; + + /** + * 备注 + */ + @LogField(name="备注",index=13) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=14) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java new file mode 100644 index 0000000..c68fbad --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java @@ -0,0 +1,205 @@ +package com.xjrsoft.module.dayPlan.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 管道气销售结算 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_settle_sales",name="管道气销售结算") +public class UpdateLngPngSettleSalesDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 结算-管道气-销售-主表主键(lng_png_settle_hdr.id) + */ + @LogField(name="结算-管道气-销售-主表主键(lng_png_settle_hdr.id)",index=1) + @ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)") + private Long settleHdrId; + + /** + * 日计划-管道气-销售主键(lng_png_sales_pur.sales_id) + */ + @LogField(name="日计划-管道气-销售主键(lng_png_sales_pur.sales_id)",index=2) + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)") + private Long salesId; + + /** + * 结算月(从主表带) + */ + @LogField(name="结算月(从主表带)",index=3) + @ApiModelProperty("结算月(从主表带)") + private LocalDateTime settleMonth; + + /** + * 结算类型(I-气费收入) + */ + @LogField(name="结算类型(I-气费收入)",index=4) + @ApiModelProperty("结算类型(I-气费收入)") + private String settleTypeCode; + + /** + * 计划日期(从lng_png_sales带) + */ + @LogField(name="计划日期(从lng_png_sales带)",index=5) + @ApiModelProperty("计划日期(从lng_png_sales带)") + private LocalDateTime datePlan; + + /** + * 计量日期(从lng_png_sales带) + */ + @LogField(name="计量日期(从lng_png_sales带)",index=6) + @ApiModelProperty("计量日期(从lng_png_sales带)") + private LocalDateTime dateMea; + + /** + * 客户(从lng_png_sales带) + */ + @LogField(name="客户(从lng_png_sales带)",index=7) + @ApiModelProperty("客户(从lng_png_sales带)") + private String cuCode; + + /** + * 合同主键(从lng_png_sales带) + */ + @LogField(name="合同主键(从lng_png_sales带)",index=8) + @ApiModelProperty("合同主键(从lng_png_sales带)") + private Long ksId; + + /** + * 合同-国内销售-管道气-交割点主键(从lng_png_sales带) + */ + @LogField(name="合同-国内销售-管道气-交割点主键(从lng_png_sales带)",index=9) + @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)") + private Long ksppId; + + /** + * 交割点(从lng_png_sales带) + */ + @LogField(name="交割点(从lng_png_sales带)",index=10) + @ApiModelProperty("交割点(从lng_png_sales带)") + private String pointDelyCode; + + /** + * 主计量单位(从lng_png_sales带) + */ + @LogField(name="主计量单位(从lng_png_sales带)",index=11) + @ApiModelProperty("主计量单位(从lng_png_sales带)") + private String uomCode; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值(方/吉焦)",index=12) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 完成量(吉焦) + */ + @LogField(name="完成量(吉焦)",index=13) + @ApiModelProperty("完成量(吉焦)") + private BigDecimal qtyMeaGj; + + /** + * 完成量(方) + */ + @LogField(name="完成量(方)",index=14) + @ApiModelProperty("完成量(方)") + private BigDecimal qtyMeaM3; + + /** + * 结算量(吉焦) + */ + @LogField(name="结算量(吉焦)",index=15) + @ApiModelProperty("结算量(吉焦)") + private BigDecimal qtySettleGj; + + /** + * 结算量(方) + */ + @LogField(name="结算量(方)",index=16) + @ApiModelProperty("结算量(方)") + private BigDecimal qtySettleM3; + + /** + * 结算价格(元/吉焦)(金额/总量) + */ + @LogField(name="结算价格(元/吉焦)(金额/总量)",index=17) + @ApiModelProperty("结算价格(元/吉焦)(金额/总量)") + private BigDecimal priceGj; + + /** + * 结算价格(元/方)(金额/总量) + */ + @LogField(name="结算价格(元/方)(金额/总量)",index=18) + @ApiModelProperty("结算价格(元/方)(金额/总量)") + private BigDecimal priceM3; + + /** + * 结算金额(自动计算，子表合计) + */ + @LogField(name="结算金额(自动计算，子表合计)",index=19) + @ApiModelProperty("结算金额(自动计算，子表合计)") + private BigDecimal amount; + + /** + * 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”) + */ + @LogField(name="价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)",index=20) + @ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)") + private String priceDesc; + + /** + * 结算次数(第一次结算1，第二次结算2……) + */ + @LogField(name="结算次数(第一次结算1，第二次结算2……)",index=21) + @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)") + private Byte settleTimes; + + /** + * 备注 + */ + @LogField(name="备注",index=22) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=23) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPageVo.java new file mode 100644 index 0000000..013b91b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPageVo.java @@ -0,0 +1,79 @@ +package com.xjrsoft.module.dayPlan.vo; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +public class LngPngSettleHdrPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 结算月 + */ + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + /** + * 结算月开始日期 + */ + @ApiModelProperty("结算月开始日期") + private LocalDateTime dateFrom; + /** + * 结算月结束日期 + */ + @ApiModelProperty("结算月结束日期") + private LocalDateTime dateTo; + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + private String cpCode; + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + private BigDecimal qtySettleGj; + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + private BigDecimal qtySettleM3; + /** + * 结算总金额 + */ + @ApiModelProperty("结算总金额") + private BigDecimal amount; + /** + * 审批状态 + */ + @ApiModelProperty("审批状态") + private String approCode; + /** + * 结算说明 + */ + @ApiModelProperty("结算说明") + private String settleDesc; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java new file mode 100644 index 0000000..a44d317 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java @@ -0,0 +1,186 @@ +package com.xjrsoft.module.dayPlan.vo; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + + + /** + * 结算月开始日期 + */ + @ApiModelProperty("结算月开始日期") + private LocalDateTime dateFrom; + + + /** + * 结算月结束日期 + */ + @ApiModelProperty("结算月结束日期") + private LocalDateTime dateTo; + + + /** + * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) + */ + @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + private String settleTypeCode; + + + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + private String cpCode; + + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + + + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + private BigDecimal qtySettleGj; + + + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + private BigDecimal qtySettleM3; + + + /** + * 结算总金额 + */ + @ApiModelProperty("结算总金额") + private BigDecimal amount; + + + /** + * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N) + */ + @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)") + private String rpSign; + + + /** + * 对账单(不显示，挂对账单附件用) + */ + @ApiModelProperty("对账单(不显示，挂对账单附件用)") + private String billAccount; + + + /** + * 审批状态 + */ + @ApiModelProperty("审批状态") + private String approCode; + + + /** + * 结算说明 + */ + @ApiModelProperty("结算说明") + private String settleDesc; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + /** + * lngPngSettleSales + */ + @ApiModelProperty("lngPngSettleSales子表") + private List lngPngSettleSalesList; + /** + * lngPngSettleSalesDtl + */ + @ApiModelProperty("lngPngSettleSalesDtl子表") + private List lngPngSettleSalesDtlList; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java new file mode 100644 index 0000000..5434376 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java @@ -0,0 +1,168 @@ +package com.xjrsoft.module.dayPlan.vo; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +public class LngPngSettleSalesDtlVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 管道气销售日计划-销售结算主键 + */ + @ApiModelProperty("管道气销售日计划-销售结算主键") + private Long settleId; + + + /** + * 价格类型(基础量/增量) + */ + @ApiModelProperty("价格类型(基础量/增量)") + private String priceCode; + + + /** + * 优先级 + */ + @ApiModelProperty("优先级") + private Byte sort; + + + /** + * 主计量单位(从lng_png_settle_sales带) + */ + @ApiModelProperty("主计量单位(从lng_png_settle_sales带)") + private String uomCode; + + + /** + * 阶梯量（吉焦） + */ + @ApiModelProperty("阶梯量（吉焦）") + private BigDecimal rateQtyGj; + + + /** + * 阶梯量（方） + */ + @ApiModelProperty("阶梯量（方）") + private BigDecimal rateQtyM3; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 结算数量(吉焦) + */ + @ApiModelProperty("结算数量(吉焦)") + private BigDecimal qtySettleGj; + + + /** + * 结算数量(方) + */ + @ApiModelProperty("结算数量(方)") + private BigDecimal qtySettleM3; + + + /** + * 价格(元/吉焦) + */ + @ApiModelProperty("价格(元/吉焦)") + private BigDecimal priceGj; + + + /** + * 价格(元/方) + */ + @ApiModelProperty("价格(元/方)") + private BigDecimal priceM3; + + + /** + * 金额(自动计算) + */ + @ApiModelProperty("金额(自动计算)") + private BigDecimal amount; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java new file mode 100644 index 0000000..9965008 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java @@ -0,0 +1,231 @@ +package com.xjrsoft.module.dayPlan.vo; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 结算-管道气-销售-主表主键(lng_png_settle_hdr.id) + */ + @ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)") + private Long settleHdrId; + + + /** + * 日计划-管道气-销售主键(lng_png_sales_pur.sales_id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)") + private Long salesId; + + + /** + * 结算月(从主表带) + */ + @ApiModelProperty("结算月(从主表带)") + private LocalDateTime settleMonth; + + + /** + * 结算类型(I-气费收入) + */ + @ApiModelProperty("结算类型(I-气费收入)") + private String settleTypeCode; + + + /** + * 计划日期(从lng_png_sales带) + */ + @ApiModelProperty("计划日期(从lng_png_sales带)") + private LocalDateTime datePlan; + + + /** + * 计量日期(从lng_png_sales带) + */ + @ApiModelProperty("计量日期(从lng_png_sales带)") + private LocalDateTime dateMea; + + + /** + * 客户(从lng_png_sales带) + */ + @ApiModelProperty("客户(从lng_png_sales带)") + private String cuCode; + + + /** + * 合同主键(从lng_png_sales带) + */ + @ApiModelProperty("合同主键(从lng_png_sales带)") + private Long ksId; + + + /** + * 合同-国内销售-管道气-交割点主键(从lng_png_sales带) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)") + private Long ksppId; + + + /** + * 交割点(从lng_png_sales带) + */ + @ApiModelProperty("交割点(从lng_png_sales带)") + private String pointDelyCode; + + + /** + * 主计量单位(从lng_png_sales带) + */ + @ApiModelProperty("主计量单位(从lng_png_sales带)") + private String uomCode; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 完成量(吉焦) + */ + @ApiModelProperty("完成量(吉焦)") + private BigDecimal qtyMeaGj; + + + /** + * 完成量(方) + */ + @ApiModelProperty("完成量(方)") + private BigDecimal qtyMeaM3; + + + /** + * 结算量(吉焦) + */ + @ApiModelProperty("结算量(吉焦)") + private BigDecimal qtySettleGj; + + + /** + * 结算量(方) + */ + @ApiModelProperty("结算量(方)") + private BigDecimal qtySettleM3; + + + /** + * 结算价格(元/吉焦)(金额/总量) + */ + @ApiModelProperty("结算价格(元/吉焦)(金额/总量)") + private BigDecimal priceGj; + + + /** + * 结算价格(元/方)(金额/总量) + */ + @ApiModelProperty("结算价格(元/方)(金额/总量)") + private BigDecimal priceM3; + + + /** + * 结算金额(自动计算，子表合计) + */ + @ApiModelProperty("结算金额(自动计算，子表合计)") + private BigDecimal amount; + + + /** + * 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”) + */ + @ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)") + private String priceDesc; + + + /** + * 结算次数(第一次结算1，第二次结算2……) + */ + @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)") + private Byte settleTimes; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java index 30614cf..d7720a0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java @@ -112,6 +112,7 @@ public class ContractPurPngServiceImpl extends MPJBaseServiceImpl fileList = fileClient.getTableFiles("lng_contract_fact", @@ -132,8 +133,8 @@ public class ContractPurPngServiceImpl extends MPJBaseServiceImpl fileList = fileClient.getTableFiles("lng_contract_fact", @@ -78,8 +79,8 @@ public class ContractSalesLngServiceImpl extends MPJBaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdr::getId,dto.getId()) + //.between(ObjectUtil.isNotNull(dto.getSettleMonthStart()) && ObjectUtil.isNotNull(dto.getSettleMonthEnd()),LngPngSettleHdr::getSettleMonth,dto.getSettleMonthStart(),dto.getSettleMonthEnd()) + //.between(ObjectUtil.isNotNull(dto.getDateFromStart()) && ObjectUtil.isNotNull(dto.getDateFromEnd()),LngPngSettleHdr::getDateFrom,dto.getDateFromStart(),dto.getDateFromEnd()) + // .between(ObjectUtil.isNotNull(dto.getDateToStart()) && ObjectUtil.isNotNull(dto.getDateToEnd()),LngPngSettleHdr::getDateTo,dto.getDateToStart(),dto.getDateToEnd()) + .like(StrUtil.isNotBlank(dto.getCpCode()),LngPngSettleHdr::getCpCode,dto.getCpCode()) + .eq(ObjectUtil.isNotNull(dto.getQtySettleGj()),LngPngSettleHdr::getQtySettleGj,dto.getQtySettleGj()) + .eq(ObjectUtil.isNotNull(dto.getQtySettleM3()),LngPngSettleHdr::getQtySettleM3,dto.getQtySettleM3()) + .eq(ObjectUtil.isNotNull(dto.getAmount()),LngPngSettleHdr::getAmount,dto.getAmount()) + .eq(ObjectUtil.isNotNull(dto.getComId()),LngPngSettleHdr::getComId,dto.getComId()) + .like(StrUtil.isNotBlank(dto.getSettleDesc()),LngPngSettleHdr::getSettleDesc,dto.getSettleDesc()) + .eq(ObjectUtil.isNotNull(dto.getDeptId()),LngPngSettleHdr::getDeptId,dto.getDeptId()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdr::getApproCode,dto.getApproCode()) + .orderByDesc(LngPngSettleHdr::getId) + .select(LngPngSettleHdr.class,x -> VoToColumnUtil.fieldsToColumns(LngPngSettleHdrPageVo.class).contains(x.getProperty())); + IPage page = pngSettleHdrService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngPngSettleHdrPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPngSettleHdr信息") + @SaCheckPermission("pngSettleHdr:detail") + public R info(@RequestParam Long id){ + LngPngSettleHdr lngPngSettleHdr = pngSettleHdrService.getByIdDeep(id); + if (lngPngSettleHdr == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPngSettleHdr数据详细日志") + @SaCheckPermission("pngSettleHdr:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngPngSettleHdrDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngPngSettleHdr") + @SaCheckPermission("pngSettleHdr:add") + public R add(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){ + UpdateLngPngSettleHdrDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngPngSettleHdr") + @SaCheckPermission("pngSettleHdr:edit") + public R update(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("pngSettleHdr:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngPngSettleHdrDto.class, ids)); + + } + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java new file mode 100644 index 0000000..51c47ee --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java @@ -0,0 +1,197 @@ +package com.xjrsoft.module.dayPlan.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 管道气销售结算 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_settle_hdr") +@ApiModel(value = "管道气销售结算对象", description = "管道气销售结算") +public class LngPngSettleHdr implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime settleMonth; + + /** + * 结算月开始日期 + */ + @ApiModelProperty("结算月开始日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 结算月结束日期 + */ + @ApiModelProperty("结算月结束日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateTo; + + /** + * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) + */ + @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + private String settleTypeCode; + + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + private String cpCode; + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleGj; + + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleM3; + + /** + * 结算总金额 + */ + @ApiModelProperty("结算总金额") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amount; + + /** + * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N) + */ + @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)") + private String rpSign; + + /** + * 对账单(不显示，挂对账单附件用) + */ + @ApiModelProperty("对账单(不显示，挂对账单附件用)") + private String billAccount; + + /** + * 审批状态 + */ + @ApiModelProperty("审批状态") + private String approCode; + + /** + * 结算说明 + */ + @ApiModelProperty("结算说明") + private String settleDesc; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + /** + * lngPngSettleSales + */ + @ApiModelProperty("lngPngSettleSales子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "settleHdrId") + private List lngPngSettleSalesList; + /** + * lngPngSettleSalesDtl + */ + @ApiModelProperty("lngPngSettleSalesDtl子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "settleId") + private List lngPngSettleSalesDtlList; + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java new file mode 100644 index 0000000..e5d0f41 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java @@ -0,0 +1,238 @@ +package com.xjrsoft.module.dayPlan.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 管道气销售结算 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_settle_sales") +@ApiModel(value = "管道气销售结算对象", description = "管道气销售结算") +public class LngPngSettleSales implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 结算-管道气-销售-主表主键(lng_png_settle_hdr.id) + */ + @ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long settleHdrId; + + /** + * 日计划-管道气-销售主键(lng_png_sales_pur.sales_id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long salesId; + + /** + * 结算月(从主表带) + */ + @ApiModelProperty("结算月(从主表带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime settleMonth; + + /** + * 结算类型(I-气费收入) + */ + @ApiModelProperty("结算类型(I-气费收入)") + private String settleTypeCode; + + /** + * 计划日期(从lng_png_sales带) + */ + @ApiModelProperty("计划日期(从lng_png_sales带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime datePlan; + + /** + * 计量日期(从lng_png_sales带) + */ + @ApiModelProperty("计量日期(从lng_png_sales带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateMea; + + /** + * 客户(从lng_png_sales带) + */ + @ApiModelProperty("客户(从lng_png_sales带)") + private String cuCode; + + /** + * 合同主键(从lng_png_sales带) + */ + @ApiModelProperty("合同主键(从lng_png_sales带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksId; + + /** + * 合同-国内销售-管道气-交割点主键(从lng_png_sales带) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksppId; + + /** + * 交割点(从lng_png_sales带) + */ + @ApiModelProperty("交割点(从lng_png_sales带)") + private String pointDelyCode; + + /** + * 主计量单位(从lng_png_sales带) + */ + @ApiModelProperty("主计量单位(从lng_png_sales带)") + private String uomCode; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 完成量(吉焦) + */ + @ApiModelProperty("完成量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaGj; + + /** + * 完成量(方) + */ + @ApiModelProperty("完成量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaM3; + + /** + * 结算量(吉焦) + */ + @ApiModelProperty("结算量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleGj; + + /** + * 结算量(方) + */ + @ApiModelProperty("结算量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleM3; + + /** + * 结算价格(元/吉焦)(金额/总量) + */ + @ApiModelProperty("结算价格(元/吉焦)(金额/总量)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceGj; + + /** + * 结算价格(元/方)(金额/总量) + */ + @ApiModelProperty("结算价格(元/方)(金额/总量)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceM3; + + /** + * 结算金额(自动计算，子表合计) + */ + @ApiModelProperty("结算金额(自动计算，子表合计)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amount; + + /** + * 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”) + */ + @ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)") + private String priceDesc; + + /** + * 结算次数(第一次结算1，第二次结算2……) + */ + @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Byte settleTimes; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSalesDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSalesDtl.java new file mode 100644 index 0000000..d17acdf --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSalesDtl.java @@ -0,0 +1,181 @@ +package com.xjrsoft.module.dayPlan.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 管道气销售结算 +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_settle_sales_dtl") +@ApiModel(value = "管道气销售结算对象", description = "管道气销售结算") +public class LngPngSettleSalesDtl implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 管道气销售日计划-销售结算主键 + */ + @ApiModelProperty("管道气销售日计划-销售结算主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long settleId; + + /** + * 价格类型(基础量/增量) + */ + @ApiModelProperty("价格类型(基础量/增量)") + private String priceCode; + + /** + * 优先级 + */ + @ApiModelProperty("优先级") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Byte sort; + + /** + * 主计量单位(从lng_png_settle_sales带) + */ + @ApiModelProperty("主计量单位(从lng_png_settle_sales带)") + private String uomCode; + + /** + * 阶梯量（吉焦） + */ + @ApiModelProperty("阶梯量（吉焦）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateQtyGj; + + /** + * 阶梯量（方） + */ + @ApiModelProperty("阶梯量（方）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateQtyM3; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 结算数量(吉焦) + */ + @ApiModelProperty("结算数量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleGj; + + /** + * 结算数量(方) + */ + @ApiModelProperty("结算数量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleM3; + + /** + * 价格(元/吉焦) + */ + @ApiModelProperty("价格(元/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceGj; + + /** + * 价格(元/方) + */ + @ApiModelProperty("价格(元/方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceM3; + + /** + * 金额(自动计算) + */ + @ApiModelProperty("金额(自动计算)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amount; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java new file mode 100644 index 0000000..c624584 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.dayPlan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Mapper +public interface LngPngSettleHdrMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java new file mode 100644 index 0000000..f1e68f5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.dayPlan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Mapper +public interface LngPngSettleSalesDtlMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java new file mode 100644 index 0000000..9b1587b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.dayPlan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Mapper +public interface LngPngSettleSalesMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java new file mode 100644 index 0000000..e821310 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.dayPlan.service; + +import com.github.yulichang.base.MPJBaseService; +import com.github.yulichang.extension.mapping.base.MPJDeepService; +import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ + +public interface IPngSettleHdrService extends MPJBaseService, MPJDeepService, MPJRelationService { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java new file mode 100644 index 0000000..8c361d3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java @@ -0,0 +1,35 @@ +package com.xjrsoft.module.dayPlan.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesDtlMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper; +import com.xjrsoft.module.dayPlan.service.IPngSettleHdrService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-02-03 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl implements IPngSettleHdrService { + private final LngPngSettleHdrMapper pngSettleHdrLngPngSettleHdrMapper; + + private final LngPngSettleSalesMapper pngSettleHdrLngPngSettleSalesMapper; + private final LngPngSettleSalesDtlMapper pngSettleHdrLngPngSettleSalesDtlMapper; + + +}