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

国内LNG销售，日计划管道气销售结算生成代码

Browse Source
This commit is contained in:
shunyi.kuang
2026-02-03 17:58:59 +08:00
parent 82c3d7405c
commit 4393948065
23 changed files with 2494 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java
View File

@ -112,6 +112,7 @@ public class ContractPurPngServiceImpl extends MPJBaseServiceImpl<LngContractPur
x.setKNo(lngContractFact.getKNo());
x.setEmpId(lngContractFact.getEmpId());
x.setTel(lngContractFact.getTel());
x.setBDeptId(lngContractFact.getBDeptId());
x.setKTypeCode1(lngContractFact.getKTypeCode1());
x.setRelTypeCode(lngContractFact.getRelTypeCode());
List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_contract_fact",
@ -132,8 +133,8 @@ public class ContractPurPngServiceImpl extends MPJBaseServiceImpl<LngContractPur
x.setLngFileUploadList(fileList);
x.setBDeptId(appro.getBDeptId());
x.setCode(appro.getCode());
x.setTypeCode(x.getTypeCode());
x.setEmpId(x.getEmpId());
x.setTypeCode(appro.getTypeCode());
x.setEmpId(appro.getEmpId());
x.setDateAppro(appro.getDateAppro());
x.setTitle(appro.getTitle());
}

5
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java
View File

@ -58,6 +58,7 @@ public class ContractSalesLngServiceImpl extends MPJBaseServiceImpl<LngContractS
x.setKNo(lngContractFact.getKNo());
x.setEmpId(lngContractFact.getEmpId());
x.setTel(lngContractFact.getTel());
x.setBDeptId(lngContractFact.getBDeptId());
x.setKTypeCode1(lngContractFact.getKTypeCode1());
x.setRelTypeCode(lngContractFact.getRelTypeCode());
List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_contract_fact",
@ -78,8 +79,8 @@ public class ContractSalesLngServiceImpl extends MPJBaseServiceImpl<LngContractS
x.setLngFileUploadList(fileList);
x.setBDeptId(appro.getBDeptId());
x.setCode(appro.getCode());
x.setTypeCode(x.getTypeCode());
x.setEmpId(x.getEmpId());
x.setTypeCode(appro.getTypeCode());
x.setEmpId(appro.getEmpId());
x.setDateAppro(appro.getDateAppro());
x.setTitle(appro.getTitle());
}

125
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java Normal file
View File

@ -0,0 +1,125 @@
package com.xjrsoft.module.dayPlan.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.dayPlan.dto.LngPngSettleHdrPageDto;
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
import com.xjrsoft.module.dayPlan.service.IPngSettleHdrService;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
/**
* @title: 管道气销售结算
* @Author 管理员
* @Date: 2026-02-03
* @Version 1.0
*/
@RestController
@RequestMapping("/dayPlan" + "/pngSettleHdr")
@Api(value = "/dayPlan" + "/pngSettleHdr",tags = "管道气销售结算代码")
@AllArgsConstructor
public class PngSettleHdrController {
private final IPngSettleHdrService pngSettleHdrService;
private final DatalogService dataService;
@GetMapping(value = "/page")
@ApiOperation(value="LngPngSettleHdr列表(分页)")
@SaCheckPermission("pngSettleHdr:list")
public R page(@Valid LngPngSettleHdrPageDto dto){
LambdaQueryWrapper<LngPngSettleHdr> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper
.eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdr::getId,dto.getId())
//.between(ObjectUtil.isNotNull(dto.getSettleMonthStart()) && ObjectUtil.isNotNull(dto.getSettleMonthEnd()),LngPngSettleHdr::getSettleMonth,dto.getSettleMonthStart(),dto.getSettleMonthEnd())
//.between(ObjectUtil.isNotNull(dto.getDateFromStart()) && ObjectUtil.isNotNull(dto.getDateFromEnd()),LngPngSettleHdr::getDateFrom,dto.getDateFromStart(),dto.getDateFromEnd())
// .between(ObjectUtil.isNotNull(dto.getDateToStart()) && ObjectUtil.isNotNull(dto.getDateToEnd()),LngPngSettleHdr::getDateTo,dto.getDateToStart(),dto.getDateToEnd())
.like(StrUtil.isNotBlank(dto.getCpCode()),LngPngSettleHdr::getCpCode,dto.getCpCode())
.eq(ObjectUtil.isNotNull(dto.getQtySettleGj()),LngPngSettleHdr::getQtySettleGj,dto.getQtySettleGj())
.eq(ObjectUtil.isNotNull(dto.getQtySettleM3()),LngPngSettleHdr::getQtySettleM3,dto.getQtySettleM3())
.eq(ObjectUtil.isNotNull(dto.getAmount()),LngPngSettleHdr::getAmount,dto.getAmount())
.eq(ObjectUtil.isNotNull(dto.getComId()),LngPngSettleHdr::getComId,dto.getComId())
.like(StrUtil.isNotBlank(dto.getSettleDesc()),LngPngSettleHdr::getSettleDesc,dto.getSettleDesc())
.eq(ObjectUtil.isNotNull(dto.getDeptId()),LngPngSettleHdr::getDeptId,dto.getDeptId())
.like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdr::getApproCode,dto.getApproCode())
.orderByDesc(LngPngSettleHdr::getId)
.select(LngPngSettleHdr.class,x -> VoToColumnUtil.fieldsToColumns(LngPngSettleHdrPageVo.class).contains(x.getProperty()));
IPage<LngPngSettleHdr> page = pngSettleHdrService.page(ConventPage.getPage(dto), queryWrapper);
PageOutput<LngPngSettleHdrPageVo> pageOutput = ConventPage.getPageOutput(page, LngPngSettleHdrPageVo.class);
return R.ok(pageOutput);
}
@GetMapping(value = "/info")
@ApiOperation(value="根据id查询LngPngSettleHdr信息")
@SaCheckPermission("pngSettleHdr:detail")
public R info(@RequestParam Long id){
LngPngSettleHdr lngPngSettleHdr = pngSettleHdrService.getByIdDeep(id);
if (lngPngSettleHdr == null) {
return R.error("找不到此数据！");
}
return R.ok(BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class));
}
@GetMapping(value = "/datalog")
@ApiOperation(value="根据id查询LngPngSettleHdr数据详细日志")
@SaCheckPermission("pngSettleHdr:datalog")
public R datalog(@RequestParam Long id){
List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngPngSettleHdrDto.class,id);
return R.ok(logs);
}
@PostMapping
@ApiOperation(value = "新增LngPngSettleHdr")
@SaCheckPermission("pngSettleHdr:add")
public R add(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){
UpdateLngPngSettleHdrDto res = dataService.insert(dto);
return R.ok(res.getId());
}
@PutMapping
@ApiOperation(value = "修改LngPngSettleHdr")
@SaCheckPermission("pngSettleHdr:edit")
public R update(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){
return R.ok(dataService.updateById(dto));
}
@DeleteMapping
@ApiOperation(value = "删除")
@SaCheckPermission("pngSettleHdr:delete")
public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateLngPngSettleHdrDto.class, ids));
}
}

197
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java Normal file
View File

@ -0,0 +1,197 @@
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.TableId;
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;
/**
* @title: 管道气销售结算
* @Author 管理员
* @Date: 2026-02-03
* @Version 1.0
*/
@Data
@TableName("lng_png_settle_hdr")
@ApiModel(value = "管道气销售结算对象", description = "管道气销售结算")
public class LngPngSettleHdr implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty("主键")
@TableId
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long id;
/**
* 结算月
*/
@ApiModelProperty("结算月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime settleMonth;
/**
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateFrom;
/**
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateTo;
/**
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
private String settleTypeCode;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
private String cpCode;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long comId;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleGj;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleM3;
/**
* 结算总金额
*/
@ApiModelProperty("结算总金额")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal amount;
/**
* 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
*/
@ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
private String rpSign;
/**
* 对账单(不显示，挂对账单附件用)
*/
@ApiModelProperty("对账单(不显示，挂对账单附件用)")
private String billAccount;
/**
* 审批状态
*/
@ApiModelProperty("审批状态")
private String approCode;
/**
* 结算说明
*/
@ApiModelProperty("结算说明")
private String settleDesc;
/**
* 备注
*/
@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;
/**
* lngPngSettleSales
*/
@ApiModelProperty("lngPngSettleSales子表")
@TableField(exist = false)
@EntityMapping(thisField = "id", joinField = "settleHdrId")
private List<LngPngSettleSales> lngPngSettleSalesList;
/**
* lngPngSettleSalesDtl
*/
@ApiModelProperty("lngPngSettleSalesDtl子表")
@TableField(exist = false)
@EntityMapping(thisField = "id", joinField = "settleId")
private List<LngPngSettleSalesDtl> lngPngSettleSalesDtlList;
}

238
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java Normal file
View File

@ -0,0 +1,238 @@
package com.xjrsoft.module.dayPlan.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @title: 管道气销售结算
* @Author 管理员
* @Date: 2026-02-03
* @Version 1.0
*/
@Data
@TableName("lng_png_settle_sales")
@ApiModel(value = "管道气销售结算对象", description = "管道气销售结算")
public class LngPngSettleSales implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty("主键")
@TableId
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long id;
/**
* 结算-管道气-销售-主表主键(lng_png_settle_hdr.id)
*/
@ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long settleHdrId;
/**
* 日计划-管道气-销售主键(lng_png_sales_pur.sales_id)
*/
@ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long salesId;
/**
* 结算月(从主表带)
*/
@ApiModelProperty("结算月(从主表带)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime settleMonth;
/**
* 结算类型(I-气费收入)
*/
@ApiModelProperty("结算类型(I-气费收入)")
private String settleTypeCode;
/**
* 计划日期(从lng_png_sales带)
*/
@ApiModelProperty("计划日期(从lng_png_sales带)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime datePlan;
/**
* 计量日期(从lng_png_sales带)
*/
@ApiModelProperty("计量日期(从lng_png_sales带)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateMea;
/**
* 客户(从lng_png_sales带)
*/
@ApiModelProperty("客户(从lng_png_sales带)")
private String cuCode;
/**
* 合同主键(从lng_png_sales带)
*/
@ApiModelProperty("合同主键(从lng_png_sales带)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long ksId;
/**
* 合同-国内销售-管道气-交割点主键(从lng_png_sales带)
*/
@ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long ksppId;
/**
* 交割点(从lng_png_sales带)
*/
@ApiModelProperty("交割点(从lng_png_sales带)")
private String pointDelyCode;
/**
* 主计量单位(从lng_png_sales带)
*/
@ApiModelProperty("主计量单位(从lng_png_sales带)")
private String uomCode;
/**
* 比值(方/吉焦)
*/
@ApiModelProperty("比值(方/吉焦)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal rateM3Gj;
/**
* 完成量(吉焦)
*/
@ApiModelProperty("完成量(吉焦)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtyMeaGj;
/**
* 完成量(方)
*/
@ApiModelProperty("完成量(方)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtyMeaM3;
/**
* 结算量(吉焦)
*/
@ApiModelProperty("结算量(吉焦)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleGj;
/**
* 结算量(方)
*/
@ApiModelProperty("结算量(方)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleM3;
/**
* 结算价格(元/吉焦)(金额/总量)
*/
@ApiModelProperty("结算价格(元/吉焦)(金额/总量)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal priceGj;
/**
* 结算价格(元/方)(金额/总量)
*/
@ApiModelProperty("结算价格(元/方)(金额/总量)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal priceM3;
/**
* 结算金额(自动计算，子表合计)
*/
@ApiModelProperty("结算金额(自动计算，子表合计)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal amount;
/**
* 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)
*/
@ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)")
private String priceDesc;
/**
* 结算次数(第一次结算1，第二次结算2……)
*/
@ApiModelProperty("结算次数(第一次结算1，第二次结算2……)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Byte settleTimes;
/**
* 备注
*/
@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;
}

181
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSalesDtl.java Normal file
View File

@ -0,0 +1,181 @@
package com.xjrsoft.module.dayPlan.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-02-03
* @Version 1.0
*/
@Data
@TableName("lng_png_settle_sales_dtl")
@ApiModel(value = "管道气销售结算对象", description = "管道气销售结算")
public class LngPngSettleSalesDtl implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty("主键")
@TableId
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long id;
/**
* 管道气销售日计划-销售结算主键
*/
@ApiModelProperty("管道气销售日计划-销售结算主键")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long settleId;
/**
* 价格类型(基础量/增量)
*/
@ApiModelProperty("价格类型(基础量/增量)")
private String priceCode;
/**
* 优先级
*/
@ApiModelProperty("优先级")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Byte sort;
/**
* 主计量单位(从lng_png_settle_sales带)
*/
@ApiModelProperty("主计量单位(从lng_png_settle_sales带)")
private String uomCode;
/**
* 阶梯量（吉焦）
*/
@ApiModelProperty("阶梯量（吉焦）")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal rateQtyGj;
/**
* 阶梯量（方）
*/
@ApiModelProperty("阶梯量（方）")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal rateQtyM3;
/**
* 比值(方/吉焦)
*/
@ApiModelProperty("比值(方/吉焦)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal rateM3Gj;
/**
* 结算数量(吉焦)
*/
@ApiModelProperty("结算数量(吉焦)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleGj;
/**
* 结算数量(方)
*/
@ApiModelProperty("结算数量(方)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleM3;
/**
* 价格(元/吉焦)
*/
@ApiModelProperty("价格(元/吉焦)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal priceGj;
/**
* 价格(元/方)
*/
@ApiModelProperty("价格(元/方)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal priceM3;
/**
* 金额(自动计算)
*/
@ApiModelProperty("金额(自动计算)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal amount;
/**
* 备注
*/
@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;
}

17
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java Normal file
View File

@ -0,0 +1,17 @@
package com.xjrsoft.module.dayPlan.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
import org.apache.ibatis.annotations.Mapper;
/**
* @title: mapper
* @Author 管理员
* @Date: 2026-02-03
* @Version 1.0
*/
@Mapper
public interface LngPngSettleHdrMapper extends MPJBaseMapper<LngPngSettleHdr> {
}

17
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java Normal file
View File

@ -0,0 +1,17 @@
package com.xjrsoft.module.dayPlan.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl;
import org.apache.ibatis.annotations.Mapper;
/**
* @title: mapper
* @Author 管理员
* @Date: 2026-02-03
* @Version 1.0
*/
@Mapper
public interface LngPngSettleSalesDtlMapper extends MPJBaseMapper<LngPngSettleSalesDtl> {
}

17
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java Normal file
View File

@ -0,0 +1,17 @@
package com.xjrsoft.module.dayPlan.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales;
import org.apache.ibatis.annotations.Mapper;
/**
* @title: mapper
* @Author 管理员
* @Date: 2026-02-03
* @Version 1.0
*/
@Mapper
public interface LngPngSettleSalesMapper extends MPJBaseMapper<LngPngSettleSales> {
}

17
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java Normal file
View File

@ -0,0 +1,17 @@
package com.xjrsoft.module.dayPlan.service;
import com.github.yulichang.base.MPJBaseService;
import com.github.yulichang.extension.mapping.base.MPJDeepService;
import com.github.yulichang.extension.mapping.base.MPJRelationService;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
/**
* @title: service
* @Author 管理员
* @Date: 2026-02-03
* @Version 1.0
*/
public interface IPngSettleHdrService extends MPJBaseService<LngPngSettleHdr>, MPJDeepService<LngPngSettleHdr>, MPJRelationService<LngPngSettleHdr> {
}

35
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java Normal file
View File

@ -0,0 +1,35 @@
package com.xjrsoft.module.dayPlan.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesMapper;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesDtlMapper;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper;
import com.xjrsoft.module.dayPlan.service.IPngSettleHdrService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
/**
* @title: service
* @Author 管理员
* @Date: 2026-02-03
* @Version 1.0
*/
@Service
@AllArgsConstructor
public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl<LngPngSettleHdrMapper, LngPngSettleHdr> implements IPngSettleHdrService {
private final LngPngSettleHdrMapper pngSettleHdrLngPngSettleHdrMapper;
private final LngPngSettleSalesMapper pngSettleHdrLngPngSettleSalesMapper;
private final LngPngSettleSalesDtlMapper pngSettleHdrLngPngSettleSalesDtlMapper;
}