From 1091ed987373d4081f13a08e83bf09e7f9567021 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 13 Mar 2026 16:38:09 +0800 Subject: [PATCH] update --- .../dayPlan/dto/AddLngPngMeasurePurDto.java | 178 ++++++++++ .../dayPlan/dto/LngPngMeasurePurPageDto.java | 133 ++++++++ .../dto/LngPngMeasureSalesPurPageDto.java | 17 +- .../dto/UpdateLngPngMeasurePurDto.java | 249 ++++++++++++++ .../dto/UpdateLngPngMeasureSalesPurDto.java | 25 ++ .../dayPlan/vo/LngPngMeasurePurPageVo.java | 124 +++++++ .../module/dayPlan/vo/LngPngMeasurePurVo.java | 287 ++++++++++++++++ .../vo/LngPngMeasureSalesPurPageVo.java | 41 ++- .../dayPlan/vo/LngPngMeasureSalesPurVo.java | 41 ++- .../controller/ContractPurPngController.java | 5 - .../ContractSalesLngController.java | 2 +- .../controller/PngMeasurePurController.java | 219 ++++++++++++ .../PngMeasureSalesPurController.java | 144 +++++--- .../dayPlan/entity/LngPngMeasurePur.java | 313 ++++++++++++++++++ .../dayPlan/entity/LngPngMeasureSalesPur.java | 32 +- .../dayPlan/entity/LngPngSettlePur.java | 15 +- .../mapper/LngPngMeasurePurMapper.java | 37 +++ .../mapper/LngPngMeasureSalesPurMapper.java | 22 +- .../service/IPngMeasurePurService.java | 21 ++ .../service/IPngMeasureSalesPurService.java | 4 + .../impl/PngMeasurePurServiceImpl.java | 57 ++++ .../impl/PngMeasureSalesPurServiceImpl.java | 10 + 22 files changed, 1877 insertions(+), 99 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngMeasurePurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngMeasurePurPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasurePurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasurePurController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngMeasurePur.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasurePurService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngMeasurePurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngMeasurePurDto.java new file mode 100644 index 0000000..7931908 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngMeasurePurDto.java @@ -0,0 +1,178 @@ +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-03-12 +* @Version 1.0 +*/ +@Data +public class AddLngPngMeasurePurDto 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 rejNote; + /** + * 顺序 + */ + @ApiModelProperty("顺序") + private Short sort; + /** + * 来源(外来接口数据主键) + */ + @ApiModelProperty("来源(外来接口数据主键)") + private String dataSource; + /** + * 计量单号(外来接口数据主键) + */ + @ApiModelProperty("计量单号(外来接口数据主键)") + private String billNo; + /** + * 备注 + */ + @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/LngPngMeasurePurPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngMeasurePurPageDto.java new file mode 100644 index 0000000..b5db61c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngMeasurePurPageDto.java @@ -0,0 +1,133 @@ +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-03-12 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngPngMeasurePurPageDto 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 cuCode; + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + /** + * 日批复量(吉焦) + */ + @ApiModelProperty("日批复量(吉焦)") + private BigDecimal qtySalesGj; + /** + * 日批复量(方) + */ + @ApiModelProperty("日批复量(方)") + private BigDecimal qtySalesM3; + /** + * 日完成量(吉焦) + */ + @ApiModelProperty("日完成量(吉焦)") + private BigDecimal qtyMeaGj; + /** + * 日完成量(方) + */ + @ApiModelProperty("日完成量(方)") + private BigDecimal qtyMeaM3; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime modifyDate; + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private Long ksId; + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + private Long salesPurId; + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + +} 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 index 51dd84e..0aa728a 100644 --- 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 @@ -1,14 +1,15 @@ package com.xjrsoft.module.dayPlan.dto; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import org.springframework.format.annotation.DateTimeFormat; + 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; /** @@ -119,5 +120,11 @@ public class LngPngMeasureSalesPurPageDto extends PageInput { */ @ApiModelProperty("备注") private String note; + + /** + * 拒绝原因 + */ + @ApiModelProperty("拒绝原因") + private String rejNote; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasurePurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasurePurDto.java new file mode 100644 index 0000000..2a02150 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasurePurDto.java @@ -0,0 +1,249 @@ +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.LogAttrField; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 管道气计量(内部) +* @Author 管理员 +* @Date: 2026-03-12 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_measure_sales_pur",name="管道气计量(内部)") +public class UpdateLngPngMeasurePurDto 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 rejNote; + + /** + * 顺序 + */ + @LogField(name="顺序",index=25) + @ApiModelProperty("顺序") + private Short sort; + + /** + * 来源(外来接口数据主键) + */ + @LogField(name="来源(外来接口数据主键)",index=26) + @ApiModelProperty("来源(外来接口数据主键)") + private String dataSource; + + /** + * 计量单号(外来接口数据主键) + */ + @LogField(name="计量单号(外来接口数据主键)",index=27) + @ApiModelProperty("计量单号(外来接口数据主键)") + private String billNo; + + /** + * 备注 + */ + @LogField(name="备注",index=28) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=29) + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; + + private List ids; +} 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 index 1a8c528..287763a 100644 --- 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 @@ -213,6 +213,31 @@ public class UpdateLngPngMeasureSalesPurDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * 拒绝原因 + */ + @LogField(name="拒绝原因",index=26) + @ApiModelProperty("拒绝原因") + private String rejNote; + + /** + * 顺序 + */ + @ApiModelProperty("顺序") + private Short sort; + + /** + * 来源(外来接口数据主键) + */ + @ApiModelProperty("来源(外来接口数据主键)") + private String dataSource; + + /** + * 计量单号(外来接口数据主键) + */ + @ApiModelProperty("计量单号(外来接口数据主键)") + private String billNo; + /** * lngFileUpload */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurPageVo.java new file mode 100644 index 0000000..dec8962 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurPageVo.java @@ -0,0 +1,124 @@ +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-03-12 +* @Version 1.0 +*/ +@Data +public class LngPngMeasurePurPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 日计划-管道气-销售-采购主键(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; + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + /** + * 比值(方/吉焦) + */ + @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 LocalDateTime modifyDate; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java new file mode 100644 index 0000000..24c3733 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java @@ -0,0 +1,287 @@ +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; + +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-03-12 +* @Version 1.0 +*/ +@Data +public class LngPngMeasurePurVo 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 rejNote; + + + /** + * 顺序 + */ + @ApiModelProperty("顺序") + private Short sort; + + + /** + * 来源(外来接口数据主键) + */ + @ApiModelProperty("来源(外来接口数据主键)") + private String dataSource; + + + /** + * 计量单号(外来接口数据主键) + */ + @ApiModelProperty("计量单号(外来接口数据主键)") + private String billNo; + + + /** + * 备注 + */ + @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; + + private String statusCode; + + + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; + +} 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 index 2d43e82..824fd2d 100644 --- 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 @@ -1,18 +1,15 @@ package com.xjrsoft.module.dayPlan.vo; -import com.alibaba.excel.annotation.ExcelProperty; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; 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 @@ -151,8 +148,34 @@ public class LngPngMeasureSalesPurPageVo { * 创建时间 */ @ContentStyle(dataFormat = 49) - @ExcelProperty("状态") + @ExcelProperty("创建时间") @ApiModelProperty("创建时间") private LocalDateTime createDate; + + /** + * 拒绝原因 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("拒绝原因") + @ApiModelProperty("拒绝原因") + private String rejNote; + + /** + * 顺序 + */ + @ApiModelProperty("顺序") + private Short sort; + + /** + * 来源(外来接口数据主键) + */ + @ApiModelProperty("来源(外来接口数据主键)") + private String dataSource; + + /** + * 计量单号(外来接口数据主键) + */ + @ApiModelProperty("计量单号(外来接口数据主键)") + private String billNo; } 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 index 54ef5db..3091c02 100644 --- 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 @@ -1,19 +1,14 @@ 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.time.LocalDateTime; import java.util.List; import com.xjrsoft.module.system.vo.LngFileUploadVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + /** * @title: 表单出参 * @Author test01 @@ -250,8 +245,30 @@ public class LngPngMeasureSalesPurVo extends com.xjrsoft.common.model.base.BaseM /** * lngFileUpload */ - @ApiModelProperty("lngFileUpload子表") - private List fileList; - + @ApiModelProperty("lngFileUpload子表") + private List fileList; + /** + * 拒绝原因 + */ + @ApiModelProperty("拒绝原因") + private String rejNote; + + /** + * 顺序 + */ + @ApiModelProperty("顺序") + private Short sort; + + /** + * 来源(外来接口数据主键) + */ + @ApiModelProperty("来源(外来接口数据主键)") + private String dataSource; + + /** + * 计量单号(外来接口数据主键) + */ + @ApiModelProperty("计量单号(外来接口数据主键)") + private String billNo; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java index 2c2c2e5..39aa801 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractPurPngController.java @@ -1,10 +1,6 @@ package com.xjrsoft.module.contract.controller; -import java.util.Collections; import java.util.List; -import java.util.Map; -import java.util.stream.Collector; -import java.util.stream.Collectors; import javax.validation.Valid; @@ -31,7 +27,6 @@ import com.xjrsoft.module.contract.dto.LngContractPageDto; import com.xjrsoft.module.contract.dto.UpdateLngContractPurDto; import com.xjrsoft.module.contract.dto.UpdateLngContractPurPngPointDto; import com.xjrsoft.module.contract.dto.UpdateLngContractPurPngPointSalesDto; -import com.xjrsoft.module.contract.dto.UpdateLngContractSalesPngPointDto; import com.xjrsoft.module.contract.service.IContractPurPngService; import com.xjrsoft.module.contract.vo.LngContractPurPngPointSalesVo; import com.xjrsoft.module.contract.vo.LngContractPurPngPointVo; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java index f74072f..e14d14a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java @@ -36,7 +36,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; /** -* @title: 国内管道气采购 +* @title: 国内LNG销售 * @Author 管理员 * @Date: 2025-12-30 * @Version 1.0 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasurePurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasurePurController.java new file mode 100644 index 0000000..26bbd41 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasurePurController.java @@ -0,0 +1,219 @@ +package com.xjrsoft.module.dayPlan.controller; + +import java.util.Date; +import java.util.List; + +import javax.validation.Valid; + +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.api.client.util.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.SecureUtil; +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.LngPngMeasurePurPageDto; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngMeasurePurDto; +import com.xjrsoft.module.dayPlan.entity.LngPngMeasurePur; +import com.xjrsoft.module.dayPlan.service.IPngMeasurePurService; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasurePurPageVo; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasurePurVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +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 管理员 +* @Date: 2026-03-12 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/dayPlan/pngMeasurePur") +@Api(value = "/dayPlan" + "/pngMeasurePur",tags = "管道气计量(内部)代码") +@AllArgsConstructor +public class PngMeasurePurController { + + + private final IPngMeasurePurService pngMeasurePurService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngPngMeasurePur列表(分页)") + @SaCheckPermission("pngMeasurePur:list") + public R page(@Valid LngPngMeasurePurPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngPngMeasurePur::getId,dto.getId()) + //.between(ObjectUtil.isNotNull(dto.getDatePlanStart()) && ObjectUtil.isNotNull(dto.getDatePlanEnd()),LngPngMeasurePur::getDatePlan,dto.getDatePlanStart(),dto.getDatePlanEnd()) + //.between(ObjectUtil.isNotNull(dto.getDateMeaStart()) && ObjectUtil.isNotNull(dto.getDateMeaEnd()),LngPngMeasurePur::getDateMea,dto.getDateMeaStart(),dto.getDateMeaEnd()) + //.like(StrUtil.isNotBlank(dto.getCuCode()),LngPngMeasurePur::getCuCode,dto.getCuCode()) + .like(StrUtil.isNotBlank(dto.getPointDelyCode()),LngPngMeasurePur::getPointDelyCode,dto.getPointDelyCode()) + .like(StrUtil.isNotBlank(dto.getSuCode()),LngPngMeasurePur::getSuCode,dto.getSuCode()) + .like(StrUtil.isNotBlank(dto.getPointUpCode()),LngPngMeasurePur::getPointUpCode,dto.getPointUpCode()) + .orderByDesc(LngPngMeasurePur::getId) + .select(LngPngMeasurePur.class,x -> VoToColumnUtil.fieldsToColumns(LngPngMeasurePurPageVo.class).contains(x.getProperty())); + IPage page = pngMeasurePurService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngPngMeasurePurPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPngMeasurePur信息") + @SaCheckPermission("pngMeasurePur:detail") + public R info(@RequestParam Long id){ + LngPngMeasurePurVo LngPngMeasurePur = pngMeasurePurService.getInfoById(id); + return R.ok(LngPngMeasurePur); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPngMeasurePur数据详细日志") + @SaCheckPermission("pngMeasurePur:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngPngMeasurePurDto.class,id); + return R.ok(logs); + } + + + @PostMapping(value = "/submit") + @ApiOperation(value = "确认LngPngMeasurePur") + @SaCheckPermission("pngMeasurePur:submit") + public R submit(@Valid @RequestBody List ids){ + + List list = pngMeasurePurService.getListByIds(ids); + for(LngPngMeasurePur temp: list) { + if(temp == null || !"JLZ".equals(temp.getStatusCode()) ) { + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中的数据才能进行确认！")); + } + temp.setCfmEmpId(SecureUtil.getCurrentUserId()); + temp.setCfmEmpTime(new Date()); + } + return R.ok(dataService.updateBatch(list,new DataOperationListener() { + + @Override + public LngPngMeasurePur before(DataOperationContent content) { + return null; + } + + @Override + public LngPngMeasurePur after(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_confirm(?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + })); + } + + @PostMapping(value = "/cancel") + @ApiOperation(value = "取消确认LngPngMeasurePur") + @SaCheckPermission("pngMeasurePur:cancel") + public R cancel(@Valid @RequestBody List ids){ + List list = pngMeasurePurService.getListByIds(ids); + for(LngPngMeasurePur temp: list) { + if(temp == null || !"JLWC".equals(temp.getStatusCode()) ) { + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量完成的数据才能进行取消！")); + } + temp.setCfmCuUserId(null); + temp.setCfmCuUserTime(null); + temp.setCfmEmpId(null); + temp.setCfmEmpTime(null); + } + return R.ok(dataService.updateBatch(list,new DataOperationListener() { + + @Override + public LngPngMeasurePur before(DataOperationContent content) { + return null; + } + + @Override + public LngPngMeasurePur after(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_confirm_x(?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + })); + } + + @PostMapping(value = "/reject") + @ApiOperation(value = "驳回LngPngMeasurePur") + @SaCheckPermission("pngMeasurePur:reject") + public R reject(@Valid @RequestBody UpdateLngPngMeasurePurDto params){ + List list = pngMeasurePurService.getListByIds(params.getIds()); + for(LngPngMeasurePur temp: list) { + if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() != null) { + temp.setCfmCuUserId(null); + temp.setCfmCuUserTime(null); + temp.setRejNote(params.getRejNote()); + }else { + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中且客户已确认的数据才能进行驳回！")); + } + + } + return R.ok(dataService.updateBatch(list,new DataOperationListener() { + + @Override + public LngPngMeasurePur before(DataOperationContent content) { + return null; + } + + @Override + public LngPngMeasurePur after(DataOperationContent content) { + + return null; + } + })); + } + + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("pngMeasurePur:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngPngMeasurePurDto.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/controller/PngMeasureSalesPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java index b5e03bf..65c91ce 100644 --- 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 @@ -5,6 +5,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; import javax.validation.Valid; @@ -23,8 +24,15 @@ 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.google.api.client.util.Lists; import com.pictc.datalog.DataOperationContent; import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -35,6 +43,7 @@ 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.LngPngMeasurePur; import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService; import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurPageVo; @@ -112,7 +121,15 @@ public class PngMeasureSalesPurController { @ApiOperation(value = "保存LngPngMeasureSalesPur") @SaCheckPermission("pngMeasureSalesPur:save") public R save(@Valid @RequestBody List dtoList){ - + List ids = dtoList.stream().map(UpdateLngPngMeasureSalesPurDto::getId).collect(Collectors.toList()); + List list = pngMeasureSalesPurService.getListByIds(ids); + for(LngPngMeasureSalesPur temp: list) { + if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() == null && temp.getDataSource() == null ) { + + }else { + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中、且客户未确认且来源不为空的数据才能进行确认！")); + } + } return R.ok(dataService.insertBatch(dtoList,new DataOperationListener() { @Override @@ -122,8 +139,24 @@ public class PngMeasureSalesPurController { @Override public UpdateLngPngMeasureSalesPurDto after(DataOperationContent content) { - - return null; + String sql = StringUtils.format("{? = call pc_{0}.f_save(?,?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + if(ids.contains(content.getIdValue())){ + params.add(JdbcParam.ofString("U")); + }else { + params.add(JdbcParam.ofString("I")); + } + + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); } })); } @@ -132,6 +165,15 @@ public class PngMeasureSalesPurController { @ApiOperation(value = "保存并确认LngPngMeasureSalesPur") @SaCheckPermission("pngMeasureSalesPur:submit") public R submit(@Valid @RequestBody List dtoList){ + List ids = dtoList.stream().map(UpdateLngPngMeasureSalesPurDto::getId).collect(Collectors.toList()); + List list = pngMeasureSalesPurService.getListByIds(ids); + for(LngPngMeasureSalesPur temp: list) { + if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() == null) { + + }else { + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中且客户未确认的数据才能进行确认！")); + } + } for(UpdateLngPngMeasureSalesPurDto dto: dtoList) { dto.setCfmCuUserId(SecureUtil.getCurrentUserId()); dto.setCfmCuUserTime(new Date()); @@ -145,8 +187,19 @@ public class PngMeasureSalesPurController { @Override public UpdateLngPngMeasureSalesPurDto after(DataOperationContent content) { - - return null; + String sql = StringUtils.format("{? = call pc_{0}.f_save(?,?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + params.add(JdbcParam.ofString("U")); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); } })); } @@ -155,11 +208,18 @@ public class PngMeasureSalesPurController { @ApiOperation(value = "取消确认LngPngMeasureSalesPur") @SaCheckPermission("pngMeasureSalesPur:cancel") public R cancel(@Valid @RequestBody List dtoList){ + List ids = dtoList.stream().map(UpdateLngPngMeasureSalesPurDto::getId).collect(Collectors.toList()); + List list = pngMeasureSalesPurService.getListByIds(ids); + for(LngPngMeasureSalesPur temp: list) { + if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() != null) { + + }else { + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中且客户已确认的数据才能进行取消确认！")); + } + } for(UpdateLngPngMeasureSalesPurDto dto: dtoList) { dto.setCfmCuUserId(null); dto.setCfmCuUserTime(null); - dto.setCfmEmpId(null); - dto.setCfmEmpTime(null); } return R.ok(dataService.insertBatch(dtoList,new DataOperationListener() { @@ -176,58 +236,32 @@ public class PngMeasureSalesPurController { })); } - @PostMapping(value = "/reject") - @ApiOperation(value = "驳回LngPngMeasureSalesPur") - @SaCheckPermission("pngMeasureSalesPur:reject") - public R reject(@Valid @RequestBody List dtoList){ - for(UpdateLngPngMeasureSalesPurDto dto: dtoList) { - dto.setCfmEmpId(null); - dto.setCfmEmpTime(null); - } - return R.ok(dataService.insertBatch(dtoList,new DataOperationListener() { - - @Override - public UpdateLngPngMeasureSalesPurDto before(DataOperationContent content) { - return null; - } - - @Override - public UpdateLngPngMeasureSalesPurDto after(DataOperationContent content) { - - return null; - } - })); - } - - @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("pngMeasureSalesPur:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngPngMeasureSalesPurDto.class, ids)); + List list = pngMeasureSalesPurService.getListByIds(ids); + for(LngPngMeasureSalesPur temp: list) { + if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getDataSource() == null) { + + }else { + throw new BusinessException(BusinessCode.of(10500, "只有状态是计量中的手工录入记录可以删除！")); + } + } + return R.ok(dataService.deleteByIds(UpdateLngPngMeasureSalesPurDto.class, ids,new DataOperationListener() { + + @Override + public UpdateLngPngMeasureSalesPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngMeasureSalesPurDto after(DataOperationContent content) { + + return null; + } + })); } - - @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/LngPngMeasurePur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngMeasurePur.java new file mode 100644 index 0000000..9f407e1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngMeasurePur.java @@ -0,0 +1,313 @@ +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 com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 管道气计量(内部) +* @Author 管理员 +* @Date: 2026-03-12 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_measure_sales_pur") +@LogTable(source="lng_png_measure_sales_pur",name="管道气计量(内部)") +@ApiModel(value = "管道气计量(内部)对象", description = "管道气计量(内部)") +public class LngPngMeasurePur implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @LogField(name="主键",index=0) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 日计划-管道气-销售主键(lng_png_sales.id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") + @LogField(name="日计划-管道气-销售主键(lng_png_sales.id)",index=1) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long salesId; + + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + @LogField(name="日计划-管道气-销售-采购主键(lng_png_sales_pur.id)",index=2) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long salesPurId; + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @LogField(name="计划日期",index=3) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime datePlan; + + /** + * 计量日期(缺省=计划日期+1) + */ + @ApiModelProperty("计量日期(缺省=计划日期+1)") + @LogField(name="计量日期(缺省=计划日期+1)",index=4) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateMea; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + @LogField(name="客户编码",index=5) + private String cuCode; + + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + @LogField(name="交易主体编码(天然气公司/惠贸)",index=6) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + @LogField(name="合同-主信息主键",index=7) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksId; + + /** + * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)") + @LogField(name="合同-国内销售-管道气-交割点主键",index=8) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksppId; + + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + @LogField(name="交割点编码",index=9) + private String pointDelyCode; + + /** + * 供应商 + */ + @ApiModelProperty("供应商") + @LogField(name="供应商",index=10) + private String suCode; + + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + @LogField(name="采购合同-主信息主键",index=11) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpId; + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + @LogField(name="合同-国内采购-管道气-上载点主键",index=12) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpppId; + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + @LogField(name="上载点",index=13) + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + @LogField(name="自主托运(Y-是，N-否)",index=14) + private String transSign; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + @LogField(name="比值(方/吉焦)",index=15) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 日批复量(吉焦) + */ + @ApiModelProperty("日批复量(吉焦)") + @LogField(name="日批复量(吉焦)",index=16) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySalesGj; + + /** + * 日批复量(方) + */ + @ApiModelProperty("日批复量(方)") + @LogField(name="日批复量(方)",index=17) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySalesM3; + + /** + * 日完成量(吉焦) + */ + @ApiModelProperty("日完成量(吉焦)") + @LogField(name="日完成量(吉焦)",index=18) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaGj; + + /** + * 日完成量(方) + */ + @ApiModelProperty("日完成量(方)") + @LogField(name="日完成量(方)",index=19) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaM3; + + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + @LogField(name="客户确认人",index=20) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long cfmCuUserId; + + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + @LogField(name="客户确认时间",index=21) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object cfmCuUserTime; + + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + @LogField(name="内部确认人",index=22) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long cfmEmpId; + + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + @LogField(name="内部确认时间",index=23) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object cfmEmpTime; + + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + @LogField(name="驳回意见",index=24) + private String rejNote; + + /** + * 顺序 + */ + @ApiModelProperty("顺序") + @LogField(name="顺序",index=25) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short sort; + + /** + * 来源(外来接口数据主键) + */ + @ApiModelProperty("来源(外来接口数据主键)") + @LogField(name="来源(外来接口数据主键)",index=26) + private String dataSource; + + /** + * 计量单号(外来接口数据主键) + */ + @ApiModelProperty("计量单号(外来接口数据主键)") + @LogField(name="计量单号(外来接口数据主键)",index=27) + private String billNo; + + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=28) + 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) + @LogField(name="租户id",index=29) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + @LogField(name="部门id",index=30) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @LogField(name="数据权限id",index=31) + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + @TableField(exist = false) + private String statusCode; + +} \ No newline at end of file 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 index 1651f2a..3795268 100644 --- 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 @@ -9,6 +9,7 @@ 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.pictc.annotations.datalog.LogField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -247,6 +248,35 @@ public class LngPngMeasureSalesPur implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private Long ruleUserId; - + /** + * 拒绝原因 + */ + @ApiModelProperty("拒绝原因") + private String rejNote; + + @TableField(exist = false) + private String statusCode; + + /** + * 顺序 + */ + @ApiModelProperty("顺序") + @LogField(name="顺序",index=25) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short sort; + + /** + * 来源(外来接口数据主键) + */ + @ApiModelProperty("来源(外来接口数据主键)") + @LogField(name="来源(外来接口数据主键)",index=26) + private String dataSource; + + /** + * 计量单号(外来接口数据主键) + */ + @ApiModelProperty("计量单号(外来接口数据主键)") + @LogField(name="计量单号(外来接口数据主键)",index=27) + private String billNo; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java index 7453faf..b78cc4d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java @@ -1,21 +1,20 @@ 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.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; +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; -import java.io.Serializable; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java new file mode 100644 index 0000000..555af1f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java @@ -0,0 +1,37 @@ +package com.xjrsoft.module.dayPlan.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.dayPlan.entity.LngPngMeasurePur; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-12 +* @Version 1.0 +*/ +@Mapper +public interface LngPngMeasurePurMapper extends BaseMapper { + + @Select("SELECT msp.*, IF(sh.appro_code='YSP','YJS',if(sh.id IS NOT NULL,'JSZ',IF(msp.cfm_emp_id IS NOT NULL,'JLWC','JLZ'))) AS status_code " + + " FROM lng_png_measure_sales_pur msp "+ + " LEFT JOIN lng_png_settle_pur sp ON sp.sales_pur_id=msp.sales_pur_id "+ + " AND sp.settle_times=1 "+ + " LEFT JOIN lng_png_settle_hdr sh ON sh.id=sp.settle_hdr_id "+ + " ${ew.customSqlSegment} " + + " ORDER BY date_plan, status_code, cu_code, su_code ") + //LngPngMeasurePur> queryLngPngMeasurePurById(@Param("id")Long id); + + List queryLngPngMeasurePurListByIds(List ids,@Param("ew") QueryWrapper queryWrapper); + + + + +} 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 index 9a42883..3b9551f 100644 --- 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 @@ -1,9 +1,15 @@ 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 java.util.List; + import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; /** * @title: mapper @@ -13,5 +19,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface LngPngMeasureSalesPurMapper extends BaseMapper { + + @Select("SELECT msp.*, IF(sh.appro_code='YSP','YJS',if(sh.id IS NOT NULL,'JSZ',IF(msp.cfm_emp_id IS NOT NULL,'JLWC','JLZ'))) AS status_code " + + " FROM lng_png_measure_sales_pur msp "+ + " LEFT JOIN lng_png_settle_pur sp ON sp.sales_pur_id=msp.sales_pur_id "+ + " AND sp.settle_times=1 "+ + " LEFT JOIN lng_png_settle_hdr sh ON sh.id=sp.settle_hdr_id "+ + " ${ew.customSqlSegment} " + + " ORDER BY date_plan, status_code, cu_code, su_code ") + List queryLngPngMeasureSalesPurListByIds(List ids, + @Param("ew") QueryWrapper queryWrapper); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasurePurService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasurePurService.java new file mode 100644 index 0000000..0b12b6d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasurePurService.java @@ -0,0 +1,21 @@ +package com.xjrsoft.module.dayPlan.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xjrsoft.module.dayPlan.entity.LngPngMeasurePur; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasurePurVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-12 +* @Version 1.0 +*/ + +public interface IPngMeasurePurService extends IService { + + LngPngMeasurePurVo getInfoById(Long id); + + List getListByIds(List ids); +} 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 index eb536b9..80d6f5a 100644 --- 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 @@ -1,5 +1,7 @@ package com.xjrsoft.module.dayPlan.service; +import java.util.List; + import com.baomidou.mybatisplus.extension.service.IService; import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo; @@ -14,4 +16,6 @@ import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo; public interface IPngMeasureSalesPurService extends IService { LngPngMeasureSalesPurVo getInfoById(Long id); + + List getListByIds(List ids); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java new file mode 100644 index 0000000..66cc312 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java @@ -0,0 +1,57 @@ +package com.xjrsoft.module.dayPlan.service.impl; + +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.module.contract.entity.LngContract; +import com.xjrsoft.module.contract.vo.LngContractPageVo; +import com.xjrsoft.module.dayPlan.entity.LngPngMeasurePur; +import com.xjrsoft.module.dayPlan.mapper.LngPngMeasurePurMapper; +import com.xjrsoft.module.dayPlan.service.IPngMeasurePurService; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasurePurVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-12 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PngMeasurePurServiceImpl extends ServiceImpl implements IPngMeasurePurService { + +private final IFileClient fileClient; + + @Override + public LngPngMeasurePurVo getInfoById(Long id) { + LngPngMeasurePur lngPngMeasurePur = this.getById(id); + if(lngPngMeasurePur == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + LngPngMeasurePurVo vo = BeanUtil.toBean(lngPngMeasurePur, LngPngMeasurePurVo.class); + List fileList = fileClient.getTableFiles("lng_png_measure_sales_pur", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } + + @Override + public List getListByIds(List ids) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("msp.id", ids); + return this.baseMapper.queryLngPngMeasurePurListByIds(ids, queryWrapper); + + } +} 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 index 61a4f34..662cff3 100644 --- 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 @@ -4,9 +4,11 @@ import java.util.List; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pictc.enums.BusinessCode; import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.contract.entity.LngContract; import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; import com.xjrsoft.module.dayPlan.mapper.LngPngMeasureSalesPurMapper; import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService; @@ -41,4 +43,12 @@ public class PngMeasureSalesPurServiceImpl extends ServiceImpl getListByIds(List ids) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("msp.id", ids); + return this.baseMapper.queryLngPngMeasureSalesPurListByIds(ids, queryWrapper); + } }