geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日计划管道气采购结算

Browse Source
This commit is contained in:
shunyi.kuang
2026-02-12 16:27:34 +08:00
parent aa84a979e9
commit 8fdbf8deba
7 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrPurDto.java
View File

@ -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<UpdateLngPngSettlePurDto> lngPngSettlePurList;
//附件
@LogAttrField
private List<LngFileUploadVo> lngFileUploadList;
//对账单
@LogAttrField
private List<LngFileUploadVo> billList;
}

7
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java
View File

@ -101,6 +101,13 @@ public class UpdateLngPngSettlePurDtlDto implements Serializable {
@ApiModelProperty("价格(元/方)")
private BigDecimal priceM3;
/**
* 价格(元/吉焦)
*/
@LogField(name="价格",index=10)
@ApiModelProperty("价格(元/吉焦)")
private BigDecimal priceGj;
/**
* 金额(自动计算)
*/

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDto.java
View File

@ -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<UpdateLngPngSettlePurDtlDto> lngPngSettlePurDtlList;

7
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java
View File

@ -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;
/**
* 金额(自动计算)

8
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java
View File

@ -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带)")
@Trans(type = TransType.CUSTOMER, transToFieldName = "cuName")
private String cuCode;
private String cuName;
/**

1
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java
View File

@ -114,6 +114,7 @@ public class PngSettleHdrPurController {
@SaCheckPermission("pngSettleHdrPur:edit")
public R update(@Valid @RequestBody UpdateLngPngSettleHdrPurDto dto){
//return R.ok(dataService.updateById(dto));
dto.setSettleTypeCode("C");
return R.ok(dataService.updateById(dto,new DataOperationListener<UpdateLngPngSettleHdrPurDto>() {
@Override

9
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePurDtl.java
View File

@ -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;
/**
* 金额(自动计算)
*/