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 1/4] 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); + } } From fda4f5d85c3c3bf27d2d2498bc12fa6ac5c59744 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Wed, 18 Mar 2026 16:43:53 +0800 Subject: [PATCH 2/4] update --- .../module/dayPlan/vo/LngPngMeasurePurVo.java | 27 +++++++++---------- .../dayPlan/vo/LngPngMeasureSalesPurVo.java | 2 +- .../PngMeasureSalesPurController.java | 2 +- .../mapper/LngPngMeasurePurMapper.java | 2 +- .../mapper/LngPngMeasureSalesPurMapper.java | 2 +- .../impl/PngMeasurePurServiceImpl.java | 9 ++----- .../impl/PngMeasureSalesPurServiceImpl.java | 7 +++-- 7 files changed, 21 insertions(+), 30 deletions(-) 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 index 24c3733..9c66075 100644 --- 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 @@ -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 管理员 @@ -64,21 +59,21 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("客户编码") private String cuCode; - + private String cuName; /** * 交易主体编码(天然气公司/惠贸) */ @ApiModelProperty("交易主体编码(天然气公司/惠贸)") private Long comId; - + private String comName; /** * 合同-主信息主键（销售）(lng_contract) */ @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") private Long ksId; - + private String ksName; /** * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta) */ @@ -99,6 +94,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("供应商") private String suCode; + private String suName; /** * 采购合同-主信息主键 @@ -106,7 +102,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("采购合同-主信息主键") private Long kpId; - + private String kpName; /** * 合同-国内采购-管道气-上载点主键 */ @@ -120,7 +116,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("上载点") private String pointUpCode; - + private String pointUpName; /** * 自主托运(Y-是，N-否) */ @@ -169,6 +165,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("客户确认人") private Long cfmCuUserId; + private String cfmCuUserName; /** * 客户确认时间 @@ -183,7 +180,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("内部确认人") private Long cfmEmpId; - + private String cfmEmpName; /** * 内部确认时间 */ 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 3091c02..dfb8078 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 @@ -246,7 +246,7 @@ public class LngPngMeasureSalesPurVo extends com.xjrsoft.common.model.base.BaseM * lngFileUpload */ @ApiModelProperty("lngFileUpload子表") - private List fileList; + private List lngFileUploadList; /** * 拒绝原因 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 65c91ce..78d0c8d 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 @@ -127,7 +127,7 @@ public class PngMeasureSalesPurController { if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() == null && temp.getDataSource() == null ) { }else { - throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中、且客户未确认且来源不为空的数据才能进行确认！")); + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中、且客户未确认且来源不为空的数据才能进行保存！")); } } return R.ok(dataService.insertBatch(dtoList,new DataOperationListener() { 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 index 555af1f..22517f9 100644 --- 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 @@ -29,7 +29,7 @@ public interface LngPngMeasurePurMapper extends BaseMapper { " ORDER BY date_plan, status_code, cu_code, su_code ") //LngPngMeasurePur> queryLngPngMeasurePurById(@Param("id")Long id); - List queryLngPngMeasurePurListByIds(List ids,@Param("ew") QueryWrapper queryWrapper); + 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 3b9551f..ddb663f 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 @@ -28,6 +28,6 @@ public interface LngPngMeasureSalesPurMapper extends BaseMapper queryLngPngMeasureSalesPurListByIds(List ids, - @Param("ew") QueryWrapper queryWrapper); + @Param("ew") QueryWrapper queryWrapper); } 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 index 66cc312..e280228 100644 --- 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 @@ -2,17 +2,12 @@ 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; @@ -33,7 +28,7 @@ import lombok.AllArgsConstructor; @AllArgsConstructor public class PngMeasurePurServiceImpl extends ServiceImpl implements IPngMeasurePurService { -private final IFileClient fileClient; + private final IFileClient fileClient; @Override public LngPngMeasurePurVo getInfoById(Long id) { @@ -49,7 +44,7 @@ private final IFileClient fileClient; @Override public List getListByIds(List ids) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + 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 662cff3..0592774 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 @@ -8,7 +8,6 @@ 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; @@ -39,15 +38,15 @@ public class PngMeasureSalesPurServiceImpl extends ServiceImpl fileList = fileClient.getTableFiles("lng_png_measure_sales_pur", "fileList", vo.getId()); - vo.setFileList(fileList); + 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 queryWrapper = new QueryWrapper<>(); queryWrapper.in("msp.id", ids); return this.baseMapper.queryLngPngMeasureSalesPurListByIds(ids, queryWrapper); } From 7b4e8690ebe491d7b1e8080b7dc22af943174d75 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 19 Mar 2026 11:26:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?LNG=E8=AE=A1=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dayPlan/dto/AddLngLngMeasureDto.java | 170 ++++++++++ .../dayPlan/dto/AddLngLngMeasurePurDto.java | 170 ++++++++++ .../dayPlan/dto/LngLngMeasurePageDto.java | 122 +++++++ .../dayPlan/dto/LngLngMeasurePurPageDto.java | 128 +++++++ .../dayPlan/dto/UpdateLngLngMeasureDto.java | 260 +++++++++++++++ .../dto/UpdateLngLngMeasurePurDto.java | 261 +++++++++++++++ .../dayPlan/vo/LngLngMeasurePageVo.java | 118 +++++++ .../dayPlan/vo/LngLngMeasurePurPageVo.java | 123 +++++++ .../module/dayPlan/vo/LngLngMeasurePurVo.java | 290 ++++++++++++++++ .../module/dayPlan/vo/LngLngMeasureVo.java | 285 ++++++++++++++++ .../controller/LngMeasurePurController.java | 217 ++++++++++++ .../controller/LngMeasureSalesController.java | 262 +++++++++++++++ .../module/dayPlan/entity/LngLngMeasure.java | 278 ++++++++++++++++ .../dayPlan/entity/LngLngMeasurePur.java | 312 ++++++++++++++++++ .../dayPlan/mapper/LngLngMeasureMapper.java | 32 ++ .../mapper/LngLngMeasurePurMapper.java | 31 ++ .../service/ILngMeasurePurService.java | 21 ++ .../service/ILngMeasureSalesService.java | 22 ++ .../impl/LngMeasurePurServiceImpl.java | 56 ++++ .../impl/LngMeasureSalesServiceImpl.java | 56 ++++ 20 files changed, 3214 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngLngMeasureDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngLngMeasurePurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngLngMeasurePageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngLngMeasurePurPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasureDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasurePurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasureVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/LngMeasurePurController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/LngMeasureSalesController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngLngMeasure.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngLngMeasurePur.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngLngMeasureMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngLngMeasurePurMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/ILngMeasurePurService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/ILngMeasureSalesService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/LngMeasurePurServiceImpl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/LngMeasureSalesServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngLngMeasureDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngLngMeasureDto.java new file mode 100644 index 0000000..5a963ba --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngLngMeasureDto.java @@ -0,0 +1,170 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: LNG计量(客户) +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Data +public class AddLngLngMeasureDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 销售日计划主键 + */ + @ApiModelProperty("销售日计划主键") + private Long salesId; + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + /** + * 客户 + */ + @ApiModelProperty("客户") + private String cuCode; + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 采购合同主键 + */ + @ApiModelProperty("采购合同主键") + private Long kpId; + /** + * 吨/吉焦(计量时写入) + */ + @ApiModelProperty("吨/吉焦(计量时写入)") + private BigDecimal rateTonGj; + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + /** + * 卸车量(吨)(隐藏，预留) + */ + @ApiModelProperty("卸车量(吨)(隐藏，预留)") + private BigDecimal qtyTonUnloading; + /** + * 采购计量量(吨)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吨)(隐藏，预留)") + private BigDecimal qtyMeaTonPur; + /** + * 采购计量量(吉焦)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吉焦)(隐藏，预留)") + private BigDecimal qtyMeaGjPur; + /** + * 采购计量量(方)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(方)(隐藏，预留)") + private BigDecimal qtyMeaM3Pur; + /** + * 销售计量量(吨) + */ + @ApiModelProperty("销售计量量(吨)") + private BigDecimal qtyMeaTonSales; + /** + * 销售计量量(吉焦) + */ + @ApiModelProperty("销售计量量(吉焦)") + private BigDecimal qtyMeaGjSales; + /** + * 销售计量量(方) + */ + @ApiModelProperty("销售计量量(方)") + private BigDecimal qtyMeaM3Sales; + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + private Object timeIn; + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + private Object timeOut; + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + private String xCode; + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + private String rejNote; + /** + * 来源(外来接口数据主键) + */ + @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/AddLngLngMeasurePurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngLngMeasurePurDto.java new file mode 100644 index 0000000..ed0cfea --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngLngMeasurePurDto.java @@ -0,0 +1,170 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: LNG计量(业务) +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Data +public class AddLngLngMeasurePurDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 销售日计划主键 + */ + @ApiModelProperty("销售日计划主键") + private Long salesId; + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + /** + * 客户 + */ + @ApiModelProperty("客户") + private String cuCode; + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 采购合同主键 + */ + @ApiModelProperty("采购合同主键") + private Long kpId; + /** + * 吨/吉焦(计量时写入) + */ + @ApiModelProperty("吨/吉焦(计量时写入)") + private BigDecimal rateTonGj; + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + /** + * 卸车量(吨)(隐藏，预留) + */ + @ApiModelProperty("卸车量(吨)(隐藏，预留)") + private BigDecimal qtyTonUnloading; + /** + * 采购计量量(吨)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吨)(隐藏，预留)") + private BigDecimal qtyMeaTonPur; + /** + * 采购计量量(吉焦)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吉焦)(隐藏，预留)") + private BigDecimal qtyMeaGjPur; + /** + * 采购计量量(方)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(方)(隐藏，预留)") + private BigDecimal qtyMeaM3Pur; + /** + * 销售计量量(吨) + */ + @ApiModelProperty("销售计量量(吨)") + private BigDecimal qtyMeaTonSales; + /** + * 销售计量量(吉焦) + */ + @ApiModelProperty("销售计量量(吉焦)") + private BigDecimal qtyMeaGjSales; + /** + * 销售计量量(方) + */ + @ApiModelProperty("销售计量量(方)") + private BigDecimal qtyMeaM3Sales; + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + private Object timeIn; + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + private Object timeOut; + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + private String xCode; + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + private String rejNote; + /** + * 来源(外来接口数据主键) + */ + @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/LngLngMeasurePageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngLngMeasurePageDto.java new file mode 100644 index 0000000..e4742ea --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngLngMeasurePageDto.java @@ -0,0 +1,122 @@ +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-13 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngLngMeasurePageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime datePlan; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + private String xCode; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + private Object timeIn; + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + private Object timeOut; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime modifyDate; + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + private String rejNote; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngLngMeasurePurPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngLngMeasurePurPageDto.java new file mode 100644 index 0000000..5a8a41f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngLngMeasurePurPageDto.java @@ -0,0 +1,128 @@ +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; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngLngMeasurePurPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime datePlan; + /** + * 客户 + */ + @ApiModelProperty("客户") + private String cuCode; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime modifyDate; + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + private Object timeIn; + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + private Object timeOut; + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + /** + * 销售日计划主键 + */ + @ApiModelProperty("销售日计划主键") + private Long salesId; + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + private String rejNote; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasureDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasureDto.java new file mode 100644 index 0000000..27f727e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasureDto.java @@ -0,0 +1,260 @@ +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 java.sql.Timestamp; + +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.LogAttrField; +import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + + + + +/** +* @title: LNG计量(客户) +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_lng_measure",name="LNG计量(客户)") +public class UpdateLngLngMeasureDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 销售日计划主键 + */ + @LogField(name="销售日计划主键",index=1) + @ApiModelProperty("销售日计划主键") + private Long salesId; + + /** + * 计划日期 + */ + @LogField(name="计划日期",index=2) + @ApiModelProperty("计划日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime datePlan; + + /** + * 客户 + */ + @LogField(name="客户",index=3) + @ApiModelProperty("客户") + private String cuCode; + + /** + * 交易主体编码(天然气公司/惠贸) + */ + @LogField(name="交易主体编码(天然气公司/惠贸)",index=4) + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + + /** + * 销售合同主键(窗口期可空) + */ + @LogField(name="销售合同主键(窗口期可空)",index=5) + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + + /** + * 气源地 + */ + @LogField(name="气源地",index=6) + @ApiModelProperty("气源地") + private String staCode; + + /** + * 供应商 + */ + @LogField(name="供应商",index=7) + @ApiModelProperty("供应商") + private String suCode; + + /** + * 采购合同主键 + */ + @LogField(name="采购合同主键",index=8) + @ApiModelProperty("采购合同主键") + private Long kpId; + + /** + * 吨/吉焦(计量时写入) + */ + @LogField(name="吨/吉焦(计量时写入)",index=9) + @ApiModelProperty("吨/吉焦(计量时写入)") + private BigDecimal rateTonGj; + + /** + * 装车量(吨)(隐藏，预留) + */ + @LogField(name="装车量(吨)(隐藏，预留)",index=10) + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + + /** + * 卸车量(吨)(隐藏，预留) + */ + @LogField(name="卸车量(吨)(隐藏，预留)",index=11) + @ApiModelProperty("卸车量(吨)(隐藏，预留)") + private BigDecimal qtyTonUnloading; + + /** + * 采购计量量(吨)(隐藏，预留) + */ + @LogField(name="采购计量量(吨)(隐藏，预留)",index=12) + @ApiModelProperty("采购计量量(吨)(隐藏，预留)") + private BigDecimal qtyMeaTonPur; + + /** + * 采购计量量(吉焦)(隐藏，预留) + */ + @LogField(name="采购计量量(吉焦)(隐藏，预留)",index=13) + @ApiModelProperty("采购计量量(吉焦)(隐藏，预留)") + private BigDecimal qtyMeaGjPur; + + /** + * 采购计量量(方)(隐藏，预留) + */ + @LogField(name="采购计量量(方)(隐藏，预留)",index=14) + @ApiModelProperty("采购计量量(方)(隐藏，预留)") + private BigDecimal qtyMeaM3Pur; + + /** + * 销售计量量(吨) + */ + @LogField(name="销售计量量(吨)",index=15) + @ApiModelProperty("销售计量量(吨)") + private BigDecimal qtyMeaTonSales; + + /** + * 销售计量量(吉焦) + */ + @LogField(name="销售计量量(吉焦)",index=16) + @ApiModelProperty("销售计量量(吉焦)") + private BigDecimal qtyMeaGjSales; + + /** + * 销售计量量(方) + */ + @LogField(name="销售计量量(方)",index=17) + @ApiModelProperty("销售计量量(方)") + private BigDecimal qtyMeaM3Sales; + + /** + * 进厂皮重时间/装车时间 + */ + @LogField(name="进厂皮重时间/装车时间",index=18) + @ApiModelProperty("进厂皮重时间/装车时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp timeIn; + + /** + * 出厂毛重时间/卸车时间 + */ + @LogField(name="出厂毛重时间/卸车时间",index=19) + @ApiModelProperty("出厂毛重时间/卸车时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp timeOut; + + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @LogField(name="取消/脱装(QX-取消，TZ-脱装，空-正常计量)",index=20) + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + private String xCode; + + /** + * 客户确认人 + */ + @LogField(name="客户确认人",index=21) + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + + /** + * 客户确认时间 + */ + @LogField(name="客户确认时间",index=22) + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + + /** + * 内部确认人 + */ + @LogField(name="内部确认人",index=23) + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + + /** + * 内部确认时间 + */ + @LogField(name="内部确认时间",index=24) + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + + /** + * 驳回意见 + */ + @LogField(name="驳回意见",index=25) + @ApiModelProperty("驳回意见") + private String rejNote; + + /** + * 来源(外来接口数据主键) + */ + @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; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasurePurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasurePurDto.java new file mode 100644 index 0000000..ca2a337 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasurePurDto.java @@ -0,0 +1,261 @@ +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 java.sql.Timestamp; + +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.LogAttrField; +import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; + + + + +/** +* @title: LNG计量(业务) +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_lng_measure",name="LNG计量(业务)") +public class UpdateLngLngMeasurePurDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 销售日计划主键 + */ + @LogField(name="销售日计划主键",index=1) + @ApiModelProperty("销售日计划主键") + private Long salesId; + + /** + * 计划日期 + */ + @LogField(name="计划日期",index=2) + @ApiModelProperty("计划日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime datePlan; + + /** + * 客户 + */ + @LogField(name="客户",index=3) + @ApiModelProperty("客户") + private String cuCode; + + /** + * 交易主体编码(天然气公司/惠贸) + */ + @LogField(name="交易主体编码(天然气公司/惠贸)",index=4) + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + + /** + * 销售合同主键(窗口期可空) + */ + @LogField(name="销售合同主键(窗口期可空)",index=5) + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + + /** + * 气源地 + */ + @LogField(name="气源地",index=6) + @ApiModelProperty("气源地") + private String staCode; + + /** + * 供应商 + */ + @LogField(name="供应商",index=7) + @ApiModelProperty("供应商") + private String suCode; + + /** + * 采购合同主键 + */ + @LogField(name="采购合同主键",index=8) + @ApiModelProperty("采购合同主键") + private Long kpId; + + /** + * 吨/吉焦(计量时写入) + */ + @LogField(name="吨/吉焦(计量时写入)",index=9) + @ApiModelProperty("吨/吉焦(计量时写入)") + private BigDecimal rateTonGj; + + /** + * 装车量(吨)(隐藏，预留) + */ + @LogField(name="装车量(吨)(隐藏，预留)",index=10) + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + + /** + * 卸车量(吨)(隐藏，预留) + */ + @LogField(name="卸车量(吨)(隐藏，预留)",index=11) + @ApiModelProperty("卸车量(吨)(隐藏，预留)") + private BigDecimal qtyTonUnloading; + + /** + * 采购计量量(吨)(隐藏，预留) + */ + @LogField(name="采购计量量(吨)(隐藏，预留)",index=12) + @ApiModelProperty("采购计量量(吨)(隐藏，预留)") + private BigDecimal qtyMeaTonPur; + + /** + * 采购计量量(吉焦)(隐藏，预留) + */ + @LogField(name="采购计量量(吉焦)(隐藏，预留)",index=13) + @ApiModelProperty("采购计量量(吉焦)(隐藏，预留)") + private BigDecimal qtyMeaGjPur; + + /** + * 采购计量量(方)(隐藏，预留) + */ + @LogField(name="采购计量量(方)(隐藏，预留)",index=14) + @ApiModelProperty("采购计量量(方)(隐藏，预留)") + private BigDecimal qtyMeaM3Pur; + + /** + * 销售计量量(吨) + */ + @LogField(name="销售计量量(吨)",index=15) + @ApiModelProperty("销售计量量(吨)") + private BigDecimal qtyMeaTonSales; + + /** + * 销售计量量(吉焦) + */ + @LogField(name="销售计量量(吉焦)",index=16) + @ApiModelProperty("销售计量量(吉焦)") + private BigDecimal qtyMeaGjSales; + + /** + * 销售计量量(方) + */ + @LogField(name="销售计量量(方)",index=17) + @ApiModelProperty("销售计量量(方)") + private BigDecimal qtyMeaM3Sales; + + /** + * 进厂皮重时间/装车时间 + */ + @LogField(name="进厂皮重时间/装车时间",index=18) + @ApiModelProperty("进厂皮重时间/装车时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp timeIn; + + /** + * 出厂毛重时间/卸车时间 + */ + @LogField(name="出厂毛重时间/卸车时间",index=19) + @ApiModelProperty("出厂毛重时间/卸车时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp timeOut; + + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @LogField(name="取消/脱装(QX-取消，TZ-脱装，空-正常计量)",index=20) + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + private String xCode; + + /** + * 客户确认人 + */ + @LogField(name="客户确认人",index=21) + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + + /** + * 客户确认时间 + */ + @LogField(name="客户确认时间",index=22) + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + + /** + * 内部确认人 + */ + @LogField(name="内部确认人",index=23) + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + + /** + * 内部确认时间 + */ + @LogField(name="内部确认时间",index=24) + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + + /** + * 驳回意见 + */ + @LogField(name="驳回意见",index=25) + @ApiModelProperty("驳回意见") + private String rejNote; + + /** + * 来源(外来接口数据主键) + */ + @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; + + private List ids; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePageVo.java new file mode 100644 index 0000000..f5cc30c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePageVo.java @@ -0,0 +1,118 @@ +package com.xjrsoft.module.dayPlan.vo; + +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 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Data +public class LngLngMeasurePageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + private Object timeIn; + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + private Object timeOut; + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + private String xCode; + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + private String rejNote; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurPageVo.java new file mode 100644 index 0000000..68c4d18 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurPageVo.java @@ -0,0 +1,123 @@ +package com.xjrsoft.module.dayPlan.vo; + +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 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Data +public class LngLngMeasurePurPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 销售日计划主键 + */ + @ApiModelProperty("销售日计划主键") + private Long salesId; + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + /** + * 客户 + */ + @ApiModelProperty("客户") + private String cuCode; + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + private Object timeIn; + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + private Object timeOut; + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + private String rejNote; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurVo.java new file mode 100644 index 0000000..0a046c6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurVo.java @@ -0,0 +1,290 @@ +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-13 +* @Version 1.0 +*/ +@Data +public class LngLngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 销售日计划主键 + */ + @ApiModelProperty("销售日计划主键") + private Long salesId; + + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + + + /** + * 客户 + */ + @ApiModelProperty("客户") + private String cuCode; + + private String cuName; + + + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + + private String comName; + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + + private String ksName; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + + private String staName; + + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + + private String suName; + /** + * 采购合同主键 + */ + @ApiModelProperty("采购合同主键") + private Long kpId; + + private String kpName; + /** + * 吨/吉焦(计量时写入) + */ + @ApiModelProperty("吨/吉焦(计量时写入)") + private BigDecimal rateTonGj; + + + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + + + /** + * 卸车量(吨)(隐藏，预留) + */ + @ApiModelProperty("卸车量(吨)(隐藏，预留)") + private BigDecimal qtyTonUnloading; + + + /** + * 采购计量量(吨)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吨)(隐藏，预留)") + private BigDecimal qtyMeaTonPur; + + + /** + * 采购计量量(吉焦)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吉焦)(隐藏，预留)") + private BigDecimal qtyMeaGjPur; + + + /** + * 采购计量量(方)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(方)(隐藏，预留)") + private BigDecimal qtyMeaM3Pur; + + + /** + * 销售计量量(吨) + */ + @ApiModelProperty("销售计量量(吨)") + private BigDecimal qtyMeaTonSales; + + + /** + * 销售计量量(吉焦) + */ + @ApiModelProperty("销售计量量(吉焦)") + private BigDecimal qtyMeaGjSales; + + + /** + * 销售计量量(方) + */ + @ApiModelProperty("销售计量量(方)") + private BigDecimal qtyMeaM3Sales; + + + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + private Object timeIn; + + + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + private Object timeOut; + + + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + private String xCode; + + + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + + private String cfmCuUserName; + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + + + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + + private String cfmEmpName; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + + + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + private String rejNote; + + + /** + * 来源(外来接口数据主键) + */ + @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; + + + public void setLngFileUploadList(List fileList) { + // TODO Auto-generated method stub + + } + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasureVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasureVo.java new file mode 100644 index 0000000..8d0ddc6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasureVo.java @@ -0,0 +1,285 @@ +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-13 +* @Version 1.0 +*/ +@Data +public class LngLngMeasureVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 销售日计划主键 + */ + @ApiModelProperty("销售日计划主键") + private Long salesId; + + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + + + /** + * 客户 + */ + @ApiModelProperty("客户") + private String cuCode; + + private String cuName; + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + private Long comId; + + private String comName; + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + private Long ksId; + + private String ksName; + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + + private String staName; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + + private String suName; + /** + * 采购合同主键 + */ + @ApiModelProperty("采购合同主键") + private Long kpId; + + private String kpName; + /** + * 吨/吉焦(计量时写入) + */ + @ApiModelProperty("吨/吉焦(计量时写入)") + private BigDecimal rateTonGj; + + + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + private BigDecimal qtyTonLoading; + + + /** + * 卸车量(吨)(隐藏，预留) + */ + @ApiModelProperty("卸车量(吨)(隐藏，预留)") + private BigDecimal qtyTonUnloading; + + + /** + * 采购计量量(吨)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吨)(隐藏，预留)") + private BigDecimal qtyMeaTonPur; + + + /** + * 采购计量量(吉焦)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吉焦)(隐藏，预留)") + private BigDecimal qtyMeaGjPur; + + + /** + * 采购计量量(方)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(方)(隐藏，预留)") + private BigDecimal qtyMeaM3Pur; + + + /** + * 销售计量量(吨) + */ + @ApiModelProperty("销售计量量(吨)") + private BigDecimal qtyMeaTonSales; + + + /** + * 销售计量量(吉焦) + */ + @ApiModelProperty("销售计量量(吉焦)") + private BigDecimal qtyMeaGjSales; + + + /** + * 销售计量量(方) + */ + @ApiModelProperty("销售计量量(方)") + private BigDecimal qtyMeaM3Sales; + + + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + private Object timeIn; + + + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + private Object timeOut; + + + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + private String xCode; + + + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + private Long cfmCuUserId; + + private String cfmCuUserName; + + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + private Object cfmCuUserTime; + + + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + private Long cfmEmpId; + + private String cfmEmpName; + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + private Object cfmEmpTime; + + + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + private String rejNote; + + + /** + * 来源(外来接口数据主键) + */ + @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; + + + List lngFileUploadList; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/LngMeasurePurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/LngMeasurePurController.java new file mode 100644 index 0000000..d2f41c4 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/LngMeasurePurController.java @@ -0,0 +1,217 @@ +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.LngLngMeasurePurPageDto; +import com.xjrsoft.module.dayPlan.dto.UpdateLngLngMeasurePurDto; +import com.xjrsoft.module.dayPlan.entity.LngLngMeasurePur; +import com.xjrsoft.module.dayPlan.service.ILngMeasurePurService; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasurePurPageVo; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasurePurVo; + +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: LNG计量(业务) +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/dayPlan/lngMeasurePur") +@Api(value = "/dayPlan" + "/lngMeasurePur",tags = "LNG计量(业务)代码") +@AllArgsConstructor +public class LngMeasurePurController { + + + private final ILngMeasurePurService lngMeasurePurService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngLngMeasure列表(分页)") + @SaCheckPermission("lngMeasurePur:list") + public R page(@Valid LngLngMeasurePurPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngLngMeasurePur::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getSuCode()),LngLngMeasurePur::getSuCode,dto.getSuCode()) + .orderByDesc(LngLngMeasurePur::getId) + .select(LngLngMeasurePur.class,x -> VoToColumnUtil.fieldsToColumns(LngLngMeasurePurPageVo.class).contains(x.getProperty())); + IPage page = lngMeasurePurService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngLngMeasurePurPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngLngMeasurePur信息") + @SaCheckPermission("lngMeasurePur:detail") + public R info(@RequestParam Long id){ + LngLngMeasurePurVo LngLngMeasurePur = lngMeasurePurService.getInfoById(id); + return R.ok(LngLngMeasurePur); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngLngMeasurePur数据详细日志") + @SaCheckPermission("lngMeasurePur:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngLngMeasurePurDto.class,id); + return R.ok(logs); + } + + + @PostMapping(value = "/submit") + @ApiOperation(value = "确认LngLngMeasurePur") + @SaCheckPermission("lngMeasurePur:submit") + public R submit(@Valid @RequestBody List ids){ + + List list = lngMeasurePurService.getListByIds(ids); + for(LngLngMeasurePur 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 LngLngMeasurePur before(DataOperationContent content) { + return null; + } + + @Override + public LngLngMeasurePur 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 = "取消确认LngLngMeasurePur") + @SaCheckPermission("lngMeasurePur:cancel") + public R cancel(@Valid @RequestBody List ids){ + List list = lngMeasurePurService.getListByIds(ids); + for(LngLngMeasurePur 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 LngLngMeasurePur before(DataOperationContent content) { + return null; + } + + @Override + public LngLngMeasurePur 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 = "驳回LngLngMeasurePur") + @SaCheckPermission("lngMeasurePur:reject") + public R reject(@Valid @RequestBody UpdateLngLngMeasurePurDto params){ + List list = lngMeasurePurService.getListByIds(params.getIds()); + for(LngLngMeasurePur 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 LngLngMeasurePur before(DataOperationContent content) { + return null; + } + + @Override + public LngLngMeasurePur after(DataOperationContent content) { + + return null; + } + })); + } + + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("lngMeasurePur:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngLngMeasurePurDto.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/LngMeasureSalesController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/LngMeasureSalesController.java new file mode 100644 index 0000000..498e7e1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/LngMeasureSalesController.java @@ -0,0 +1,262 @@ +package com.xjrsoft.module.dayPlan.controller; + +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +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.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 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.LngLngMeasurePageDto; +import com.xjrsoft.module.dayPlan.dto.UpdateLngLngMeasureDto; +import com.xjrsoft.module.dayPlan.entity.LngLngMeasure; +import com.xjrsoft.module.dayPlan.service.ILngMeasureSalesService; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasurePageVo; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasureVo; + +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: LNG计量(客户) +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/dayPlan/lngMeasureSales") +@Api(value = "/dayPlan" + "/lngMeasureSales",tags = "LNG计量(客户)代码") +@AllArgsConstructor +public class LngMeasureSalesController { + + + private final ILngMeasureSalesService lngMeasureService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngLngMeasure列表(分页)") + @SaCheckPermission("lngMeasureSales:list") + public R page(@Valid LngLngMeasurePageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngLngMeasure::getId,dto.getId()) + //.between(ObjectUtil.isNotNull(dto.getDatePlanStart()) && ObjectUtil.isNotNull(dto.getDatePlanEnd()),LngLngMeasure::getDatePlan,dto.getDatePlanStart(),dto.getDatePlanEnd()) + .like(StrUtil.isNotBlank(dto.getStaCode()),LngLngMeasure::getStaCode,dto.getStaCode()) + .eq(ObjectUtil.isNotNull(dto.getRuleUserId()),LngLngMeasure::getRuleUserId,dto.getRuleUserId()) + .eq(ObjectUtil.isNotNull(dto.getDeptId()),LngLngMeasure::getDeptId,dto.getDeptId()) + .eq(ObjectUtil.isNotNull(dto.getQtyTonLoading()),LngLngMeasure::getQtyTonLoading,dto.getQtyTonLoading()) + .like(StrUtil.isNotBlank(dto.getXCode()),LngLngMeasure::getXCode,dto.getXCode()) + .eq(ObjectUtil.isNotNull(dto.getTenantId()),LngLngMeasure::getTenantId,dto.getTenantId()) + .eq(ObjectUtil.isNotNull(dto.getCreateUserId()),LngLngMeasure::getCreateUserId,dto.getCreateUserId()) + .eq(ObjectUtil.isNotNull(dto.getCfmCuUserId()),LngLngMeasure::getCfmCuUserId,dto.getCfmCuUserId()) + .eq(ObjectUtil.isNotNull(dto.getCfmEmpId()),LngLngMeasure::getCfmEmpId,dto.getCfmEmpId()) + .like(StrUtil.isNotBlank(dto.getSuCode()),LngLngMeasure::getSuCode,dto.getSuCode()) + .eq(ObjectUtil.isNotNull(dto.getKsId()),LngLngMeasure::getKsId,dto.getKsId()) + .like(StrUtil.isNotBlank(dto.getRejNote()),LngLngMeasure::getRejNote,dto.getRejNote()) + .orderByDesc(LngLngMeasure::getId) + .select(LngLngMeasure.class,x -> VoToColumnUtil.fieldsToColumns(LngLngMeasurePageVo.class).contains(x.getProperty())); + IPage page = lngMeasureService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngLngMeasurePageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPngMeasureSalesPur信息") + @SaCheckPermission("lngMeasureSales:detail") + public R info(@RequestParam Long id){ + LngLngMeasureVo lngPngMeasureSalesPur = lngMeasureService.getInfoById(id); + return R.ok(lngPngMeasureSalesPur); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPngMeasureSalesPur数据详细日志") + @SaCheckPermission("lngMeasureSales:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngLngMeasureDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "保存LngPngMeasureSalesPur") + @SaCheckPermission("lngMeasureSales:save") + public R save(@Valid @RequestBody List dtoList){ + List ids = dtoList.stream().map(UpdateLngLngMeasureDto::getId).collect(Collectors.toList()); + List list = lngMeasureService.getListByIds(ids); + for(LngLngMeasure 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 + public UpdateLngLngMeasureDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngLngMeasureDto after(DataOperationContent content) { + + 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(); + } + })); + } + + @PutMapping + @ApiOperation(value = "保存并确认LngPngMeasureSalesPur") + @SaCheckPermission("lngMeasureSales:submit") + public R submit(@Valid @RequestBody List dtoList){ + List ids = dtoList.stream().map(UpdateLngLngMeasureDto::getId).collect(Collectors.toList()); + List list = lngMeasureService.getListByIds(ids); + for(LngLngMeasure temp: list) { + if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() == null) { + + }else { + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中且客户未确认的数据才能进行确认！")); + } + } + for(UpdateLngLngMeasureDto dto: dtoList) { + dto.setCfmCuUserId(SecureUtil.getCurrentUserId()); + dto.setCfmCuUserTime(new Date()); + } + return R.ok(dataService.insertBatch(dtoList,new DataOperationListener() { + + @Override + public UpdateLngLngMeasureDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngLngMeasureDto after(DataOperationContent content) { + + 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(); + } + })); + } + + @PostMapping(value = "/cancel") + @ApiOperation(value = "取消确认LngPngMeasureSalesPur") + @SaCheckPermission("lngMeasureSales:cancel") + public R cancel(@Valid @RequestBody List dtoList){ + List ids = dtoList.stream().map(UpdateLngLngMeasureDto::getId).collect(Collectors.toList()); + List list = lngMeasureService.getListByIds(ids); + for(LngLngMeasure temp: list) { + if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() != null) { + + }else { + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中且客户已确认的数据才能进行取消确认！")); + } + } + for(UpdateLngLngMeasureDto dto: dtoList) { + dto.setCfmCuUserId(null); + dto.setCfmCuUserTime(null); + } + return R.ok(dataService.insertBatch(dtoList,new DataOperationListener() { + + @Override + public UpdateLngLngMeasureDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngLngMeasureDto after(DataOperationContent content) { + + return null; + } + })); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("lngMeasureSales:delete") + public R delete(@Valid @RequestBody List ids){ + List list = lngMeasureService.getListByIds(ids); + for(LngLngMeasure temp: list) { + if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getDataSource() == null) { + + }else { + throw new BusinessException(BusinessCode.of(10500, "只有状态是计量中的手工录入记录可以删除！")); + } + } + return R.ok(dataService.deleteByIds(UpdateLngLngMeasureDto.class, ids,new DataOperationListener() { + + @Override + public UpdateLngLngMeasureDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngLngMeasureDto after(DataOperationContent content) { + + return null; + } + })); + + } + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngLngMeasure.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngLngMeasure.java new file mode 100644 index 0000000..d8911c2 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngLngMeasure.java @@ -0,0 +1,278 @@ +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: LNG计量(客户) +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Data +@TableName("lng_lng_measure") +@ApiModel(value = "LNG计量(客户)对象", description = "LNG计量(客户)") +public class LngLngMeasure implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 销售日计划主键 + */ + @ApiModelProperty("销售日计划主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long salesId; + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime datePlan; + + /** + * 客户 + */ + @ApiModelProperty("客户") + private String cuCode; + + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksId; + + /** + * 气源地 + */ + @ApiModelProperty("气源地") + private String staCode; + + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + + /** + * 采购合同主键 + */ + @ApiModelProperty("采购合同主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpId; + + /** + * 吨/吉焦(计量时写入) + */ + @ApiModelProperty("吨/吉焦(计量时写入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateTonGj; + + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyTonLoading; + + /** + * 卸车量(吨)(隐藏，预留) + */ + @ApiModelProperty("卸车量(吨)(隐藏，预留)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyTonUnloading; + + /** + * 采购计量量(吨)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吨)(隐藏，预留)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaTonPur; + + /** + * 采购计量量(吉焦)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吉焦)(隐藏，预留)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaGjPur; + + /** + * 采购计量量(方)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(方)(隐藏，预留)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaM3Pur; + + /** + * 销售计量量(吨) + */ + @ApiModelProperty("销售计量量(吨)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaTonSales; + + /** + * 销售计量量(吉焦) + */ + @ApiModelProperty("销售计量量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaGjSales; + + /** + * 销售计量量(方) + */ + @ApiModelProperty("销售计量量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaM3Sales; + + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object timeIn; + + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object timeOut; + + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + private String xCode; + + /** + * 客户确认人 + */ + @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 rejNote; + + /** + * 来源(外来接口数据主键) + */ + @ApiModelProperty("来源(外来接口数据主键)") + private String dataSource; + + /** + * 磅单号 + */ + @ApiModelProperty("磅单号") + private String billNo; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + 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; + + @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/LngLngMeasurePur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngLngMeasurePur.java new file mode 100644 index 0000000..388f3a8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngLngMeasurePur.java @@ -0,0 +1,312 @@ +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: LNG计量(业务) +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Data +@TableName("lng_lng_measure") +@LogTable(source="lng_lng_measure",name="LNG计量(业务)") +@ApiModel(value = "LNG计量(业务)对象", description = "LNG计量(业务)") +public class LngLngMeasurePur implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @LogField(name="主键",index=0) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 销售日计划主键 + */ + @ApiModelProperty("销售日计划主键") + @LogField(name="销售日计划主键",index=1) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long salesId; + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @LogField(name="计划日期",index=2) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime datePlan; + + /** + * 客户 + */ + @ApiModelProperty("客户") + @LogField(name="客户",index=3) + private String cuCode; + + /** + * 交易主体编码(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸)") + @LogField(name="交易主体编码(天然气公司/惠贸)",index=4) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 销售合同主键(窗口期可空) + */ + @ApiModelProperty("销售合同主键(窗口期可空)") + @LogField(name="销售合同主键(窗口期可空)",index=5) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksId; + + /** + * 气源地 + */ + @ApiModelProperty("气源地") + @LogField(name="气源地",index=6) + private String staCode; + + /** + * 供应商 + */ + @ApiModelProperty("供应商") + @LogField(name="供应商",index=7) + private String suCode; + + /** + * 采购合同主键 + */ + @ApiModelProperty("采购合同主键") + @LogField(name="采购合同主键",index=8) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpId; + + /** + * 吨/吉焦(计量时写入) + */ + @ApiModelProperty("吨/吉焦(计量时写入)") + @LogField(name="吨/吉焦(计量时写入)",index=9) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateTonGj; + + /** + * 装车量(吨)(隐藏，预留) + */ + @ApiModelProperty("装车量(吨)(隐藏，预留)") + @LogField(name="装车量(吨)(隐藏，预留)",index=10) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyTonLoading; + + /** + * 卸车量(吨)(隐藏，预留) + */ + @ApiModelProperty("卸车量(吨)(隐藏，预留)") + @LogField(name="卸车量(吨)(隐藏，预留)",index=11) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyTonUnloading; + + /** + * 采购计量量(吨)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吨)(隐藏，预留)") + @LogField(name="采购计量量(吨)(隐藏，预留)",index=12) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaTonPur; + + /** + * 采购计量量(吉焦)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(吉焦)(隐藏，预留)") + @LogField(name="采购计量量",index=13) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaGjPur; + + /** + * 采购计量量(方)(隐藏，预留) + */ + @ApiModelProperty("采购计量量(方)(隐藏，预留)") + @LogField(name="采购计量量",index=14) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaM3Pur; + + /** + * 销售计量量(吨) + */ + @ApiModelProperty("销售计量量(吨)") + @LogField(name="销售计量量(吨)",index=15) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaTonSales; + + /** + * 销售计量量(吉焦) + */ + @ApiModelProperty("销售计量量(吉焦)") + @LogField(name="销售计量量(吉焦)",index=16) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaGjSales; + + /** + * 销售计量量(方) + */ + @ApiModelProperty("销售计量量(方)") + @LogField(name="销售计量量(方)",index=17) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaM3Sales; + + /** + * 进厂皮重时间/装车时间 + */ + @ApiModelProperty("进厂皮重时间/装车时间") + @LogField(name="进厂皮重时间/装车时间",index=18) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object timeIn; + + /** + * 出厂毛重时间/卸车时间 + */ + @ApiModelProperty("出厂毛重时间/卸车时间") + @LogField(name="出厂毛重时间/卸车时间",index=19) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object timeOut; + + /** + * 取消/脱装(QX-取消，TZ-脱装，空-正常计量) + */ + @ApiModelProperty("取消/脱装(QX-取消，TZ-脱装，空-正常计量)") + @LogField(name="取消/脱装(QX-取消，TZ-脱装，空-正常计量)",index=20) + private String xCode; + + /** + * 客户确认人 + */ + @ApiModelProperty("客户确认人") + @LogField(name="客户确认人",index=21) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long cfmCuUserId; + + /** + * 客户确认时间 + */ + @ApiModelProperty("客户确认时间") + @LogField(name="客户确认时间",index=22) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object cfmCuUserTime; + + /** + * 内部确认人 + */ + @ApiModelProperty("内部确认人") + @LogField(name="内部确认人",index=23) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long cfmEmpId; + + /** + * 内部确认时间 + */ + @ApiModelProperty("内部确认时间") + @LogField(name="内部确认时间",index=24) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Object cfmEmpTime; + + /** + * 驳回意见 + */ + @ApiModelProperty("驳回意见") + @LogField(name="驳回意见",index=25) + private String rejNote; + + /** + * 来源(外来接口数据主键) + */ + @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) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + 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") + @LogField(name="租户id",index=29) + //@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; + + @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/mapper/LngLngMeasureMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngLngMeasureMapper.java new file mode 100644 index 0000000..66a79b0 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngLngMeasureMapper.java @@ -0,0 +1,32 @@ +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.dayPlan.entity.LngLngMeasure; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Mapper +public interface LngLngMeasureMapper extends BaseMapper { + + @Select("SELECT m.*, IF(sh.appro_code='YSP','YJS',if(sh.id IS NOT NULL,'JSZ',IF(m.cfm_emp_id IS NOT NULL,'JLWC','JLZ'))) AS status_code " + + " FROM lng_lng_measure m "+ + " LEFT JOIN lng_lng_sales s ON s.id=m.sales_id "+ + " LEFT JOIN lng_lng_settle ls ON ls.sales_id=m.sales_id AND ls.settle_times=1 "+ + " LEFT JOIN lng_lng_settle_hdr sh ON sh.id=ls.settle_hdr_id" + + " ${ew.customSqlSegment} " + + " ORDER BY date_plan, status_code, cu_code, su_code ") + List queryLngMeasureListByIds(List ids, + @Param("ew") QueryWrapper queryWrapper); + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngLngMeasurePurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngLngMeasurePurMapper.java new file mode 100644 index 0000000..1e76a8e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngLngMeasurePurMapper.java @@ -0,0 +1,31 @@ +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.dayPlan.entity.LngLngMeasurePur; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ +@Mapper +public interface LngLngMeasurePurMapper extends BaseMapper { + + @Select("SELECT m.*, IF(sh.appro_code='YSP','YJS',if(sh.id IS NOT NULL,'JSZ',IF(m.cfm_emp_id IS NOT NULL,'JLWC','JLZ'))) AS status_code " + + " FROM lng_lng_measure m "+ + " LEFT JOIN lng_lng_sales s ON s.id=m.sales_id "+ + " LEFT JOIN lng_lng_settle ls ON ls.sales_id=m.sales_id AND ls.settle_times=1 "+ + " LEFT JOIN lng_lng_settle_hdr sh ON sh.id=ls.settle_hdr_id" + + " ${ew.customSqlSegment} " + + " ORDER BY date_plan, status_code, cu_code, su_code ") + List queryLngMeasurePurListByIds(List ids, + @Param("ew") QueryWrapper queryWrapper); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/ILngMeasurePurService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/ILngMeasurePurService.java new file mode 100644 index 0000000..056dd8b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/ILngMeasurePurService.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.LngLngMeasurePur; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasurePurVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ + +public interface ILngMeasurePurService extends IService { + + LngLngMeasurePurVo 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/ILngMeasureSalesService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/ILngMeasureSalesService.java new file mode 100644 index 0000000..576866e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/ILngMeasureSalesService.java @@ -0,0 +1,22 @@ +package com.xjrsoft.module.dayPlan.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xjrsoft.module.dayPlan.entity.LngLngMeasure; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasurePurVo; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasureVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-13 +* @Version 1.0 +*/ + +public interface ILngMeasureSalesService extends IService { + + List getListByIds(List ids); + + LngLngMeasureVo getInfoById(Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/LngMeasurePurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/LngMeasurePurServiceImpl.java new file mode 100644 index 0000000..0e7c584 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/LngMeasurePurServiceImpl.java @@ -0,0 +1,56 @@ +package com.xjrsoft.module.dayPlan.service.impl; + +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.dayPlan.entity.LngLngMeasurePur; +import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; +import com.xjrsoft.module.dayPlan.mapper.LngLngMeasurePurMapper; +import com.xjrsoft.module.dayPlan.service.ILngMeasurePurService; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasurePurVo; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo; +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-13 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class LngMeasurePurServiceImpl extends ServiceImpl implements ILngMeasurePurService { + + private final IFileClient fileClient; + + + @Override + public LngLngMeasurePurVo getInfoById(Long id) { + LngLngMeasurePur lngLngMeasurePur = this.getById(id); + if(lngLngMeasurePur == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + LngLngMeasurePurVo vo = BeanUtil.toBean(lngLngMeasurePur, LngLngMeasurePurVo.class); + List fileList = fileClient.getTableFiles("lng_lng_measure", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } + + + @Override + public List getListByIds(List ids) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("m.id", ids); + return this.baseMapper.queryLngMeasurePurListByIds(ids, queryWrapper); + } + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/LngMeasureSalesServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/LngMeasureSalesServiceImpl.java new file mode 100644 index 0000000..b3acacd --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/LngMeasureSalesServiceImpl.java @@ -0,0 +1,56 @@ +package com.xjrsoft.module.dayPlan.service.impl; + +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.dayPlan.entity.LngLngMeasure; +import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; +import com.xjrsoft.module.dayPlan.mapper.LngLngMeasureMapper; +import com.xjrsoft.module.dayPlan.service.ILngMeasureSalesService; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasurePurVo; +import com.xjrsoft.module.dayPlan.vo.LngLngMeasureVo; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasurePurVo; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo; +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-13 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class LngMeasureSalesServiceImpl extends ServiceImpl implements ILngMeasureSalesService { + + private final IFileClient fileClient; + + @Override + public LngLngMeasureVo getInfoById(Long id) { + LngLngMeasure lngLngMeasure = this.getById(id); + if(lngLngMeasure == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + LngLngMeasureVo vo = BeanUtil.toBean(lngLngMeasure, LngLngMeasureVo.class); + List fileList = fileClient.getTableFiles("lng_lng_measure", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } + + + @Override + public List getListByIds(List ids) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("m.id", ids); + return this.baseMapper.queryLngMeasureListByIds(ids, queryWrapper); + } +} From 173ff58639a48ef572d6af32a804b333da1ffc53 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 19 Mar 2026 17:55:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dayPlan/dto/UpdateLngLngMeasureDto.java | 32 +- .../module/dayPlan/vo/LngLngMeasurePurVo.java | 19 +- .../module/dayPlan/vo/LngLngMeasureVo.java | 13 +- .../module/dayPlan/vo/LngPngDemandVo.java | 3 - .../module/dayPlan/vo/LngPngSettlePurVo.java | 2 - .../inventory/dto/AddLngInventoryInDto.java | 240 +++++++++++ .../inventory/dto/AddLngInventoryOutDto.java | 125 ++++++ .../inventory/dto/LngInventoryInPageDto.java | 46 +++ .../inventory/dto/LngInventoryOutPageDto.java | 41 ++ .../dto/UpdateLngInventoryInDto.java | 354 ++++++++++++++++ .../dto/UpdateLngInventoryOutDto.java | 191 +++++++++ .../inventory/vo/LngInventoryInPageVo.java | 73 ++++ .../module/inventory/vo/LngInventoryInVo.java | 377 ++++++++++++++++++ .../inventory/vo/LngInventoryOutPageVo.java | 63 +++ .../inventory/vo/LngInventoryOutVo.java | 218 ++++++++++ .../controller/LngInventoryInController.java | 112 ++++++ .../controller/LngInventoryOutController.java | 109 +++++ .../inventory/entity/LngInventoryIn.java | 377 ++++++++++++++++++ .../inventory/entity/LngInventoryOut.java | 220 ++++++++++ .../mapper/LngInventoryInMapper.java | 37 ++ .../mapper/LngInventoryOutMapper.java | 32 ++ .../service/ILngInventoryInService.java | 17 + .../service/ILngInventoryOutService.java | 17 + .../impl/LngInventoryInServiceImpl.java | 41 ++ .../impl/LngInventoryOutServiceImpl.java | 42 ++ 25 files changed, 2754 insertions(+), 47 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryInDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryOutDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryInPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryOutPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryInDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryOutDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryInPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryInVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryOutPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryOutVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryInController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryOutController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryIn.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryOut.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryInMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryOutMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryInService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryOutService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryInServiceImpl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryOutServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasureDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasureDto.java index 27f727e..4f0106d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasureDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngLngMeasureDto.java @@ -1,27 +1,19 @@ package com.xjrsoft.module.dayPlan.dto; +import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonFormat; +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; -import java.io.Serializable; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.sql.Timestamp; - -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.LogAttrField; -import com.pictc.annotations.datalog.ValueDirectionType; -import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; -import com.xjrsoft.module.system.vo.LngFileUploadVo; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurVo.java index 0a046c6..966023c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasurePurVo.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 管理员 @@ -278,10 +273,8 @@ public class LngLngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ private Long ruleUserId; - public void setLngFileUploadList(List fileList) { - // TODO Auto-generated method stub - - } + private List lngFileUploadList; + diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasureVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasureVo.java index 8d0ddc6..f68cd15 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasureVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngLngMeasureVo.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 管理员 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java index 6201788..2c8881f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java @@ -4,9 +4,6 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -import com.xjrsoft.common.annotation.Trans; -import com.xjrsoft.common.enums.TransType; - import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java index 398b266..018f4b9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java @@ -5,8 +5,6 @@ import java.time.LocalDateTime; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; -import com.xjrsoft.common.annotation.Trans; -import com.xjrsoft.common.enums.TransType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryInDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryInDto.java new file mode 100644 index 0000000..50e1fa1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryInDto.java @@ -0,0 +1,240 @@ +package com.xjrsoft.module.inventory.dto; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 入库 +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Data +public class AddLngInventoryInDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + /** + * 入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同) + */ + @ApiModelProperty("入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同)") + private String typeCode; + /** + * 品种(缺省LNG) + */ + @ApiModelProperty("品种(缺省LNG)") + private String catCode; + /** + * 采购执行主键(type_code=CQ时选采购执行，带出船期计划、采购合同、供应商；ZN时空) + */ + @ApiModelProperty("采购执行主键(type_code=CQ时选采购执行，带出船期计划、采购合同、供应商；ZN时空)") + private Long opsId; + /** + * 船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选) + */ + @ApiModelProperty("船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选)") + private Long ssId; + /** + * 采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择) + */ + @ApiModelProperty("采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择)") + private Long kId; + /** + * 供应商编码(根据采购合同带出来；只读) + */ + @ApiModelProperty("供应商编码(根据采购合同带出来；只读)") + private String suCode; + /** + * 入库日期(在合同有效期内) + */ + @ApiModelProperty("入库日期(在合同有效期内)") + private LocalDateTime dateIn; + /** + * 卸港热值（MMBtu） + */ + @ApiModelProperty("卸港热值（MMBtu）") + private BigDecimal qtyUnloadMmbtu; + /** + * 卸港重量（吨） + */ + @ApiModelProperty("卸港重量（吨）") + private BigDecimal qtyUnloadTon; + /** + * 卸港体积（标方） + */ + @ApiModelProperty("卸港体积（标方）") + private BigDecimal qtyUnloadM3L; + /** + * 卸港体积（方） + */ + @ApiModelProperty("卸港体积（方）") + private BigDecimal qtyUnloadM3; + /** + * 卸港热值（吉焦） + */ + @ApiModelProperty("卸港热值（吉焦）") + private BigDecimal qtyUnloadGj; + /** + * 损耗比例% + */ + @ApiModelProperty("损耗比例%") + private BigDecimal rateLost; + /** + * 损耗热值（MMBtu） + */ + @ApiModelProperty("损耗热值（MMBtu）") + private BigDecimal qtyLostMmbtu; + /** + * 损耗重量（吨） + */ + @ApiModelProperty("损耗重量（吨）") + private BigDecimal qtyLostTon; + /** + * 损耗体积（标方） + */ + @ApiModelProperty("损耗体积（标方）") + private BigDecimal qtyLostM3L; + /** + * 损耗体积（方） + */ + @ApiModelProperty("损耗体积（方）") + private BigDecimal qtyLostM3; + /** + * 损耗热值（吉焦） + */ + @ApiModelProperty("损耗热值（吉焦）") + private BigDecimal qtyLostGj; + /** + * 入库热值（MMBtu） + */ + @ApiModelProperty("入库热值（MMBtu）") + private BigDecimal qtyMmbtu; + /** + * 入库重量（吨） + */ + @ApiModelProperty("入库重量（吨）") + private BigDecimal qtyTon; + /** + * 入库体积（标方） + */ + @ApiModelProperty("入库体积（标方）") + private BigDecimal qtyM3L; + /** + * 入库体积（方） + */ + @ApiModelProperty("入库体积（方）") + private BigDecimal qtyM3; + /** + * 入库热值（吉焦） + */ + @ApiModelProperty("入库热值（吉焦）") + private BigDecimal qtyGj; + /** + * 入库价格(元/吨) + */ + @ApiModelProperty("入库价格(元/吨)") + private BigDecimal priceTon; + /** + * 入库价格(元/吉焦) + */ + @ApiModelProperty("入库价格(元/吉焦)") + private BigDecimal priceGj; + /** + * 入库金额/纯货值(元)(人民币=结算币种金额*购汇汇率) + */ + @ApiModelProperty("入库金额/纯货值(元)(人民币=结算币种金额*购汇汇率)") + private BigDecimal amount; + /** + * 结算币种(录入) + */ + @ApiModelProperty("结算币种(录入)") + private String currCode; + /** + * 结算币种单价(/MMBtu)(录入) + */ + @ApiModelProperty("结算币种单价(/MMBtu)(录入)") + private BigDecimal priceMmbtu; + /** + * 结算币种金额(=结算币种单价(/MMBtu)*货量(MMBtu)) + */ + @ApiModelProperty("结算币种金额(=结算币种单价(/MMBtu)*货量(MMBtu))") + private BigDecimal amountCurr; + /** + * 购汇汇率(录入) + */ + @ApiModelProperty("购汇汇率(录入)") + private BigDecimal rateExPur; + /** + * 海关计征汇率(录入) + */ + @ApiModelProperty("海关计征汇率(录入)") + private BigDecimal rateExCalc; + /** + * 进口增值税率(固定0.09) + */ + @ApiModelProperty("进口增值税率(固定0.09)") + private BigDecimal rateVat; + /** + * 返税参考基准值(元/GJ)(固定28.06) + */ + @ApiModelProperty("返税参考基准值(元/GJ)(固定28.06)") + private BigDecimal benchmark; + /** + * 进口增值税(元)(=入库金额(元)*进口增值税率) + */ + @ApiModelProperty("进口增值税(元)(=入库金额(元)*进口增值税率)") + private BigDecimal amountImpVat; + /** + * 进口完税金额(元)(=结算币种金额*海关计征汇率) + */ + @ApiModelProperty("进口完税金额(元)(=结算币种金额*海关计征汇率)") + private BigDecimal amountCalc; + /** + * 返税(=(进口完税金额(元)/进口热值（GJ）-返税参考基准值(元/GJ))/(进口完税金额(元)/进口热值（GJ）)*进口增值税(元)) + */ + @ApiModelProperty("返税(=(进口完税金额(元)/进口热值（GJ）-返税参考基准值(元/GJ))/(进口完税金额(元)/进口热值（GJ）)*进口增值税(元))") + private BigDecimal tax; + /** + * 来源(接口写入；空-自提) + */ + @ApiModelProperty("来源(接口写入；空-自提)") + private String dataSource; + /** + * 实际付款不含税金额(元)(财务录入) + */ + @ApiModelProperty("实际付款不含税金额(元)(财务录入)") + private BigDecimal amountFin; + /** + * 结算月(被库存成本计算引用的最小月份) + */ + @ApiModelProperty("结算月(被库存成本计算引用的最小月份)") + private LocalDateTime settleMonth; + /** + * 备注 + */ + @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/inventory/dto/AddLngInventoryOutDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryOutDto.java new file mode 100644 index 0000000..827c2a7 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryOutDto.java @@ -0,0 +1,125 @@ +package com.xjrsoft.module.inventory.dto; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 出库 +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Data +public class AddLngInventoryOutDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + /** + * 出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点) + */ + @ApiModelProperty("出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点)") + private String typeCode; + /** + * 品种 + */ + @ApiModelProperty("品种") + private String catCode; + /** + * 销售合同主键(type_code=ZN时必须，其他空) + */ + @ApiModelProperty("销售合同主键(type_code=ZN时必须，其他空)") + private Long kId; + /** + * 客户编码(type_code=ZN时必须，从销售合同带；其他空) + */ + @ApiModelProperty("客户编码(type_code=ZN时必须，从销售合同带；其他空)") + private String cuCode; + /** + * 计量单位 + */ + @ApiModelProperty("计量单位") + private String uomCode; + /** + * 出库日期(在合同有效期内) + */ + @ApiModelProperty("出库日期(在合同有效期内)") + private LocalDateTime dateOut; + /** + * 比值(吨/吉焦) + */ + @ApiModelProperty("比值(吨/吉焦)") + private BigDecimal rateTonGj; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 出库量（吉焦） + */ + @ApiModelProperty("出库量（吉焦）") + private BigDecimal qtyGj; + /** + * 出库量（吨） + */ + @ApiModelProperty("出库量（吨）") + private BigDecimal qtyTon; + /** + * 出库量（方） + */ + @ApiModelProperty("出库量（方）") + private BigDecimal qtyM3; + /** + * 出库价格(元/吉焦)(本币) + */ + @ApiModelProperty("出库价格(元/吉焦)(本币)") + private BigDecimal priceGj; + /** + * 出库价格(元/吨) + */ + @ApiModelProperty("出库价格(元/吨)") + private BigDecimal priceTon; + /** + * 出库价格(元/方)(本币) + */ + @ApiModelProperty("出库价格(元/方)(本币)") + private BigDecimal priceM3; + /** + * 出库金额(元)(本币) + */ + @ApiModelProperty("出库金额(元)(本币)") + private BigDecimal amount; + /** + * 结算月 + */ + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + /** + * 备注 + */ + @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/inventory/dto/LngInventoryInPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryInPageDto.java new file mode 100644 index 0000000..f180a07 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryInPageDto.java @@ -0,0 +1,46 @@ +package com.xjrsoft.module.inventory.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-19 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngInventoryInPageDto extends PageInput { + + /** + * 入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同) + */ + @ApiModelProperty("入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同)") + private String typeCode; + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + /** + * 入库日期(在合同有效期内) + */ + @ApiModelProperty("入库日期(在合同有效期内)") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateIn; + /** + * 供应商编码(根据采购合同带出来；只读) + */ + @ApiModelProperty("供应商编码(根据采购合同带出来；只读)") + private String suCode; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryOutPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryOutPageDto.java new file mode 100644 index 0000000..862c41d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryOutPageDto.java @@ -0,0 +1,41 @@ +package com.xjrsoft.module.inventory.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-19 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngInventoryOutPageDto extends PageInput { + + /** + * 出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点) + */ + @ApiModelProperty("出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点)") + private String typeCode; + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + /** + * 出库日期(在合同有效期内) + */ + @ApiModelProperty("出库日期(在合同有效期内)") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateOut; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryInDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryInDto.java new file mode 100644 index 0000000..2729a2c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryInDto.java @@ -0,0 +1,354 @@ +package com.xjrsoft.module.inventory.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.LogAttrField; +import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; + + + + +/** +* @title: 入库 +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_inventory_in",name="入库") +public class UpdateLngInventoryInDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 公司编码(天然气公司/惠贸) + */ + @LogField(name="公司编码(天然气公司/惠贸)",index=1) + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + + /** + * 接收站 + */ + @LogField(name="接收站",index=2) + @ApiModelProperty("接收站") + private String staCode; + + /** + * 入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同) + */ + @LogField(name="入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同)",index=3) + @ApiModelProperty("入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同)") + private String typeCode; + + /** + * 品种(缺省LNG) + */ + @LogField(name="品种(缺省LNG)",index=4) + @ApiModelProperty("品种(缺省LNG)") + private String catCode; + + /** + * 采购执行主键(type_code=CQ时选采购执行，带出船期计划、采购合同、供应商；ZN时空) + */ + @LogField(name="采购执行主键(type_code=CQ时选采购执行，带出船期计划、采购合同、供应商；ZN时空)",index=5) + @ApiModelProperty("采购执行主键(type_code=CQ时选采购执行，带出船期计划、采购合同、供应商；ZN时空)") + private Long opsId; + + /** + * 船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选) + */ + @LogField(name="船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选)",index=6) + @ApiModelProperty("船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选)") + private Long ssId; + + /** + * 采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择) + */ + @LogField(name="采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择)",index=7) + @ApiModelProperty("采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择)") + private Long kId; + + /** + * 供应商编码(根据采购合同带出来；只读) + */ + @LogField(name="供应商编码(根据采购合同带出来；只读)",index=8) + @ApiModelProperty("供应商编码(根据采购合同带出来；只读)") + private String suCode; + + /** + * 入库日期(在合同有效期内) + */ + @LogField(name="入库日期(在合同有效期内)",index=9) + @ApiModelProperty("入库日期(在合同有效期内)") + private LocalDateTime dateIn; + + /** + * 卸港热值（MMBtu） + */ + @LogField(name="卸港热值（MMBtu）",index=10) + @ApiModelProperty("卸港热值（MMBtu）") + private BigDecimal qtyUnloadMmbtu; + + /** + * 卸港重量（吨） + */ + @LogField(name="卸港重量（吨）",index=11) + @ApiModelProperty("卸港重量（吨）") + private BigDecimal qtyUnloadTon; + + /** + * 卸港体积（标方） + */ + @LogField(name="卸港体积（标方）",index=12) + @ApiModelProperty("卸港体积（标方）") + private BigDecimal qtyUnloadM3L; + + /** + * 卸港体积（方） + */ + @LogField(name="卸港体积（方）",index=13) + @ApiModelProperty("卸港体积（方）") + private BigDecimal qtyUnloadM3; + + /** + * 卸港热值（吉焦） + */ + @LogField(name="卸港热值（吉焦）",index=14) + @ApiModelProperty("卸港热值（吉焦）") + private BigDecimal qtyUnloadGj; + + /** + * 损耗比例% + */ + @LogField(name="损耗比例%",index=15) + @ApiModelProperty("损耗比例%") + private BigDecimal rateLost; + + /** + * 损耗热值（MMBtu） + */ + @LogField(name="损耗热值（MMBtu）",index=16) + @ApiModelProperty("损耗热值（MMBtu）") + private BigDecimal qtyLostMmbtu; + + /** + * 损耗重量（吨） + */ + @LogField(name="损耗重量（吨）",index=17) + @ApiModelProperty("损耗重量（吨）") + private BigDecimal qtyLostTon; + + /** + * 损耗体积（标方） + */ + @LogField(name="损耗体积（标方）",index=18) + @ApiModelProperty("损耗体积（标方）") + private BigDecimal qtyLostM3L; + + /** + * 损耗体积（方） + */ + @LogField(name="损耗体积（方）",index=19) + @ApiModelProperty("损耗体积（方）") + private BigDecimal qtyLostM3; + + /** + * 损耗热值（吉焦） + */ + @LogField(name="损耗热值（吉焦）",index=20) + @ApiModelProperty("损耗热值（吉焦）") + private BigDecimal qtyLostGj; + + /** + * 入库热值（MMBtu） + */ + @LogField(name="入库热值（MMBtu）",index=21) + @ApiModelProperty("入库热值（MMBtu）") + private BigDecimal qtyMmbtu; + + /** + * 入库重量（吨） + */ + @LogField(name="入库重量（吨）",index=22) + @ApiModelProperty("入库重量（吨）") + private BigDecimal qtyTon; + + /** + * 入库体积（标方） + */ + @LogField(name="入库体积（标方）",index=23) + @ApiModelProperty("入库体积（标方）") + private BigDecimal qtyM3L; + + /** + * 入库体积（方） + */ + @LogField(name="入库体积（方）",index=24) + @ApiModelProperty("入库体积（方）") + private BigDecimal qtyM3; + + /** + * 入库热值（吉焦） + */ + @LogField(name="入库热值（吉焦）",index=25) + @ApiModelProperty("入库热值（吉焦）") + private BigDecimal qtyGj; + + /** + * 入库价格(元/吨) + */ + @LogField(name="入库价格(元/吨)",index=26) + @ApiModelProperty("入库价格(元/吨)") + private BigDecimal priceTon; + + /** + * 入库价格(元/吉焦) + */ + @LogField(name="入库价格(元/吉焦)",index=27) + @ApiModelProperty("入库价格(元/吉焦)") + private BigDecimal priceGj; + + /** + * 入库金额/纯货值(元)(人民币=结算币种金额*购汇汇率) + */ + @LogField(name="入库金额/纯货值(元)(人民币=结算币种金额*购汇汇率)",index=28) + @ApiModelProperty("入库金额/纯货值(元)(人民币=结算币种金额*购汇汇率)") + private BigDecimal amount; + + /** + * 结算币种(录入) + */ + @LogField(name="结算币种(录入)",index=29) + @ApiModelProperty("结算币种(录入)") + private String currCode; + + /** + * 结算币种单价(/MMBtu)(录入) + */ + @LogField(name="结算币种单价(/MMBtu)(录入)",index=30) + @ApiModelProperty("结算币种单价(/MMBtu)(录入)") + private BigDecimal priceMmbtu; + + /** + * 结算币种金额(=结算币种单价(/MMBtu)*货量(MMBtu)) + */ + @LogField(name="结算币种金额(=结算币种单价(/MMBtu)*货量(MMBtu))",index=31) + @ApiModelProperty("结算币种金额(=结算币种单价(/MMBtu)*货量(MMBtu))") + private BigDecimal amountCurr; + + /** + * 购汇汇率(录入) + */ + @LogField(name="购汇汇率(录入)",index=32) + @ApiModelProperty("购汇汇率(录入)") + private BigDecimal rateExPur; + + /** + * 海关计征汇率(录入) + */ + @LogField(name="海关计征汇率(录入)",index=33) + @ApiModelProperty("海关计征汇率(录入)") + private BigDecimal rateExCalc; + + /** + * 进口增值税率(固定0.09) + */ + @LogField(name="进口增值税率(固定0.09)",index=34) + @ApiModelProperty("进口增值税率(固定0.09)") + private BigDecimal rateVat; + + /** + * 返税参考基准值(元/GJ)(固定28.06) + */ + @LogField(name="返税参考基准值(元/GJ)(固定28.06)",index=35) + @ApiModelProperty("返税参考基准值(元/GJ)(固定28.06)") + private BigDecimal benchmark; + + /** + * 进口增值税(元)(=入库金额(元)*进口增值税率) + */ + @LogField(name="进口增值税(元)(=入库金额(元)*进口增值税率)",index=36) + @ApiModelProperty("进口增值税(元)(=入库金额(元)*进口增值税率)") + private BigDecimal amountImpVat; + + /** + * 进口完税金额(元)(=结算币种金额*海关计征汇率) + */ + @LogField(name="进口完税金额(元)(=结算币种金额*海关计征汇率)",index=37) + @ApiModelProperty("进口完税金额(元)(=结算币种金额*海关计征汇率)") + private BigDecimal amountCalc; + + /** + * 返税(=(进口完税金额(元)/进口热值（GJ）-返税参考基准值(元/GJ))/(进口完税金额(元)/进口热值（GJ）)*进口增值税(元)) + */ + @LogField(name="返税(=(进口完税金额(元)/进口热值（GJ）-返税参考基准值(元/GJ))/(进口完税金额(元)/进口热值（GJ）)*进口增值税(元))",index=38) + @ApiModelProperty("返税(=(进口完税金额(元)/进口热值（GJ）-返税参考基准值(元/GJ))/(进口完税金额(元)/进口热值（GJ）)*进口增值税(元))") + private BigDecimal tax; + + /** + * 来源(接口写入；空-自提) + */ + @LogField(name="来源(接口写入；空-自提)",index=39) + @ApiModelProperty("来源(接口写入；空-自提)") + private String dataSource; + + /** + * 实际付款不含税金额(元)(财务录入) + */ + @LogField(name="实际付款不含税金额(元)(财务录入)",index=40) + @ApiModelProperty("实际付款不含税金额(元)(财务录入)") + private BigDecimal amountFin; + + /** + * 结算月(被库存成本计算引用的最小月份) + */ + @LogField(name="结算月(被库存成本计算引用的最小月份)",index=41) + @ApiModelProperty("结算月(被库存成本计算引用的最小月份)") + private LocalDateTime settleMonth; + + /** + * 备注 + */ + @LogField(name="备注",index=42) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=43) + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryOutDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryOutDto.java new file mode 100644 index 0000000..73933c1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryOutDto.java @@ -0,0 +1,191 @@ +package com.xjrsoft.module.inventory.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.LogAttrField; +import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; + + + + +/** +* @title: 出库 +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_inventory_out",name="出库") +public class UpdateLngInventoryOutDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 公司编码(天然气公司/惠贸) + */ + @LogField(name="公司编码(天然气公司/惠贸)",index=1) + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + + /** + * 接收站 + */ + @LogField(name="接收站",index=2) + @ApiModelProperty("接收站") + private String staCode; + + /** + * 出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点) + */ + @LogField(name="出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点)",index=3) + @ApiModelProperty("出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点)") + private String typeCode; + + /** + * 品种 + */ + @LogField(name="品种",index=4) + @ApiModelProperty("品种") + private String catCode; + + /** + * 销售合同主键(type_code=ZN时必须，其他空) + */ + @LogField(name="销售合同主键(type_code=ZN时必须，其他空)",index=5) + @ApiModelProperty("销售合同主键(type_code=ZN时必须，其他空)") + private Long kId; + + /** + * 客户编码(type_code=ZN时必须，从销售合同带；其他空) + */ + @LogField(name="客户编码(type_code=ZN时必须，从销售合同带；其他空)",index=6) + @ApiModelProperty("客户编码(type_code=ZN时必须，从销售合同带；其他空)") + private String cuCode; + + /** + * 计量单位 + */ + @LogField(name="计量单位",index=7) + @ApiModelProperty("计量单位") + private String uomCode; + + /** + * 出库日期(在合同有效期内) + */ + @LogField(name="出库日期(在合同有效期内)",index=8) + @ApiModelProperty("出库日期(在合同有效期内)") + private LocalDateTime dateOut; + + /** + * 比值(吨/吉焦) + */ + @LogField(name="比值(吨/吉焦)",index=9) + @ApiModelProperty("比值(吨/吉焦)") + private BigDecimal rateTonGj; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值(方/吉焦)",index=10) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 出库量（吉焦） + */ + @LogField(name="出库量（吉焦）",index=11) + @ApiModelProperty("出库量（吉焦）") + private BigDecimal qtyGj; + + /** + * 出库量（吨） + */ + @LogField(name="出库量（吨）",index=12) + @ApiModelProperty("出库量（吨）") + private BigDecimal qtyTon; + + /** + * 出库量（方） + */ + @LogField(name="出库量（方）",index=13) + @ApiModelProperty("出库量（方）") + private BigDecimal qtyM3; + + /** + * 出库价格(元/吉焦)(本币) + */ + @LogField(name="出库价格(元/吉焦)(本币)",index=14) + @ApiModelProperty("出库价格(元/吉焦)(本币)") + private BigDecimal priceGj; + + /** + * 出库价格(元/吨) + */ + @LogField(name="出库价格(元/吨)",index=15) + @ApiModelProperty("出库价格(元/吨)") + private BigDecimal priceTon; + + /** + * 出库价格(元/方)(本币) + */ + @LogField(name="出库价格(元/方)(本币)",index=16) + @ApiModelProperty("出库价格(元/方)(本币)") + private BigDecimal priceM3; + + /** + * 出库金额(元)(本币) + */ + @LogField(name="出库金额(元)(本币)",index=17) + @ApiModelProperty("出库金额(元)(本币)") + private BigDecimal amount; + + /** + * 结算月 + */ + @LogField(name="结算月",index=18) + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + + /** + * 备注 + */ + @LogField(name="备注",index=19) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=20) + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryInPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryInPageVo.java new file mode 100644 index 0000000..41184d5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryInPageVo.java @@ -0,0 +1,73 @@ +package com.xjrsoft.module.inventory.vo; + +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 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Data +public class LngInventoryInPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + /** + * 入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同) + */ + @ApiModelProperty("入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同)") + private String typeCode; + /** + * 供应商编码(根据采购合同带出来；只读) + */ + @ApiModelProperty("供应商编码(根据采购合同带出来；只读)") + private String suCode; + /** + * 入库日期(在合同有效期内) + */ + @ApiModelProperty("入库日期(在合同有效期内)") + private LocalDateTime dateIn; + /** + * 卸港热值（MMBtu） + */ + @ApiModelProperty("卸港热值（MMBtu）") + private BigDecimal qtyUnloadMmbtu; + /** + * 卸港重量（吨） + */ + @ApiModelProperty("卸港重量（吨）") + private BigDecimal qtyUnloadTon; + /** + * 卸港体积（标方） + */ + @ApiModelProperty("卸港体积（标方）") + private BigDecimal qtyUnloadM3L; + /** + * 卸港体积（方） + */ + @ApiModelProperty("卸港体积（方）") + private BigDecimal qtyUnloadM3; + /** + * 卸港热值（吉焦） + */ + @ApiModelProperty("卸港热值（吉焦）") + private BigDecimal qtyUnloadGj; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryInVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryInVo.java new file mode 100644 index 0000000..d7621af --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryInVo.java @@ -0,0 +1,377 @@ +package com.xjrsoft.module.inventory.vo; + +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 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Data +public class LngInventoryInVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + + private String comName; + + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + + private String staName; + + /** + * 入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同) + */ + @ApiModelProperty("入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同)") + private String typeCode; + + private String typeName; + /** + * 品种(缺省LNG) + */ + @ApiModelProperty("品种(缺省LNG)") + private String catCode; + + + /** + * 采购执行主键(type_code=CQ时选采购执行，带出船期计划、采购合同、供应商；ZN时空) + */ + @ApiModelProperty("采购执行主键(type_code=CQ时选采购执行，带出船期计划、采购合同、供应商；ZN时空)") + private Long opsId; + + + /** + * 船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选) + */ + @ApiModelProperty("船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选)") + private Long ssId; + + + /** + * 采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择) + */ + @ApiModelProperty("采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择)") + private Long kId; + + private String kName; + + /** + * 供应商编码(根据采购合同带出来；只读) + */ + @ApiModelProperty("供应商编码(根据采购合同带出来；只读)") + private String suCode; + + private String suName; + /** + * 入库日期(在合同有效期内) + */ + @ApiModelProperty("入库日期(在合同有效期内)") + private LocalDateTime dateIn; + + + /** + * 卸港热值（MMBtu） + */ + @ApiModelProperty("卸港热值（MMBtu）") + private BigDecimal qtyUnloadMmbtu; + + + /** + * 卸港重量（吨） + */ + @ApiModelProperty("卸港重量（吨）") + private BigDecimal qtyUnloadTon; + + + /** + * 卸港体积（标方） + */ + @ApiModelProperty("卸港体积（标方）") + private BigDecimal qtyUnloadM3L; + + + /** + * 卸港体积（方） + */ + @ApiModelProperty("卸港体积（方）") + private BigDecimal qtyUnloadM3; + + + /** + * 卸港热值（吉焦） + */ + @ApiModelProperty("卸港热值（吉焦）") + private BigDecimal qtyUnloadGj; + + + /** + * 损耗比例% + */ + @ApiModelProperty("损耗比例%") + private BigDecimal rateLost; + + + /** + * 损耗热值（MMBtu） + */ + @ApiModelProperty("损耗热值（MMBtu）") + private BigDecimal qtyLostMmbtu; + + + /** + * 损耗重量（吨） + */ + @ApiModelProperty("损耗重量（吨）") + private BigDecimal qtyLostTon; + + + /** + * 损耗体积（标方） + */ + @ApiModelProperty("损耗体积（标方）") + private BigDecimal qtyLostM3L; + + + /** + * 损耗体积（方） + */ + @ApiModelProperty("损耗体积（方）") + private BigDecimal qtyLostM3; + + + /** + * 损耗热值（吉焦） + */ + @ApiModelProperty("损耗热值（吉焦）") + private BigDecimal qtyLostGj; + + + /** + * 入库热值（MMBtu） + */ + @ApiModelProperty("入库热值（MMBtu）") + private BigDecimal qtyMmbtu; + + + /** + * 入库重量（吨） + */ + @ApiModelProperty("入库重量（吨）") + private BigDecimal qtyTon; + + + /** + * 入库体积（标方） + */ + @ApiModelProperty("入库体积（标方）") + private BigDecimal qtyM3L; + + + /** + * 入库体积（方） + */ + @ApiModelProperty("入库体积（方）") + private BigDecimal qtyM3; + + + /** + * 入库热值（吉焦） + */ + @ApiModelProperty("入库热值（吉焦）") + private BigDecimal qtyGj; + + + /** + * 入库价格(元/吨) + */ + @ApiModelProperty("入库价格(元/吨)") + private BigDecimal priceTon; + + + /** + * 入库价格(元/吉焦) + */ + @ApiModelProperty("入库价格(元/吉焦)") + private BigDecimal priceGj; + + + /** + * 入库金额/纯货值(元)(人民币=结算币种金额*购汇汇率) + */ + @ApiModelProperty("入库金额/纯货值(元)(人民币=结算币种金额*购汇汇率)") + private BigDecimal amount; + + + /** + * 结算币种(录入) + */ + @ApiModelProperty("结算币种(录入)") + private String currCode; + + + /** + * 结算币种单价(/MMBtu)(录入) + */ + @ApiModelProperty("结算币种单价(/MMBtu)(录入)") + private BigDecimal priceMmbtu; + + + /** + * 结算币种金额(=结算币种单价(/MMBtu)*货量(MMBtu)) + */ + @ApiModelProperty("结算币种金额(=结算币种单价(/MMBtu)*货量(MMBtu))") + private BigDecimal amountCurr; + + + /** + * 购汇汇率(录入) + */ + @ApiModelProperty("购汇汇率(录入)") + private BigDecimal rateExPur; + + + /** + * 海关计征汇率(录入) + */ + @ApiModelProperty("海关计征汇率(录入)") + private BigDecimal rateExCalc; + + + /** + * 进口增值税率(固定0.09) + */ + @ApiModelProperty("进口增值税率(固定0.09)") + private BigDecimal rateVat; + + + /** + * 返税参考基准值(元/GJ)(固定28.06) + */ + @ApiModelProperty("返税参考基准值(元/GJ)(固定28.06)") + private BigDecimal benchmark; + + + /** + * 进口增值税(元)(=入库金额(元)*进口增值税率) + */ + @ApiModelProperty("进口增值税(元)(=入库金额(元)*进口增值税率)") + private BigDecimal amountImpVat; + + + /** + * 进口完税金额(元)(=结算币种金额*海关计征汇率) + */ + @ApiModelProperty("进口完税金额(元)(=结算币种金额*海关计征汇率)") + private BigDecimal amountCalc; + + + /** + * 返税(=(进口完税金额(元)/进口热值（GJ）-返税参考基准值(元/GJ))/(进口完税金额(元)/进口热值（GJ）)*进口增值税(元)) + */ + @ApiModelProperty("返税(=(进口完税金额(元)/进口热值（GJ）-返税参考基准值(元/GJ))/(进口完税金额(元)/进口热值（GJ）)*进口增值税(元))") + private BigDecimal tax; + + + /** + * 来源(接口写入；空-自提) + */ + @ApiModelProperty("来源(接口写入；空-自提)") + private String dataSource; + + + /** + * 实际付款不含税金额(元)(财务录入) + */ + @ApiModelProperty("实际付款不含税金额(元)(财务录入)") + private BigDecimal amountFin; + + + /** + * 结算月(被库存成本计算引用的最小月份) + */ + @ApiModelProperty("结算月(被库存成本计算引用的最小月份)") + private LocalDateTime settleMonth; + + + /** + * 备注 + */ + @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; + + List lngFileUploadList; + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryOutPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryOutPageVo.java new file mode 100644 index 0000000..c504f61 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryOutPageVo.java @@ -0,0 +1,63 @@ +package com.xjrsoft.module.inventory.vo; + +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 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Data +public class LngInventoryOutPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + /** + * 出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点) + */ + @ApiModelProperty("出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点)") + private String typeCode; + /** + * 出库日期(在合同有效期内) + */ + @ApiModelProperty("出库日期(在合同有效期内)") + private LocalDateTime dateOut; + /** + * 出库量（吉焦） + */ + @ApiModelProperty("出库量（吉焦）") + private BigDecimal qtyGj; + /** + * 出库量（吨） + */ + @ApiModelProperty("出库量（吨）") + private BigDecimal qtyTon; + /** + * 出库量（方） + */ + @ApiModelProperty("出库量（方）") + private BigDecimal qtyM3; + /** + * 出库金额(元)(本币) + */ + @ApiModelProperty("出库金额(元)(本币)") + private BigDecimal amount; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryOutVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryOutVo.java new file mode 100644 index 0000000..39cc8d7 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryOutVo.java @@ -0,0 +1,218 @@ +package com.xjrsoft.module.inventory.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-19 +* @Version 1.0 +*/ +@Data +public class LngInventoryOutVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + + + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + + + /** + * 出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点) + */ + @ApiModelProperty("出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点)") + private String typeCode; + + + /** + * 品种 + */ + @ApiModelProperty("品种") + private String catCode; + + + /** + * 销售合同主键(type_code=ZN时必须，其他空) + */ + @ApiModelProperty("销售合同主键(type_code=ZN时必须，其他空)") + private Long kId; + + + /** + * 客户编码(type_code=ZN时必须，从销售合同带；其他空) + */ + @ApiModelProperty("客户编码(type_code=ZN时必须，从销售合同带；其他空)") + private String cuCode; + + + /** + * 计量单位 + */ + @ApiModelProperty("计量单位") + private String uomCode; + + + /** + * 出库日期(在合同有效期内) + */ + @ApiModelProperty("出库日期(在合同有效期内)") + private LocalDateTime dateOut; + + + /** + * 比值(吨/吉焦) + */ + @ApiModelProperty("比值(吨/吉焦)") + private BigDecimal rateTonGj; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 出库量（吉焦） + */ + @ApiModelProperty("出库量（吉焦）") + private BigDecimal qtyGj; + + + /** + * 出库量（吨） + */ + @ApiModelProperty("出库量（吨）") + private BigDecimal qtyTon; + + + /** + * 出库量（方） + */ + @ApiModelProperty("出库量（方）") + private BigDecimal qtyM3; + + + /** + * 出库价格(元/吉焦)(本币) + */ + @ApiModelProperty("出库价格(元/吉焦)(本币)") + private BigDecimal priceGj; + + + /** + * 出库价格(元/吨) + */ + @ApiModelProperty("出库价格(元/吨)") + private BigDecimal priceTon; + + + /** + * 出库价格(元/方)(本币) + */ + @ApiModelProperty("出库价格(元/方)(本币)") + private BigDecimal priceM3; + + + /** + * 出库金额(元)(本币) + */ + @ApiModelProperty("出库金额(元)(本币)") + private BigDecimal amount; + + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + + + /** + * 备注 + */ + @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; + + + + List lngFileUploadList; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryInController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryInController.java new file mode 100644 index 0000000..660ca71 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryInController.java @@ -0,0 +1,112 @@ +package com.xjrsoft.module.inventory.controller; + +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.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 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.VoToColumnUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.inventory.dto.LngInventoryInPageDto; +import com.xjrsoft.module.inventory.dto.UpdateLngInventoryInDto; +import com.xjrsoft.module.inventory.entity.LngInventoryIn; +import com.xjrsoft.module.inventory.service.ILngInventoryInService; +import com.xjrsoft.module.inventory.vo.LngInventoryInPageVo; +import com.xjrsoft.module.inventory.vo.LngInventoryInVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; + +/** +* @title: 入库 +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/inventory/lngInventoryIn") +@Api(value = "/inventory" + "/lngInventoryIn",tags = "入库代码") +@AllArgsConstructor +public class LngInventoryInController { + + + private final ILngInventoryInService lngInventoryInService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngInventoryIn列表(分页)") + @SaCheckPermission("lngInventoryIn:list") + public R page(@Valid LngInventoryInPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getTypeCode()),LngInventoryIn::getTypeCode,dto.getTypeCode()) + .like(StrUtil.isNotBlank(dto.getStaCode()),LngInventoryIn::getStaCode,dto.getStaCode()) + //.between(ObjectUtil.isNotNull(dto.getDateInStart()) && ObjectUtil.isNotNull(dto.getDateInEnd()),LngInventoryIn::getDateIn,dto.getDateInStart(),dto.getDateInEnd()) + .like(StrUtil.isNotBlank(dto.getSuCode()),LngInventoryIn::getSuCode,dto.getSuCode()) + .orderByDesc(LngInventoryIn::getId) + .select(LngInventoryIn.class,x -> VoToColumnUtil.fieldsToColumns(LngInventoryInPageVo.class).contains(x.getProperty())); + IPage page = lngInventoryInService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngInventoryInPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngInventoryIn信息") + @SaCheckPermission("lngInventoryIn:detail") + public R info(@RequestParam Long id){ + return R.ok(lngInventoryInService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngInventoryIn数据详细日志") + @SaCheckPermission("lngInventoryIn:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngInventoryInDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngInventoryIn") + @SaCheckPermission("lngInventoryIn:add") + public R add(@Valid @RequestBody UpdateLngInventoryInDto dto){ + UpdateLngInventoryInDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngInventoryIn") + @SaCheckPermission("lngInventoryIn:edit") + public R update(@Valid @RequestBody UpdateLngInventoryInDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("lngInventoryIn:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngInventoryInDto.class, ids)); + + } + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryOutController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryOutController.java new file mode 100644 index 0000000..4af23b9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryOutController.java @@ -0,0 +1,109 @@ +package com.xjrsoft.module.inventory.controller; + +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.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 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.VoToColumnUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.inventory.dto.LngInventoryOutPageDto; +import com.xjrsoft.module.inventory.dto.UpdateLngInventoryOutDto; +import com.xjrsoft.module.inventory.entity.LngInventoryOut; +import com.xjrsoft.module.inventory.service.ILngInventoryOutService; +import com.xjrsoft.module.inventory.vo.LngInventoryOutPageVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; + +/** +* @title: 出库 +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/inventory/lngInventoryOut") +@Api(value = "/inventory" + "/lngInventoryOut",tags = "出库代码") +@AllArgsConstructor +public class LngInventoryOutController { + + + private final ILngInventoryOutService lngInventoryOutService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngInventoryOut列表(分页)") + @SaCheckPermission("lngInventoryOut:list") + public R page(@Valid LngInventoryOutPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getTypeCode()),LngInventoryOut::getTypeCode,dto.getTypeCode()) + .like(StrUtil.isNotBlank(dto.getStaCode()),LngInventoryOut::getStaCode,dto.getStaCode()) + //.between(ObjectUtil.isNotNull(dto.getDateOutStart()) && ObjectUtil.isNotNull(dto.getDateOutEnd()),LngInventoryOut::getDateOut,dto.getDateOutStart(),dto.getDateOutEnd()) + .orderByDesc(LngInventoryOut::getId) + .select(LngInventoryOut.class,x -> VoToColumnUtil.fieldsToColumns(LngInventoryOutPageVo.class).contains(x.getProperty())); + IPage page = lngInventoryOutService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngInventoryOutPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngInventoryOut信息") + @SaCheckPermission("lngInventoryOut:detail") + public R info(@RequestParam Long id){ + return R.ok(lngInventoryOutService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngInventoryOut数据详细日志") + @SaCheckPermission("lngInventoryOut:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngInventoryOutDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngInventoryOut") + @SaCheckPermission("lngInventoryOut:add") + public R add(@Valid @RequestBody UpdateLngInventoryOutDto dto){ + UpdateLngInventoryOutDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngInventoryOut") + @SaCheckPermission("lngInventoryOut:edit") + public R update(@Valid @RequestBody UpdateLngInventoryOutDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("lngInventoryOut:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngInventoryOutDto.class, ids)); + + } + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryIn.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryIn.java new file mode 100644 index 0000000..1a53a68 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryIn.java @@ -0,0 +1,377 @@ +package com.xjrsoft.module.inventory.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 入库 +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Data +@TableName("lng_inventory_in") +@ApiModel(value = "入库对象", description = "入库") +public class LngInventoryIn implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + + /** + * 入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同) + */ + @ApiModelProperty("入库类型编码(CQ-船期计划/ZN-站内交易；CQ先选采购执行，带出船期计划ID、合同ID；ZN选船期计划和合同)") + private String typeCode; + + /** + * 品种(缺省LNG) + */ + @ApiModelProperty("品种(缺省LNG)") + private String catCode; + + /** + * 采购执行主键(type_code=CQ时选采购执行，带出船期计划、采购合同、供应商；ZN时空) + */ + @ApiModelProperty("采购执行主键(type_code=CQ时选采购执行，带出船期计划、采购合同、供应商；ZN时空)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long opsId; + + /** + * 船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选) + */ + @ApiModelProperty("船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ssId; + + /** + * 采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择) + */ + @ApiModelProperty("采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 供应商编码(根据采购合同带出来；只读) + */ + @ApiModelProperty("供应商编码(根据采购合同带出来；只读)") + private String suCode; + + /** + * 入库日期(在合同有效期内) + */ + @ApiModelProperty("入库日期(在合同有效期内)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateIn; + + /** + * 卸港热值（MMBtu） + */ + @ApiModelProperty("卸港热值（MMBtu）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyUnloadMmbtu; + + /** + * 卸港重量（吨） + */ + @ApiModelProperty("卸港重量（吨）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyUnloadTon; + + /** + * 卸港体积（标方） + */ + @ApiModelProperty("卸港体积（标方）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyUnloadM3L; + + /** + * 卸港体积（方） + */ + @ApiModelProperty("卸港体积（方）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyUnloadM3; + + /** + * 卸港热值（吉焦） + */ + @ApiModelProperty("卸港热值（吉焦）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyUnloadGj; + + /** + * 损耗比例% + */ + @ApiModelProperty("损耗比例%") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateLost; + + /** + * 损耗热值（MMBtu） + */ + @ApiModelProperty("损耗热值（MMBtu）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyLostMmbtu; + + /** + * 损耗重量（吨） + */ + @ApiModelProperty("损耗重量（吨）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyLostTon; + + /** + * 损耗体积（标方） + */ + @ApiModelProperty("损耗体积（标方）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyLostM3L; + + /** + * 损耗体积（方） + */ + @ApiModelProperty("损耗体积（方）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyLostM3; + + /** + * 损耗热值（吉焦） + */ + @ApiModelProperty("损耗热值（吉焦）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyLostGj; + + /** + * 入库热值（MMBtu） + */ + @ApiModelProperty("入库热值（MMBtu）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMmbtu; + + /** + * 入库重量（吨） + */ + @ApiModelProperty("入库重量（吨）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyTon; + + /** + * 入库体积（标方） + */ + @ApiModelProperty("入库体积（标方）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyM3L; + + /** + * 入库体积（方） + */ + @ApiModelProperty("入库体积（方）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyM3; + + /** + * 入库热值（吉焦） + */ + @ApiModelProperty("入库热值（吉焦）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGj; + + /** + * 入库价格(元/吨) + */ + @ApiModelProperty("入库价格(元/吨)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceTon; + + /** + * 入库价格(元/吉焦) + */ + @ApiModelProperty("入库价格(元/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceGj; + + /** + * 入库金额/纯货值(元)(人民币=结算币种金额*购汇汇率) + */ + @ApiModelProperty("入库金额/纯货值(元)(人民币=结算币种金额*购汇汇率)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amount; + + /** + * 结算币种(录入) + */ + @ApiModelProperty("结算币种(录入)") + private String currCode; + + /** + * 结算币种单价(/MMBtu)(录入) + */ + @ApiModelProperty("结算币种单价(/MMBtu)(录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceMmbtu; + + /** + * 结算币种金额(=结算币种单价(/MMBtu)*货量(MMBtu)) + */ + @ApiModelProperty("结算币种金额(=结算币种单价(/MMBtu)*货量(MMBtu))") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amountCurr; + + /** + * 购汇汇率(录入) + */ + @ApiModelProperty("购汇汇率(录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateExPur; + + /** + * 海关计征汇率(录入) + */ + @ApiModelProperty("海关计征汇率(录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateExCalc; + + /** + * 进口增值税率(固定0.09) + */ + @ApiModelProperty("进口增值税率(固定0.09)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateVat; + + /** + * 返税参考基准值(元/GJ)(固定28.06) + */ + @ApiModelProperty("返税参考基准值(元/GJ)(固定28.06)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal benchmark; + + /** + * 进口增值税(元)(=入库金额(元)*进口增值税率) + */ + @ApiModelProperty("进口增值税(元)(=入库金额(元)*进口增值税率)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amountImpVat; + + /** + * 进口完税金额(元)(=结算币种金额*海关计征汇率) + */ + @ApiModelProperty("进口完税金额(元)(=结算币种金额*海关计征汇率)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amountCalc; + + /** + * 返税(=(进口完税金额(元)/进口热值（GJ）-返税参考基准值(元/GJ))/(进口完税金额(元)/进口热值（GJ）)*进口增值税(元)) + */ + @ApiModelProperty("返税(=(进口完税金额(元)/进口热值（GJ）-返税参考基准值(元/GJ))/(进口完税金额(元)/进口热值（GJ）)*进口增值税(元))") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal tax; + + /** + * 来源(接口写入；空-自提) + */ + @ApiModelProperty("来源(接口写入；空-自提)") + private String dataSource; + + /** + * 实际付款不含税金额(元)(财务录入) + */ + @ApiModelProperty("实际付款不含税金额(元)(财务录入)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amountFin; + + /** + * 结算月(被库存成本计算引用的最小月份) + */ + @ApiModelProperty("结算月(被库存成本计算引用的最小月份)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime settleMonth; + + /** + * 备注 + */ + @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/inventory/entity/LngInventoryOut.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryOut.java new file mode 100644 index 0000000..da197af --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryOut.java @@ -0,0 +1,220 @@ +package com.xjrsoft.module.inventory.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 出库 +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Data +@TableName("lng_inventory_out") +@ApiModel(value = "出库对象", description = "出库") +public class LngInventoryOut implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 接收站 + */ + @ApiModelProperty("接收站") + private String staCode; + + /** + * 出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点) + */ + @ApiModelProperty("出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点)") + private String typeCode; + + /** + * 品种 + */ + @ApiModelProperty("品种") + private String catCode; + + /** + * 销售合同主键(type_code=ZN时必须，其他空) + */ + @ApiModelProperty("销售合同主键(type_code=ZN时必须，其他空)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kId; + + /** + * 客户编码(type_code=ZN时必须，从销售合同带；其他空) + */ + @ApiModelProperty("客户编码(type_code=ZN时必须，从销售合同带；其他空)") + private String cuCode; + + /** + * 计量单位 + */ + @ApiModelProperty("计量单位") + private String uomCode; + + /** + * 出库日期(在合同有效期内) + */ + @ApiModelProperty("出库日期(在合同有效期内)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateOut; + + /** + * 比值(吨/吉焦) + */ + @ApiModelProperty("比值(吨/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateTonGj; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 出库量（吉焦） + */ + @ApiModelProperty("出库量（吉焦）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyGj; + + /** + * 出库量（吨） + */ + @ApiModelProperty("出库量（吨）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyTon; + + /** + * 出库量（方） + */ + @ApiModelProperty("出库量（方）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyM3; + + /** + * 出库价格(元/吉焦)(本币) + */ + @ApiModelProperty("出库价格(元/吉焦)(本币)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceGj; + + /** + * 出库价格(元/吨) + */ + @ApiModelProperty("出库价格(元/吨)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceTon; + + /** + * 出库价格(元/方)(本币) + */ + @ApiModelProperty("出库价格(元/方)(本币)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceM3; + + /** + * 出库金额(元)(本币) + */ + @ApiModelProperty("出库金额(元)(本币)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amount; + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime settleMonth; + + /** + * 备注 + */ + @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/inventory/mapper/LngInventoryInMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryInMapper.java new file mode 100644 index 0000000..b853e7d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryInMapper.java @@ -0,0 +1,37 @@ +package com.xjrsoft.module.inventory.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xjrsoft.module.inventory.entity.LngInventoryIn; +import com.xjrsoft.module.inventory.vo.LngInventoryInVo; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Mapper +public interface LngInventoryInMapper extends BaseMapper { + + + @Select("SELECT ii.*, dd_ii.name AS type_name, "+ + " opi.ss_no AS ssNo , sl.full_name AS staName , "+ + " k.k_name AS k_name ,"+ + " su.su_name AS su_name , "+ + " NVL(com.short_name,com.name) AS com_name "+ + " FROM lng_inventory_in ii "+ + " LEFT JOIN lng_ops_pur_int opi ON opi.id=ii.ops_id "+ + " LEFT JOIN lng_contract k ON k.id=ii.k_id "+ + " LEFT JOIN lng_supplier su ON su.su_code=ii.su_code "+ + " LEFT JOIN xjr_dictionary_item di_ii on di_ii.code='LNG_INV_I' "+ + " LEFT JOIN xjr_dictionary_detail dd_ii on dd_ii.item_id=di_ii.id AND dd_ii.code=ii.type_code "+ + " LEFT JOIN lng_b_station_lng sl ON sl.code=ii.sta_code "+ + " LEFT JOIN xjr_department com ON com.id=ii.com_id "+ + " WHERE ii.id = #{id}") + LngInventoryInVo getInfoBygId(@Param("id") Long id); + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryOutMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryOutMapper.java new file mode 100644 index 0000000..b05ea6d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryOutMapper.java @@ -0,0 +1,32 @@ +package com.xjrsoft.module.inventory.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xjrsoft.module.inventory.entity.LngInventoryOut; +import com.xjrsoft.module.inventory.vo.LngInventoryInVo; +import com.xjrsoft.module.inventory.vo.LngInventoryOutVo; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Mapper +public interface LngInventoryOutMapper extends BaseMapper { + + + @Select("SELECT io.*, sl.full_name AS staName ,"+ + " k.k_name as kName , "+ + " cu.cu_name as cuName ,NVL(com.short_name,com.name) AS com_name "+ + " FROM lng_inventory_out io "+ + " LEFT JOIN lng_contract k ON k.id=io.k_id "+ + " LEFT JOIN lng_customer cu ON cu.cu_code=io.cu_code "+ + " LEFT JOIN lng_b_station_lng sl ON sl.code=io.sta_code "+ + " LEFT JOIN xjr_department com ON com.id=io.com_id "+ + " WHERE io.id = #{id}") + LngInventoryOutVo getInfoBygId(@Param("id") Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryInService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryInService.java new file mode 100644 index 0000000..7638acc --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryInService.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.inventory.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xjrsoft.module.inventory.entity.LngInventoryIn; +import com.xjrsoft.module.inventory.vo.LngInventoryInVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ + +public interface ILngInventoryInService extends IService { + + LngInventoryInVo getInfoById(Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryOutService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryOutService.java new file mode 100644 index 0000000..c8a4dec --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryOutService.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.inventory.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xjrsoft.module.inventory.entity.LngInventoryOut; +import com.xjrsoft.module.inventory.vo.LngInventoryOutVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ + +public interface ILngInventoryOutService extends IService { + + LngInventoryOutVo getInfoById(Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryInServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryInServiceImpl.java new file mode 100644 index 0000000..b9dc66d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryInServiceImpl.java @@ -0,0 +1,41 @@ +package com.xjrsoft.module.inventory.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.inventory.entity.LngInventoryIn; +import com.xjrsoft.module.inventory.mapper.LngInventoryInMapper; +import com.xjrsoft.module.inventory.service.ILngInventoryInService; +import com.xjrsoft.module.inventory.vo.LngInventoryInVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class LngInventoryInServiceImpl extends ServiceImpl implements ILngInventoryInService { + + private final IFileClient fileClient; + + @Override + public LngInventoryInVo getInfoById(Long id) { + LngInventoryInVo vo = this.baseMapper.getInfoBygId(id); + if (vo == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + List fileList = fileClient.getTableFiles("lng_inventory_in", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryOutServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryOutServiceImpl.java new file mode 100644 index 0000000..409052f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryOutServiceImpl.java @@ -0,0 +1,42 @@ +package com.xjrsoft.module.inventory.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.inventory.entity.LngInventoryOut; +import com.xjrsoft.module.inventory.mapper.LngInventoryOutMapper; +import com.xjrsoft.module.inventory.service.ILngInventoryOutService; +import com.xjrsoft.module.inventory.vo.LngInventoryInVo; +import com.xjrsoft.module.inventory.vo.LngInventoryOutVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-19 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class LngInventoryOutServiceImpl extends ServiceImpl implements ILngInventoryOutService { + + private final IFileClient fileClient; + + @Override + public LngInventoryOutVo getInfoById(Long id) { + LngInventoryOutVo vo = this.baseMapper.getInfoBygId(id); + if (vo == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + List fileList = fileClient.getTableFiles("lng_inventory_in", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } +}