From 377753c4783ee1bb5bd3db699adfb5ebab161e45 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Tue, 13 Jan 2026 17:04:56 +0800 Subject: [PATCH] update --- .../module/dayPlan/dto/AddLngPngApproDto.java | 6 +- .../dayPlan/dto/AddLngPngApproPurDto.java | 6 +- .../dto/AddLngPngMeasureSalesPurDto.java | 159 +++++++++++ .../dto/LngPngMeasureSalesPurPageDto.java | 123 +++++++++ .../dto/UpdateLngPngMeasureSalesPurDto.java | 219 +++++++++++++++ .../module/dayPlan/vo/LngPngApproPurVo.java | 9 +- .../module/dayPlan/vo/LngPngApproVo.java | 8 +- .../vo/LngPngMeasureSalesPurPageVo.java | 158 +++++++++++ .../dayPlan/vo/LngPngMeasureSalesPurVo.java | 251 +++++++++++++++++ .../module/sales/vo/LngScorePageVo.java | 2 +- .../module/supplier/vo/LngScorePageVo.java | 2 +- .../PngMeasureSalesPurController.java | 161 +++++++++++ .../module/dayPlan/entity/LngPngAppro.java | 72 ----- .../module/dayPlan/entity/LngPngApproPur.java | 52 ---- .../dayPlan/entity/LngPngMeasureSalesPur.java | 252 ++++++++++++++++++ .../mapper/LngPngMeasureSalesPurMapper.java | 17 ++ .../service/IPngMeasureSalesPurService.java | 19 ++ .../impl/PngMeasureSalesPurServiceImpl.java | 21 ++ 18 files changed, 1395 insertions(+), 142 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngMeasureSalesPurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngMeasureSalesPurPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasureSalesPurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngMeasureSalesPur.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasureSalesPurMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasureSalesPurService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngApproDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngApproDto.java index b5ad028..60f851f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngApproDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngApproDto.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.dayPlan.dto; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -18,10 +19,7 @@ import java.util.List; * @Date: 2026-01-13 * @Version 1.0 */ -@Getter -@Setter -@ToString -@Accessors(chain = true) +@Data public class AddLngPngApproDto extends com.xjrsoft.common.model.base.BaseModel { private static final long serialVersionUID = 1L; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngApproPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngApproPurDto.java index 7b1b641..e4d839a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngApproPurDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngApproPurDto.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.dayPlan.dto; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -19,10 +20,7 @@ import java.time.LocalDateTime; * @Date: 2026-01-13 * @Version 1.0 */ -@Getter -@Setter -@ToString -@Accessors(chain = true) +@Data public class AddLngPngApproPurDto extends com.xjrsoft.common.model.base.BaseModel { private static final long serialVersionUID = 1L; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngMeasureSalesPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngMeasureSalesPurDto.java new file mode 100644 index 0000000..9db68b4 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngMeasureSalesPurDto.java @@ -0,0 +1,159 @@ +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 com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 管道气采购计量 +* @Author test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ +@Data +public class AddLngPngMeasureSalesPurDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 日计划-管道气-销售主键(lng_png_sales.id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") + private Long salesId; + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + private Long salesPurId; + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + /** + * 计量日期(缺省=计划日期+1) + */ + @ApiModelProperty("计量日期(缺省=计划日期+1)") + private LocalDateTime dateMea; + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private Long ksId; + /** + * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)") + private Long ksppId; + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 日批复量(吉焦) + */ + @ApiModelProperty("日批复量(吉焦)") + private BigDecimal qtySalesGj; + /** + * 日批复量(方) + */ + @ApiModelProperty("日批复量(方)") + private BigDecimal qtySalesM3; + /** + * 日完成量(吉焦) + */ + @ApiModelProperty("日完成量(吉焦)") + private BigDecimal qtyMeaGj; + /** + * 日完成量(方) + */ + @ApiModelProperty("日完成量(方)") + private BigDecimal qtyMeaM3; + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 备注 + */ + @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/LngPngMeasureSalesPurPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngMeasureSalesPurPageDto.java new file mode 100644 index 0000000..51dd84e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngMeasureSalesPurPageDto.java @@ -0,0 +1,123 @@ +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 test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngPngMeasureSalesPurPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime datePlan; + /** + * 计量日期(缺省=计划日期+1) + */ + @ApiModelProperty("计量日期(缺省=计划日期+1)") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateMea; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + /** + * 日批复量(吉焦) + */ + @ApiModelProperty("日批复量(吉焦)") + private BigDecimal qtySalesGj; + /** + * 日批复量(方) + */ + @ApiModelProperty("日批复量(方)") + private BigDecimal qtySalesM3; + /** + * 日完成量(吉焦) + */ + @ApiModelProperty("日完成量(吉焦)") + private BigDecimal qtyMeaGj; + /** + * 日完成量(方) + */ + @ApiModelProperty("日完成量(方)") + private BigDecimal qtyMeaM3; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createDate; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasureSalesPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasureSalesPurDto.java new file mode 100644 index 0000000..eff11e5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasureSalesPurDto.java @@ -0,0 +1,219 @@ +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 test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_measure_sales_pur",name="管道气采购计量") +public class UpdateLngPngMeasureSalesPurDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 日计划-管道气-销售主键(lng_png_sales.id) + */ + @LogField(name="日计划-管道气-销售主键(lng_png_sales.id)",index=1) + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") + private Long salesId; + + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @LogField(name="日计划-管道气-销售-采购主键(lng_png_sales_pur.id)",index=2) + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + private Long salesPurId; + + /** + * 计划日期 + */ + @LogField(name="计划日期",index=3) + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + + /** + * 计量日期(缺省=计划日期+1) + */ + @LogField(name="计量日期(缺省=计划日期+1)",index=4) + @ApiModelProperty("计量日期(缺省=计划日期+1)") + private LocalDateTime dateMea; + + /** + * 客户编码 + */ + @LogField(name="客户编码",index=5) + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 交易主体编码(天然气公司/惠贸) + */ + @LogField(name="交易主体编码(天然气公司/惠贸)",index=6) + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @LogField(name="合同-主信息主键（销售）(lng_contract)",index=7) + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private Long ksId; + + /** + * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta) + */ + @LogField(name="合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)",index=8) + @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)") + private Long ksppId; + + /** + * 交割点编码 + */ + @LogField(name="交割点编码",index=9) + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 供应商 + */ + @LogField(name="供应商",index=10) + @ApiModelProperty("供应商") + private String suCode; + + /** + * 采购合同-主信息主键 + */ + @LogField(name="采购合同-主信息主键",index=11) + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @LogField(name="合同-国内采购-管道气-上载点主键",index=12) + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + /** + * 上载点 + */ + @LogField(name="上载点",index=13) + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @LogField(name="自主托运(Y-是，N-否)",index=14) + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值(方/吉焦)",index=15) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 日批复量(吉焦) + */ + @LogField(name="日批复量(吉焦)",index=16) + @ApiModelProperty("日批复量(吉焦)") + private BigDecimal qtySalesGj; + + /** + * 日批复量(方) + */ + @LogField(name="日批复量(方)",index=17) + @ApiModelProperty("日批复量(方)") + private BigDecimal qtySalesM3; + + /** + * 日完成量(吉焦) + */ + @LogField(name="日完成量(吉焦)",index=18) + @ApiModelProperty("日完成量(吉焦)") + private BigDecimal qtyMeaGj; + + /** + * 日完成量(方) + */ + @LogField(name="日完成量(方)",index=19) + @ApiModelProperty("日完成量(方)") + private BigDecimal qtyMeaM3; + + /** + * 客户确认人 + */ + @LogField(name="客户确认人",index=20) + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + + /** + * 客户确认时间 + */ + @LogField(name="客户确认时间",index=21) + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + + /** + * 内部确认人 + */ + @LogField(name="内部确认人",index=22) + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + + /** + * 内部确认时间 + */ + @LogField(name="内部确认时间",index=23) + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + + /** + * 备注 + */ + @LogField(name="备注",index=24) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=25) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproPurVo.java index b675702..4e898ff 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproPurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproPurVo.java @@ -1,12 +1,16 @@ 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; /** @@ -15,10 +19,7 @@ import java.math.BigDecimal; * @Date: 2026-01-13 * @Version 1.0 */ -@Getter -@Setter -@ToString -@Accessors(chain = true) +@Data public class LngPngApproPurVo extends com.xjrsoft.common.model.base.BaseModel{ /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java index 6a52c59..ba5355a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.dayPlan.vo; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -10,16 +11,15 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.module.dayPlan.dto.AddLngPngMeasureSalesPurDto; + /** * @title: 表单出参 * @Author test01 * @Date: 2026-01-13 * @Version 1.0 */ -@Getter -@Setter -@ToString -@Accessors(chain = true) +@Data public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{ /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurPageVo.java new file mode 100644 index 0000000..2d43e82 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurPageVo.java @@ -0,0 +1,158 @@ +package com.xjrsoft.module.dayPlan.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ +@Data +public class LngPngMeasureSalesPurPageVo { + + /** + * 主键 + */ + @ExcelIgnore + @ApiModelProperty("主键") + private String id; + /** + * 计划日期 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("计划日期") + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + /** + * 计量日期(缺省=计划日期+1) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("计量日期") + @ApiModelProperty("计量日期(缺省=计划日期+1)") + private LocalDateTime dateMea; + /** + * 交割点编码 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("下载点") + @ApiModelProperty("交割点编码") + private String pointDelyCode; + /** + * 供应商 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("供应商简称") + @ApiModelProperty("供应商") + private String suCode; + /** + * 采购合同-主信息主键 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("采购合同") + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + /** + * 上载点 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("上载点") + @ApiModelProperty("上载点") + private String pointUpCode; + /** + * 自主托运(Y-是，N-否) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("附件") + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + /** + * 比值(方/吉焦) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("比值(方/吉焦)") + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 日批复量(吉焦) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("批复量(吉焦)") + @ApiModelProperty("日批复量(吉焦)") + private BigDecimal qtySalesGj; + /** + * 日批复量(方) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("批复量(方)") + @ApiModelProperty("日批复量(方)") + private BigDecimal qtySalesM3; + /** + * 日完成量(吉焦) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("完成量(吉焦)") + @ApiModelProperty("日完成量(吉焦)") + private BigDecimal qtyMeaGj; + /** + * 日完成量(方) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("完成量(方)") + @ApiModelProperty("日完成量(方)") + private BigDecimal qtyMeaM3; + /** + * 客户确认人 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("客户确认人") + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("客户确认时间") + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("内部确认人") + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("内部确认时间") + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 备注 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("备注") + @ApiModelProperty("备注") + private String note; + /** + * 创建时间 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("状态") + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java new file mode 100644 index 0000000..dce1319 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java @@ -0,0 +1,251 @@ +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.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ +@Data +public class LngPngMeasureSalesPurVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 日计划-管道气-销售主键(lng_png_sales.id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") + private Long salesId; + + + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + private Long salesPurId; + + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + + + /** + * 计量日期(缺省=计划日期+1) + */ + @ApiModelProperty("计量日期(缺省=计划日期+1)") + private LocalDateTime dateMea; + + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + + + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private Long ksId; + + + /** + * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)") + private Long ksppId; + + + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + + + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 日批复量(吉焦) + */ + @ApiModelProperty("日批复量(吉焦)") + private BigDecimal qtySalesGj; + + + /** + * 日批复量(方) + */ + @ApiModelProperty("日批复量(方)") + private BigDecimal qtySalesM3; + + + /** + * 日完成量(吉焦) + */ + @ApiModelProperty("日完成量(吉焦)") + private BigDecimal qtyMeaGj; + + + /** + * 日完成量(方) + */ + @ApiModelProperty("日完成量(方)") + private BigDecimal qtyMeaM3; + + + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + + + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + + + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + + + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + + + /** + * 备注 + */ + @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/sales/vo/LngScorePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java index eac9d2d..bb65bf5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java @@ -28,7 +28,7 @@ public class LngScorePageVo { * 评分日期 */ @ApiModelProperty("评分日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateGrade; /** * 评价体系主键 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java index 830ae09..6eae856 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java @@ -28,7 +28,7 @@ public class LngScorePageVo { * 评分日期 */ @ApiModelProperty("评分日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateGrade; /** * 评价体系主键 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java new file mode 100644 index 0000000..8ffdd84 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java @@ -0,0 +1,161 @@ +package com.xjrsoft.module.dayPlan.controller; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.support.ExcelTypeEnum; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.ExcelUtil; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.dayPlan.dto.LngPngMeasureSalesPurPageDto; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngMeasureSalesPurDto; +import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; +import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurPageVo; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; + +/** +* @title: 管道气采购计量 +* @Author test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/dayPlan/pngMeasureSalesPur") +@Api(value = "/dayPlan" + "/pngMeasureSalesPur",tags = "管道气采购计量代码") +@AllArgsConstructor +public class PngMeasureSalesPurController { + + + private final IPngMeasureSalesPurService pngMeasureSalesPurService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngPngMeasureSalesPur列表(分页)") + @SaCheckPermission("pngMeasureSalesPur:list") + public R page(@Valid LngPngMeasureSalesPurPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngPngMeasureSalesPur::getId,dto.getId()) + //.between(ObjectUtil.isNotNull(dto.getDatePlanStart()) && ObjectUtil.isNotNull(dto.getDatePlanEnd()),LngPngMeasureSalesPur::getDatePlan,dto.getDatePlanStart(),dto.getDatePlanEnd()) + //.between(ObjectUtil.isNotNull(dto.getDateMeaStart()) && ObjectUtil.isNotNull(dto.getDateMeaEnd()),LngPngMeasureSalesPur::getDateMea,dto.getDateMeaStart(),dto.getDateMeaEnd()) + .like(StrUtil.isNotBlank(dto.getSuCode()),LngPngMeasureSalesPur::getSuCode,dto.getSuCode()) + .like(StrUtil.isNotBlank(dto.getPointUpCode()),LngPngMeasureSalesPur::getPointUpCode,dto.getPointUpCode()) + .like(StrUtil.isNotBlank(dto.getPointDelyCode()),LngPngMeasureSalesPur::getPointDelyCode,dto.getPointDelyCode()) + .eq(ObjectUtil.isNotNull(dto.getQtySalesGj()),LngPngMeasureSalesPur::getQtySalesGj,dto.getQtySalesGj()) + .eq(ObjectUtil.isNotNull(dto.getQtySalesM3()),LngPngMeasureSalesPur::getQtySalesM3,dto.getQtySalesM3()) + .eq(ObjectUtil.isNotNull(dto.getQtyMeaGj()),LngPngMeasureSalesPur::getQtyMeaGj,dto.getQtyMeaGj()) + .eq(ObjectUtil.isNotNull(dto.getQtyMeaM3()),LngPngMeasureSalesPur::getQtyMeaM3,dto.getQtyMeaM3()) + .eq(ObjectUtil.isNotNull(dto.getRateM3Gj()),LngPngMeasureSalesPur::getRateM3Gj,dto.getRateM3Gj()) + .eq(ObjectUtil.isNotNull(dto.getCfmCuUserId()),LngPngMeasureSalesPur::getCfmCuUserId,dto.getCfmCuUserId()) + //.like(StrUtil.isNotBlank(dto.getCfmCuUserTime()),LngPngMeasureSalesPur::getCfmCuUserTime,dto.getCfmCuUserTime()) + .eq(ObjectUtil.isNotNull(dto.getCfmEmpId()),LngPngMeasureSalesPur::getCfmEmpId,dto.getCfmEmpId()) + //.like(StrUtil.isNotBlank(dto.getCfmEmpTime()),LngPngMeasureSalesPur::getCfmEmpTime,dto.getCfmEmpTime()) + .eq(ObjectUtil.isNotNull(dto.getKpId()),LngPngMeasureSalesPur::getKpId,dto.getKpId()) + .like(StrUtil.isNotBlank(dto.getTransSign()),LngPngMeasureSalesPur::getTransSign,dto.getTransSign()) + //.between(ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd()),LngPngMeasureSalesPur::getCreateDate,dto.getCreateDateStart(),dto.getCreateDateEnd()) + .like(StrUtil.isNotBlank(dto.getNote()),LngPngMeasureSalesPur::getNote,dto.getNote()) + .orderByDesc(LngPngMeasureSalesPur::getId) + .select(LngPngMeasureSalesPur.class,x -> VoToColumnUtil.fieldsToColumns(LngPngMeasureSalesPurPageVo.class).contains(x.getProperty())); + IPage page = pngMeasureSalesPurService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngPngMeasureSalesPurPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPngMeasureSalesPur信息") + @SaCheckPermission("pngMeasureSalesPur:detail") + public R info(@RequestParam Long id){ + LngPngMeasureSalesPur lngPngMeasureSalesPur = pngMeasureSalesPurService.getById(id); + if (lngPngMeasureSalesPur == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngPngMeasureSalesPur, LngPngMeasureSalesPurVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPngMeasureSalesPur数据详细日志") + @SaCheckPermission("pngMeasureSalesPur:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngPngMeasureSalesPurDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngPngMeasureSalesPur") + @SaCheckPermission("pngMeasureSalesPur:add") + public R add(@Valid @RequestBody UpdateLngPngMeasureSalesPurDto dto){ + UpdateLngPngMeasureSalesPurDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngPngMeasureSalesPur") + @SaCheckPermission("pngMeasureSalesPur:edit") + public R update(@Valid @RequestBody UpdateLngPngMeasureSalesPurDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("pngMeasureSalesPur:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngPngMeasureSalesPurDto.class, ids)); + + } + + @PostMapping("/import") + @ApiOperation(value = "导入") + @SaCheckPermission("pngMeasureSalesPur:import") + public R importData(@RequestParam MultipartFile file) throws IOException { + List savedDataList = EasyExcel.read(file.getInputStream()).head(LngPngMeasureSalesPurPageVo.class).sheet().doReadSync(); + ExcelUtil.transExcelData(savedDataList, true); + dataService.insertBatch(BeanUtil.copyToList(savedDataList,UpdateLngPngMeasureSalesPurDto.class)); + return R.ok(); + } + + @GetMapping("/export") + @ApiOperation(value = "导出") + @SaCheckPermission("pngMeasureSalesPur:export") + public ResponseEntity exportData(@Valid LngPngMeasureSalesPurPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) { + List customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput) page(dto).getData()).getList(); + ExcelUtil.transExcelData(customerList, false); + ByteArrayOutputStream bot = new ByteArrayOutputStream(); + EasyExcel.write(bot, LngPngMeasureSalesPurPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList); + ByteArrayOutputStream resultBot = ExcelUtil.renderExportRequiredHead(bot); + + return R.fileStream(resultBot.toByteArray(), "PngMeasureSalesPur" + ExcelTypeEnum.XLSX.getValue()); + } +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngAppro.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngAppro.java index fdfbd79..1444571 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngAppro.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngAppro.java @@ -44,7 +44,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long demandId; /** @@ -55,7 +54,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long demandOrgId; /** @@ -66,27 +64,18 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Byte verNo; /** * 最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N) */ @ApiModelProperty("最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N)") - - - - @TableId private String lastVerSign; /** * 变更标识(I/U/D对原始计划的增改删) */ @ApiModelProperty("变更标识(I/U/D对原始计划的增改删)") - - - - @TableId private String alterSign; /** @@ -97,17 +86,12 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private LocalDateTime datePlan; /** * 客户编码 */ @ApiModelProperty("客户编码") - - - - @TableId private String cuCode; /** @@ -118,7 +102,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long comId; /** @@ -129,7 +112,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long ksId; /** @@ -140,27 +122,18 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long ksppId; /** * 交割点 */ @ApiModelProperty("交割点") - - - - @TableId private String pointDelyCode; /** * 自有管道沿线下载点标识(Y-是，N-否) */ @ApiModelProperty("自有管道沿线下载点标识(Y-是，N-否)") - - - - @TableId private String ownLineSign; /** @@ -171,7 +144,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Short powerCont; /** @@ -182,7 +154,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Short powerPeak; /** @@ -193,7 +164,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Short powerStop; /** @@ -204,7 +174,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Short powerOther; /** @@ -215,7 +184,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal rateM3Gj; /** @@ -226,7 +194,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyContractGj; /** @@ -237,7 +204,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyContractM3; /** @@ -248,7 +214,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyPlanGj; /** @@ -259,7 +224,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyPlanM3; /** @@ -270,7 +234,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyDemandGj; /** @@ -281,7 +244,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyDemandM3; /** @@ -292,7 +254,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtySalesGj; /** @@ -303,17 +264,12 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtySalesM3; /** * 量价周期(1-自然月，-1-自然月往前1日) */ @ApiModelProperty("量价周期(1-自然月，-1-自然月往前1日)") - - - - @TableId private String periodTypeCode; /** @@ -324,7 +280,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyMonthContractGj; /** @@ -335,7 +290,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyMonthPlanGj; /** @@ -346,7 +300,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyMonthSalesGj; /** @@ -357,7 +310,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal rateK; /** @@ -368,7 +320,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal rateMp; /** @@ -379,7 +330,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal rateS; /** @@ -390,7 +340,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal priceSalesGj; /** @@ -401,7 +350,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal priceSalesM3; /** @@ -412,37 +360,24 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal amountSales; /** * 审批状态(XS-待销售确认/JSZ-待接收站/GD-待管道确认/YSP-已确认) */ @ApiModelProperty("审批状态(XS-待销售确认/JSZ-待接收站/GD-待管道确认/YSP-已确认)") - - - - @TableId private String approCode; /** * 批复意见 */ @ApiModelProperty("批复意见") - - - - @TableId private String reply; /** * 备注 */ @ApiModelProperty("备注") - - - - @TableId private String note; /** @@ -453,7 +388,6 @@ public class LngPngAppro implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) - @TableId private Long createUserId; /** @@ -464,7 +398,6 @@ public class LngPngAppro implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) - @TableId private LocalDateTime createDate; /** @@ -475,7 +408,6 @@ public class LngPngAppro implements Serializable { @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) - @TableId private Long modifyUserId; /** @@ -486,7 +418,6 @@ public class LngPngAppro implements Serializable { @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) - @TableId private LocalDateTime modifyDate; /** @@ -497,7 +428,6 @@ public class LngPngAppro implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long tenantId; /** @@ -508,7 +438,6 @@ public class LngPngAppro implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) - @TableId private Long deptId; /** @@ -519,7 +448,6 @@ public class LngPngAppro implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) - @TableId private Long ruleUserId; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngApproPur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngApproPur.java index 0f8931e..dc6b390 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngApproPur.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngApproPur.java @@ -42,7 +42,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long approId; /** @@ -53,7 +52,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long demandId; /** @@ -64,7 +62,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long demandPurId; /** @@ -75,7 +72,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private LocalDateTime datePlan; /** @@ -86,17 +82,12 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long comId; /** * 供应商 */ @ApiModelProperty("供应商") - - - - @TableId private String suCode; /** @@ -107,7 +98,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long kpId; /** @@ -118,57 +108,36 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long kpppId; /** * 上载点 */ @ApiModelProperty("上载点") - - - - @TableId private String pointUpCode; /** * 接收站 */ @ApiModelProperty("接收站") - - - - @TableId private String staCode; /** * 自有设备标识(Y-是，N-否) */ @ApiModelProperty("自有设备标识(Y-是，N-否)") - - - - @TableId private String ownSign; /** * 系统直连(Y-是，N-否) */ @ApiModelProperty("系统直连(Y-是，N-否)") - - - - @TableId private String onlineSign; /** * 自主托运(Y-是，N-否) */ @ApiModelProperty("自主托运(Y-是，N-否)") - - - - @TableId private String transSign; /** @@ -179,7 +148,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal rateM3Gj; /** @@ -190,7 +158,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyDemandGj; /** @@ -201,7 +168,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtyDemandM3; /** @@ -212,7 +178,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtySalesGj; /** @@ -223,7 +188,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal qtySalesM3; /** @@ -234,7 +198,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal pricePurGj; /** @@ -245,7 +208,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal pricePurM3; /** @@ -256,7 +218,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private BigDecimal amountPur; /** @@ -267,7 +228,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Short sort; /** @@ -275,9 +235,6 @@ public class LngPngApproPur implements Serializable { */ @ApiModelProperty("批复添加标识(Y-批复时增加的记录，N-客户填报记录)") - - - @TableId private String addSign; /** @@ -286,8 +243,6 @@ public class LngPngApproPur implements Serializable { @ApiModelProperty("备注") - - @TableId private String note; /** @@ -298,7 +253,6 @@ public class LngPngApproPur implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) - @TableId private Long createUserId; /** @@ -309,7 +263,6 @@ public class LngPngApproPur implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) - @TableId private LocalDateTime createDate; /** @@ -320,7 +273,6 @@ public class LngPngApproPur implements Serializable { @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) - @TableId private Long modifyUserId; /** @@ -331,7 +283,6 @@ public class LngPngApproPur implements Serializable { @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) - @TableId private LocalDateTime modifyDate; /** @@ -342,7 +293,6 @@ public class LngPngApproPur implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) - @TableId private Long tenantId; /** @@ -353,7 +303,6 @@ public class LngPngApproPur implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) - @TableId private Long deptId; /** @@ -364,7 +313,6 @@ public class LngPngApproPur implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) - @TableId private Long ruleUserId; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngMeasureSalesPur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngMeasureSalesPur.java new file mode 100644 index 0000000..7468674 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngMeasureSalesPur.java @@ -0,0 +1,252 @@ +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 test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_measure_sales_pur") +@ApiModel(value = "管道气采购计量对象", description = "管道气采购计量") +public class LngPngMeasureSalesPur implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 日计划-管道气-销售主键(lng_png_sales.id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long salesId; + + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long salesPurId; + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime datePlan; + + /** + * 计量日期(缺省=计划日期+1) + */ + @ApiModelProperty("计量日期(缺省=计划日期+1)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateMea; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksId; + + /** + * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksppId; + + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpId; + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpppId; + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 日批复量(吉焦) + */ + @ApiModelProperty("日批复量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySalesGj; + + /** + * 日批复量(方) + */ + @ApiModelProperty("日批复量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySalesM3; + + /** + * 日完成量(吉焦) + */ + @ApiModelProperty("日完成量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaGj; + + /** + * 日完成量(方) + */ + @ApiModelProperty("日完成量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaM3; + + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long cfmCuUserId; + + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object cfmCuUserTime; + + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long cfmEmpId; + + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object cfmEmpTime; + + /** + * 备注 + */ + @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/LngPngMeasureSalesPurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasureSalesPurMapper.java new file mode 100644 index 0000000..9a42883 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasureSalesPurMapper.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.LngPngMeasureSalesPur; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ +@Mapper +public interface LngPngMeasureSalesPurMapper extends BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasureSalesPurService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasureSalesPurService.java new file mode 100644 index 0000000..6db3e99 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasureSalesPurService.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.dayPlan.service; + +import com.baomidou.mybatisplus.extension.service.IService; +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.LngPngMeasureSalesPur; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ + +public interface IPngMeasureSalesPurService extends IService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java new file mode 100644 index 0000000..4a16d13 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java @@ -0,0 +1,21 @@ +package com.xjrsoft.module.dayPlan.service.impl; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; +import com.xjrsoft.module.dayPlan.mapper.LngPngMeasureSalesPurMapper; +import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService; + +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author test01 +* @Date: 2026-01-13 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PngMeasureSalesPurServiceImpl extends ServiceImpl implements IPngMeasureSalesPurService { +}