From 8fdbf8debaffea8d58774f602f2d06ffde7272c7 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 12 Feb 2026 16:27:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1=E9=81=93?= =?UTF-8?q?=E6=B0=94=E9=87=87=E8=B4=AD=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/UpdateLngPngSettleHdrPurDto.java | 14 ++++++++++- .../dto/UpdateLngPngSettlePurDtlDto.java | 7 ++++++ .../dayPlan/dto/UpdateLngPngSettlePurDto.java | 2 +- .../dayPlan/vo/LngPngSettlePurDtlVo.java | 7 ++++++ .../module/dayPlan/vo/LngPngSettlePurVo.java | 16 +++++++----- .../controller/PngSettleHdrPurController.java | 25 ++++++++++--------- .../dayPlan/entity/LngPngSettlePurDtl.java | 9 +++++++ 7 files changed, 60 insertions(+), 20 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrPurDto.java index 0928a9d..acfd89e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrPurDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrPurDto.java @@ -8,11 +8,13 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogAttrField; import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.LogTable; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -153,9 +155,19 @@ public class UpdateLngPngSettleHdrPurDto implements Serializable { @ApiModelProperty("lngPngSettlePur子表") @LogJoin(name = "lngPngSettlePur子表", columns = { - @LogJoinColumn(field = "settleHdrId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "settleHdrId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngPngSettlePurDto.class, type = JoinType.MANY) private List lngPngSettlePurList; + + //附件 + @LogAttrField + private List lngFileUploadList; + + //对账单 + @LogAttrField + private List billList; + + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java index 067aead..12958de 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java @@ -101,6 +101,13 @@ public class UpdateLngPngSettlePurDtlDto implements Serializable { @ApiModelProperty("价格(元/方)") private BigDecimal priceM3; + /** + * 价格(元/吉焦) + */ + @LogField(name="价格",index=10) + @ApiModelProperty("价格(元/吉焦)") + private BigDecimal priceGj; + /** * 金额(自动计算) */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDto.java index ebcd1ad..b33b793 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDto.java @@ -252,7 +252,7 @@ public class UpdateLngPngSettlePurDto implements Serializable { @ApiModelProperty("lngPngSettlePurDtl子表") @LogJoin(name = "lngPngSettlePurDtl子表", columns = { - @LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "settleId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngPngSettlePurDtlDto.class, type = JoinType.MANY) private List lngPngSettlePurDtlList; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java index 1fe00bc..3b1a74a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java @@ -3,6 +3,7 @@ package com.xjrsoft.module.dayPlan.vo; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.pictc.annotations.datalog.LogField; import com.xjrsoft.common.annotation.Trans; import com.xjrsoft.common.enums.TransType; @@ -100,6 +101,12 @@ public class LngPngSettlePurDtlVo extends com.xjrsoft.common.model.base.BaseMode @ApiModelProperty("价格(元/方)") private BigDecimal priceM3; + /** + * 价格(元/吉焦) + */ + @ApiModelProperty("价格(元/吉焦)") + private BigDecimal priceGj; + /** * 金额(自动计算) 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 85372c9..3ebcb94 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,6 +5,8 @@ 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; @@ -109,8 +111,9 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ * 上载点(从lng_png_sales_pur带) */ @ApiModelProperty("上载点(从lng_png_sales_pur带)") + @Trans(type = TransType.LNG_STATION, transToFieldName = "pointDelyName") private String pointUpCode; - + private String pointDelyName; /** * 主计量单位(从lng_png_sales_pur带) @@ -118,12 +121,13 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("主计量单位(从lng_png_sales_pur带)") private String uomCode; - /** - * 客户(从lng_png_sales带) - */ - @ApiModelProperty("客户(从lng_png_sales带)") - private String cuCode; + * 客户(从lng_png_sales带) + */ + @ApiModelProperty("客户(从lng_png_sales带)") + @Trans(type = TransType.CUSTOMER, transToFieldName = "cuName") + private String cuCode; + private String cuName; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java index 81fdf8c..88b2605 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java @@ -114,19 +114,20 @@ public class PngSettleHdrPurController { @SaCheckPermission("pngSettleHdrPur:edit") public R update(@Valid @RequestBody UpdateLngPngSettleHdrPurDto dto){ //return R.ok(dataService.updateById(dto)); - return R.ok(dataService.updateById(dto,new DataOperationListener() { + dto.setSettleTypeCode("C"); + return R.ok(dataService.updateById(dto,new DataOperationListener() { - @Override - public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { - return null; - } - - @Override - public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { - - return null; - } - })); + @Override + public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { + + return null; + } + })); } @DeleteMapping diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePurDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePurDtl.java index 4260d7f..8dccf38 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePurDtl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePurDtl.java @@ -8,6 +8,8 @@ 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 com.pictc.annotations.datalog.LogField; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -107,6 +109,13 @@ public class LngPngSettlePurDtl implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal priceM3; + /** + * 价格(元/吉焦) + */ + @ApiModelProperty("价格(元/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceGj; + /** * 金额(自动计算) */