diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java
index 6b22335..421c3c8 100644
--- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java
+++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java
@@ -630,7 +630,7 @@ public class DataLogTools {
 						Set<Class<?>> joinClasses = SetUtils.ofCollection(classes);
 						initJoinValue(item,joinTable,joinClasses);
 					}
-				}else {
+				}else if(joinValue != null){
 					Long idValue2 = joinTable.getIdValue(joinValue);
 					if(idValue2==null || idValue2 <=0) {
 						joinTable.setIdValue(joinValue,idValue2);
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java
index 2df761c..4ed818b 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 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;
@@ -106,6 +107,7 @@ public class UpdateLngContractSalesDto implements Serializable {
     */
     @LogField(name="合同签订日期",index=10)
     @ApiModelProperty("合同签订日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateSign;
     
     /**
@@ -113,6 +115,7 @@ public class UpdateLngContractSalesDto implements Serializable {
     */
     @LogField(name="有效期开始",index=11)
     @ApiModelProperty("有效期开始")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateFrom;
     
     /**
@@ -120,6 +123,7 @@ public class UpdateLngContractSalesDto implements Serializable {
     */
     @LogField(name="有效期结束",index=12)
     @ApiModelProperty("有效期结束")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateTo;
     
     /**
@@ -127,6 +131,7 @@ public class UpdateLngContractSalesDto implements Serializable {
     */
     @LogField(name="确认函开始日",index=13)
     @ApiModelProperty("确认函开始日")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateCfmFrom;
     
     /**
@@ -134,6 +139,7 @@ public class UpdateLngContractSalesDto implements Serializable {
     */
     @LogField(name="确认函结束日",index=14)
     @ApiModelProperty("确认函结束日")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateCfmTo;
     
     /**
@@ -187,35 +193,46 @@ public class UpdateLngContractSalesDto implements Serializable {
     
 
     /**
-    * lngContractPurPng
+    * lngContractSalesLng
     */
-    @ApiModelProperty("lngContractPurPng子表")
-    @LogJoin(name = "lngContractPurPng子表",
+    @ApiModelProperty("lngContractSalesLng子表")
+    @LogJoin(name = "lngContractSalesLng子表",
     columns = {
     	@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
     }, 
-    caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngDto.class, type = JoinType.MANY)
-    private List<UpdateLngContractPurPngDto> lngContractPurPngList;
+    caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDto.class, type = JoinType.MANY)
+    private List<UpdateLngContractSalesLngDto> lngContractSalesLngList;
     /**
-    * lngContractPurPngPoint
+    * LngContractSalesLngSta
     */
-    @ApiModelProperty("lngContractPurPngPoint子表")
-    @LogJoin(name = "lngContractPurPngPoint子表",
+    @ApiModelProperty("LngContractSalesLngSta子表")
+    @LogJoin(name = "LngContractSalesLngSta子表",
     columns = {
     	@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
     }, 
-    caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointDto.class, type = JoinType.MANY)
-    private List<UpdateLngContractPurPngPointDto> lngContractPurPngPointList;
+    caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngStaDto.class, type = JoinType.MANY)
+    private List<UpdateLngContractSalesLngStaDto> lngContractSalesLngStaList;
+    
     /**
-    * lngContractPurPngQty
+     * LngContractSalesLngSta
+     */
+     @ApiModelProperty("LngContractSalesLngDisc子表")
+     @LogJoin(name = "LngContractSalesLngDisc子表",
+     columns = {
+     	@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
+     }, 
+     caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDiscDto.class, type = JoinType.MANY)
+     private List<UpdateLngContractSalesLngDiscDto> lngContractSalesLngDiscList;
+    /**
+    * lngContractSalesLngQty
     */
-    @ApiModelProperty("lngContractPurPngQty子表")
-    @LogJoin(name = "lngContractPurPngQty子表",
+    @ApiModelProperty("LngContractSalesLngQty子表")
+    @LogJoin(name = "LngContractSalesLngQty子表",
     columns = {
     	@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
     }, 
-    caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngQtyDto.class, type = JoinType.MANY)
-    private List<UpdateLngContractPurPngQtyDto> lngContractPurPngQtyList;
+    caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngQtyDto.class, type = JoinType.MANY)
+    private List<UpdateLngContractSalesLngQtyDto> lngContractSalesLngQtyList;
     /**
     * lngContractApproRel
     */
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java
index 9ffcc8c..4061160 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java
@@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.dto;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pictc.annotations.datalog.LogField;
 import com.pictc.annotations.datalog.LogTable;
 
@@ -50,6 +51,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable {
     */
     @LogField(name="开始日期",index=3)
     @ApiModelProperty("开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateFrom;
     
     /**
@@ -57,6 +59,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable {
     */
     @LogField(name="结束日期",index=4)
     @ApiModelProperty("结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateTo;
     
     /**
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java
index c776918..39c95bd 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pictc.annotations.datalog.LogField;
 import com.pictc.annotations.datalog.LogTable;
 
@@ -44,6 +45,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable {
     */
     @LogField(name="开始日期",index=2)
     @ApiModelProperty("开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateFrom;
     
     /**
@@ -51,6 +53,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable {
     */
     @LogField(name="结束日期",index=3)
     @ApiModelProperty("结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateTo;
     
     /**
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java
index 1681e26..c7dfdff 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java
@@ -88,6 +88,7 @@ public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseMode
     */
     @ApiModelProperty("部门id")
     private Long deptId;
+ 
     
     
     /**
@@ -146,6 +147,20 @@ public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseMode
      */
      @ApiModelProperty("联系电话")
      private String tel;
+     
+     /**
+      * 业务部门ID
+      */
+      @ApiModelProperty("业务部门ID")
+      @Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
+      private Long bDeptId;
+
+
+      /**
+       * 业务部门名称
+       */
+      @ApiModelProperty("业务部门名称")
+      private String bDeptName;
 
     /**
      * lngFileUpload
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java
index ba685b7..13ee1e2 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java
@@ -2,6 +2,10 @@ package com.xjrsoft.module.contract.vo;
 
 import java.time.LocalDateTime;
 
+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;
 
@@ -32,13 +36,17 @@ public class LngContractSalesLngDiscVo extends com.xjrsoft.common.model.base.Bas
     * 返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)
     */
     @ApiModelProperty("返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)")
+    
+    @Trans(type = TransType.DIC, id = "2016806282214830081",transToFieldName = "discTypeName")
     private String discTypeCode;
+    private String discTypeName;
     
     
     /**
     * 开始日期
     */
     @ApiModelProperty("开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateFrom;
     
     
@@ -46,6 +54,7 @@ public class LngContractSalesLngDiscVo extends com.xjrsoft.common.model.base.Bas
     * 结束日期
     */
     @ApiModelProperty("结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateTo;
     
     
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java
index 4539b7a..59bad8f 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java
@@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.vo;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xjrsoft.common.annotation.Trans;
 import com.xjrsoft.common.enums.TransType;
 
@@ -36,6 +37,7 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base
     * 开始日期
     */
     @ApiModelProperty("开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateFrom;
     
     
@@ -43,6 +45,7 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base
     * 结束日期
     */
     @ApiModelProperty("结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateTo;
     
     
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java
index 50e8257..02c085b 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java
@@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.vo;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pictc.annotations.datalog.LogAttrField;
 import com.xjrsoft.common.annotation.Trans;
 import com.xjrsoft.common.enums.TransType;
@@ -97,6 +98,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
     * 合同签订日期
     */
     @ApiModelProperty("合同签订日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateSign;
     
     
@@ -104,6 +106,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
     * 有效期开始
     */
     @ApiModelProperty("有效期开始")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateFrom;
     
     
@@ -111,6 +114,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
     * 有效期结束
     */
     @ApiModelProperty("有效期结束")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateTo;
     
     
@@ -118,6 +122,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
     * 确认函开始日
     */
     @ApiModelProperty("确认函开始日")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateCfmFrom;
     
     
@@ -125,6 +130,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
     * 确认函结束日
     */
     @ApiModelProperty("确认函结束日")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime dateCfmTo;
     
     
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrDto.java
new file mode 100644
index 0000000..408fe90
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrDto.java
@@ -0,0 +1,113 @@
+package com.xjrsoft.module.dayPlan.dto;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+
+
+/**
+* @title: 管道气销售结算
+* @Author 管理员
+* @Date: 2026-02-03
+* @Version 1.0
+*/
+@Data
+public class AddLngPngSettleHdrDto extends com.xjrsoft.common.model.base.BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 结算月
+    */
+    @ApiModelProperty("结算月")
+    private LocalDateTime settleMonth;
+    /**
+    * 结算月开始日期
+    */
+    @ApiModelProperty("结算月开始日期")
+    private LocalDateTime dateFrom;
+    /**
+    * 结算月结束日期
+    */
+    @ApiModelProperty("结算月结束日期")
+    private LocalDateTime dateTo;
+    /**
+    * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
+    */
+    @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
+    private String settleTypeCode;
+    /**
+    * 供应商/客户(根据结算类型关联供应商/客户)
+    */
+    @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
+    private String cpCode;
+    /**
+    * 交易主体(天然气公司/惠贸)
+    */
+    @ApiModelProperty("交易主体(天然气公司/惠贸)")
+    private Long comId;
+    /**
+    * 结算总数量(吉焦)(不包含二次结算的数量)
+    */
+    @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
+    private BigDecimal qtySettleGj;
+    /**
+    * 结算总数量(方)(不包含二次结算的数量)
+    */
+    @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
+    private BigDecimal qtySettleM3;
+    /**
+    * 结算总金额
+    */
+    @ApiModelProperty("结算总金额")
+    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")
+    private Long tenantId;
+
+    /**
+    * lngPngSettleSales
+    */
+    @ApiModelProperty("lngPngSettleSales子表")
+    private List<AddLngPngSettleSalesDto> lngPngSettleSalesList;
+    /**
+    * lngPngSettleSalesDtl
+    */
+    @ApiModelProperty("lngPngSettleSalesDtl子表")
+    private List<AddLngPngSettleSalesDtlDto> lngPngSettleSalesDtlList;
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDtlDto.java
new file mode 100644
index 0000000..d2795d2
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDtlDto.java
@@ -0,0 +1,103 @@
+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-02-03
+* @Version 1.0
+*/
+@Data
+public class AddLngPngSettleSalesDtlDto extends com.xjrsoft.common.model.base.BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 管道气销售日计划-销售结算主键
+    */
+    @ApiModelProperty("管道气销售日计划-销售结算主键")
+    private Long settleId;
+    /**
+    * 价格类型(基础量/增量)
+    */
+    @ApiModelProperty("价格类型(基础量/增量)")
+    private String priceCode;
+    /**
+    * 优先级
+    */
+    @ApiModelProperty("优先级")
+    private Byte sort;
+    /**
+    * 主计量单位(从lng_png_settle_sales带)
+    */
+    @ApiModelProperty("主计量单位(从lng_png_settle_sales带)")
+    private String uomCode;
+    /**
+    * 阶梯量（吉焦）
+    */
+    @ApiModelProperty("阶梯量（吉焦）")
+    private BigDecimal rateQtyGj;
+    /**
+    * 阶梯量（方）
+    */
+    @ApiModelProperty("阶梯量（方）")
+    private BigDecimal rateQtyM3;
+    /**
+    * 比值(方/吉焦)
+    */
+    @ApiModelProperty("比值(方/吉焦)")
+    private BigDecimal rateM3Gj;
+    /**
+    * 结算数量(吉焦)
+    */
+    @ApiModelProperty("结算数量(吉焦)")
+    private BigDecimal qtySettleGj;
+    /**
+    * 结算数量(方)
+    */
+    @ApiModelProperty("结算数量(方)")
+    private BigDecimal qtySettleM3;
+    /**
+    * 价格(元/吉焦)
+    */
+    @ApiModelProperty("价格(元/吉焦)")
+    private BigDecimal priceGj;
+    /**
+    * 价格(元/方)
+    */
+    @ApiModelProperty("价格(元/方)")
+    private BigDecimal priceM3;
+    /**
+    * 金额(自动计算)
+    */
+    @ApiModelProperty("金额(自动计算)")
+    private BigDecimal amount;
+    /**
+    * 备注
+    */
+    @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/AddLngPngSettleSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDto.java
new file mode 100644
index 0000000..2118597
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDto.java
@@ -0,0 +1,148 @@
+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-02-03
+* @Version 1.0
+*/
+@Data
+public class AddLngPngSettleSalesDto extends com.xjrsoft.common.model.base.BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 结算-管道气-销售-主表主键(lng_png_settle_hdr.id)
+    */
+    @ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)")
+    private Long settleHdrId;
+    /**
+    * 日计划-管道气-销售主键(lng_png_sales_pur.sales_id)
+    */
+    @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)")
+    private Long salesId;
+    /**
+    * 结算月(从主表带)
+    */
+    @ApiModelProperty("结算月(从主表带)")
+    private LocalDateTime settleMonth;
+    /**
+    * 结算类型(I-气费收入)
+    */
+    @ApiModelProperty("结算类型(I-气费收入)")
+    private String settleTypeCode;
+    /**
+    * 计划日期(从lng_png_sales带)
+    */
+    @ApiModelProperty("计划日期(从lng_png_sales带)")
+    private LocalDateTime datePlan;
+    /**
+    * 计量日期(从lng_png_sales带)
+    */
+    @ApiModelProperty("计量日期(从lng_png_sales带)")
+    private LocalDateTime dateMea;
+    /**
+    * 客户(从lng_png_sales带)
+    */
+    @ApiModelProperty("客户(从lng_png_sales带)")
+    private String cuCode;
+    /**
+    * 合同主键(从lng_png_sales带)
+    */
+    @ApiModelProperty("合同主键(从lng_png_sales带)")
+    private Long ksId;
+    /**
+    * 合同-国内销售-管道气-交割点主键(从lng_png_sales带)
+    */
+    @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)")
+    private Long ksppId;
+    /**
+    * 交割点(从lng_png_sales带)
+    */
+    @ApiModelProperty("交割点(从lng_png_sales带)")
+    private String pointDelyCode;
+    /**
+    * 主计量单位(从lng_png_sales带)
+    */
+    @ApiModelProperty("主计量单位(从lng_png_sales带)")
+    private String uomCode;
+    /**
+    * 比值(方/吉焦)
+    */
+    @ApiModelProperty("比值(方/吉焦)")
+    private BigDecimal rateM3Gj;
+    /**
+    * 完成量(吉焦)
+    */
+    @ApiModelProperty("完成量(吉焦)")
+    private BigDecimal qtyMeaGj;
+    /**
+    * 完成量(方)
+    */
+    @ApiModelProperty("完成量(方)")
+    private BigDecimal qtyMeaM3;
+    /**
+    * 结算量(吉焦)
+    */
+    @ApiModelProperty("结算量(吉焦)")
+    private BigDecimal qtySettleGj;
+    /**
+    * 结算量(方)
+    */
+    @ApiModelProperty("结算量(方)")
+    private BigDecimal qtySettleM3;
+    /**
+    * 结算价格(元/吉焦)(金额/总量)
+    */
+    @ApiModelProperty("结算价格(元/吉焦)(金额/总量)")
+    private BigDecimal priceGj;
+    /**
+    * 结算价格(元/方)(金额/总量)
+    */
+    @ApiModelProperty("结算价格(元/方)(金额/总量)")
+    private BigDecimal priceM3;
+    /**
+    * 结算金额(自动计算，子表合计)
+    */
+    @ApiModelProperty("结算金额(自动计算，子表合计)")
+    private BigDecimal amount;
+    /**
+    * 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)
+    */
+    @ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)")
+    private String priceDesc;
+    /**
+    * 结算次数(第一次结算1，第二次结算2……)
+    */
+    @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)")
+    private Byte settleTimes;
+    /**
+    * 备注
+    */
+    @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/LngPngSettleHdrPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngSettleHdrPageDto.java
new file mode 100644
index 0000000..1b1796d
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngSettleHdrPageDto.java
@@ -0,0 +1,88 @@
+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-02-03
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class LngPngSettleHdrPageDto extends PageInput {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+    /**
+    * 结算月
+    */
+    @ApiModelProperty("结算月")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime settleMonth;
+    /**
+    * 结算月开始日期
+    */
+    @ApiModelProperty("结算月开始日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime dateFrom;
+    /**
+    * 结算月结束日期
+    */
+    @ApiModelProperty("结算月结束日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime dateTo;
+    /**
+    * 供应商/客户(根据结算类型关联供应商/客户)
+    */
+    @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
+    private String cpCode;
+    /**
+    * 结算总数量(吉焦)(不包含二次结算的数量)
+    */
+    @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
+    private BigDecimal qtySettleGj;
+    /**
+    * 结算总数量(方)(不包含二次结算的数量)
+    */
+    @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
+    private BigDecimal qtySettleM3;
+    /**
+    * 结算总金额
+    */
+    @ApiModelProperty("结算总金额")
+    private BigDecimal amount;
+    /**
+    * 交易主体(天然气公司/惠贸)
+    */
+    @ApiModelProperty("交易主体(天然气公司/惠贸)")
+    private Long comId;
+    /**
+    * 结算说明
+    */
+    @ApiModelProperty("结算说明")
+    private String settleDesc;
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+    /**
+    * 审批状态
+    */
+    @ApiModelProperty("审批状态")
+    private String approCode;
+
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java
new file mode 100644
index 0000000..6796b41
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java
@@ -0,0 +1,166 @@
+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.JoinCaseType;
+import com.pictc.annotations.datalog.JoinType;
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 管道气销售结算
+* @Author 管理员
+* @Date: 2026-02-03
+* @Version 1.0
+*/
+@Data
+@LogTable(source="lng_png_settle_hdr",name="管道气销售结算")
+public class UpdateLngPngSettleHdrDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键
+    */
+    @LogField(name="主键",index=0)
+    @ApiModelProperty("主键")
+    private Long id;
+    
+    /**
+    * 结算月
+    */
+    @LogField(name="结算月",index=1)
+    @ApiModelProperty("结算月")
+    private LocalDateTime settleMonth;
+    
+    /**
+    * 结算月开始日期
+    */
+    @LogField(name="结算月开始日期",index=2)
+    @ApiModelProperty("结算月开始日期")
+    private LocalDateTime dateFrom;
+    
+    /**
+    * 结算月结束日期
+    */
+    @LogField(name="结算月结束日期",index=3)
+    @ApiModelProperty("结算月结束日期")
+    private LocalDateTime dateTo;
+    
+    /**
+    * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
+    */
+    @LogField(name="结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)",index=4)
+    @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
+    private String settleTypeCode;
+    
+    /**
+    * 供应商/客户(根据结算类型关联供应商/客户)
+    */
+    @LogField(name="供应商/客户(根据结算类型关联供应商/客户)",index=5)
+    @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
+    private String cpCode;
+    
+    /**
+    * 交易主体(天然气公司/惠贸)
+    */
+    @LogField(name="交易主体(天然气公司/惠贸)",index=6)
+    @ApiModelProperty("交易主体(天然气公司/惠贸)")
+    private Long comId;
+    
+    /**
+    * 结算总数量(吉焦)(不包含二次结算的数量)
+    */
+    @LogField(name="结算总数量(吉焦)(不包含二次结算的数量)",index=7)
+    @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
+    private BigDecimal qtySettleGj;
+    
+    /**
+    * 结算总数量(方)(不包含二次结算的数量)
+    */
+    @LogField(name="结算总数量(方)(不包含二次结算的数量)",index=8)
+    @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
+    private BigDecimal qtySettleM3;
+    
+    /**
+    * 结算总金额
+    */
+    @LogField(name="结算总金额",index=9)
+    @ApiModelProperty("结算总金额")
+    private BigDecimal amount;
+    
+    /**
+    * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
+    */
+    @LogField(name="账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)",index=10)
+    @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
+    private String rpSign;
+    
+    /**
+    * 对账单(不显示，挂对账单附件用)
+    */
+    @LogField(name="对账单(不显示，挂对账单附件用)",index=11)
+    @ApiModelProperty("对账单(不显示，挂对账单附件用)")
+    private String billAccount;
+    
+    /**
+    * 审批状态
+    */
+    @LogField(name="审批状态",index=12)
+    @ApiModelProperty("审批状态")
+    private String approCode;
+    
+    /**
+    * 结算说明
+    */
+    @LogField(name="结算说明",index=13)
+    @ApiModelProperty("结算说明")
+    private String settleDesc;
+    
+    /**
+    * 备注
+    */
+    @LogField(name="备注",index=14)
+    @ApiModelProperty("备注")
+    private String note;
+    
+    /**
+    * 租户id
+    */
+    @LogField(name="租户id",index=15)
+    @ApiModelProperty("租户id")
+    private Long tenantId;
+    
+
+    /**
+    * lngPngSettleSales
+    */
+    @ApiModelProperty("lngPngSettleSales子表")
+    @LogJoin(name = "lngPngSettleSales子表",
+    columns = {
+    	@LogJoinColumn(field = "settleHdrId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
+    }, 
+    caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDto.class, type = JoinType.MANY)
+    private List<UpdateLngPngSettleSalesDto> lngPngSettleSalesList;
+    /**
+    * lngPngSettleSalesDtl
+    */
+    @ApiModelProperty("lngPngSettleSalesDtl子表")
+    @LogJoin(name = "lngPngSettleSalesDtl子表",
+    columns = {
+    	@LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
+    }, 
+    caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDtlDto.class, type = JoinType.MANY)
+    private List<UpdateLngPngSettleSalesDtlDto> lngPngSettleSalesDtlList;
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java
new file mode 100644
index 0000000..8721fc2
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java
@@ -0,0 +1,142 @@
+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 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.ValueDirectionType;
+
+
+
+
+/**
+* @title: 管道气销售结算
+* @Author 管理员
+* @Date: 2026-02-03
+* @Version 1.0
+*/
+@Data
+@LogTable(source="lng_png_settle_sales_dtl",name="管道气销售结算")
+public class UpdateLngPngSettleSalesDtlDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键
+    */
+    @LogField(name="主键",index=0)
+    @ApiModelProperty("主键")
+    private Long id;
+    
+    /**
+    * 管道气销售日计划-销售结算主键
+    */
+    @LogField(name="管道气销售日计划-销售结算主键",index=1)
+    @ApiModelProperty("管道气销售日计划-销售结算主键")
+    private Long settleId;
+    
+    /**
+    * 价格类型(基础量/增量)
+    */
+    @LogField(name="价格类型(基础量/增量)",index=2)
+    @ApiModelProperty("价格类型(基础量/增量)")
+    private String priceCode;
+    
+    /**
+    * 优先级
+    */
+    @LogField(name="优先级",index=3)
+    @ApiModelProperty("优先级")
+    private Byte sort;
+    
+    /**
+    * 主计量单位(从lng_png_settle_sales带)
+    */
+    @LogField(name="主计量单位(从lng_png_settle_sales带)",index=4)
+    @ApiModelProperty("主计量单位(从lng_png_settle_sales带)")
+    private String uomCode;
+    
+    /**
+    * 阶梯量（吉焦）
+    */
+    @LogField(name="阶梯量（吉焦）",index=5)
+    @ApiModelProperty("阶梯量（吉焦）")
+    private BigDecimal rateQtyGj;
+    
+    /**
+    * 阶梯量（方）
+    */
+    @LogField(name="阶梯量（方）",index=6)
+    @ApiModelProperty("阶梯量（方）")
+    private BigDecimal rateQtyM3;
+    
+    /**
+    * 比值(方/吉焦)
+    */
+    @LogField(name="比值(方/吉焦)",index=7)
+    @ApiModelProperty("比值(方/吉焦)")
+    private BigDecimal rateM3Gj;
+    
+    /**
+    * 结算数量(吉焦)
+    */
+    @LogField(name="结算数量(吉焦)",index=8)
+    @ApiModelProperty("结算数量(吉焦)")
+    private BigDecimal qtySettleGj;
+    
+    /**
+    * 结算数量(方)
+    */
+    @LogField(name="结算数量(方)",index=9)
+    @ApiModelProperty("结算数量(方)")
+    private BigDecimal qtySettleM3;
+    
+    /**
+    * 价格(元/吉焦)
+    */
+    @LogField(name="价格(元/吉焦)",index=10)
+    @ApiModelProperty("价格(元/吉焦)")
+    private BigDecimal priceGj;
+    
+    /**
+    * 价格(元/方)
+    */
+    @LogField(name="价格(元/方)",index=11)
+    @ApiModelProperty("价格(元/方)")
+    private BigDecimal priceM3;
+    
+    /**
+    * 金额(自动计算)
+    */
+    @LogField(name="金额(自动计算)",index=12)
+    @ApiModelProperty("金额(自动计算)")
+    private BigDecimal amount;
+    
+    /**
+    * 备注
+    */
+    @LogField(name="备注",index=13)
+    @ApiModelProperty("备注")
+    private String note;
+    
+    /**
+    * 租户id
+    */
+    @LogField(name="租户id",index=14)
+    @ApiModelProperty("租户id")
+    private Long tenantId;
+    
+
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java
new file mode 100644
index 0000000..c68fbad
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java
@@ -0,0 +1,205 @@
+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 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.ValueDirectionType;
+
+
+
+
+/**
+* @title: 管道气销售结算
+* @Author 管理员
+* @Date: 2026-02-03
+* @Version 1.0
+*/
+@Data
+@LogTable(source="lng_png_settle_sales",name="管道气销售结算")
+public class UpdateLngPngSettleSalesDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键
+    */
+    @LogField(name="主键",index=0)
+    @ApiModelProperty("主键")
+    private Long id;
+    
+    /**
+    * 结算-管道气-销售-主表主键(lng_png_settle_hdr.id)
+    */
+    @LogField(name="结算-管道气-销售-主表主键(lng_png_settle_hdr.id)",index=1)
+    @ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)")
+    private Long settleHdrId;
+    
+    /**
+    * 日计划-管道气-销售主键(lng_png_sales_pur.sales_id)
+    */
+    @LogField(name="日计划-管道气-销售主键(lng_png_sales_pur.sales_id)",index=2)
+    @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)")
+    private Long salesId;
+    
+    /**
+    * 结算月(从主表带)
+    */
+    @LogField(name="结算月(从主表带)",index=3)
+    @ApiModelProperty("结算月(从主表带)")
+    private LocalDateTime settleMonth;
+    
+    /**
+    * 结算类型(I-气费收入)
+    */
+    @LogField(name="结算类型(I-气费收入)",index=4)
+    @ApiModelProperty("结算类型(I-气费收入)")
+    private String settleTypeCode;
+    
+    /**
+    * 计划日期(从lng_png_sales带)
+    */
+    @LogField(name="计划日期(从lng_png_sales带)",index=5)
+    @ApiModelProperty("计划日期(从lng_png_sales带)")
+    private LocalDateTime datePlan;
+    
+    /**
+    * 计量日期(从lng_png_sales带)
+    */
+    @LogField(name="计量日期(从lng_png_sales带)",index=6)
+    @ApiModelProperty("计量日期(从lng_png_sales带)")
+    private LocalDateTime dateMea;
+    
+    /**
+    * 客户(从lng_png_sales带)
+    */
+    @LogField(name="客户(从lng_png_sales带)",index=7)
+    @ApiModelProperty("客户(从lng_png_sales带)")
+    private String cuCode;
+    
+    /**
+    * 合同主键(从lng_png_sales带)
+    */
+    @LogField(name="合同主键(从lng_png_sales带)",index=8)
+    @ApiModelProperty("合同主键(从lng_png_sales带)")
+    private Long ksId;
+    
+    /**
+    * 合同-国内销售-管道气-交割点主键(从lng_png_sales带)
+    */
+    @LogField(name="合同-国内销售-管道气-交割点主键(从lng_png_sales带)",index=9)
+    @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)")
+    private Long ksppId;
+    
+    /**
+    * 交割点(从lng_png_sales带)
+    */
+    @LogField(name="交割点(从lng_png_sales带)",index=10)
+    @ApiModelProperty("交割点(从lng_png_sales带)")
+    private String pointDelyCode;
+    
+    /**
+    * 主计量单位(从lng_png_sales带)
+    */
+    @LogField(name="主计量单位(从lng_png_sales带)",index=11)
+    @ApiModelProperty("主计量单位(从lng_png_sales带)")
+    private String uomCode;
+    
+    /**
+    * 比值(方/吉焦)
+    */
+    @LogField(name="比值(方/吉焦)",index=12)
+    @ApiModelProperty("比值(方/吉焦)")
+    private BigDecimal rateM3Gj;
+    
+    /**
+    * 完成量(吉焦)
+    */
+    @LogField(name="完成量(吉焦)",index=13)
+    @ApiModelProperty("完成量(吉焦)")
+    private BigDecimal qtyMeaGj;
+    
+    /**
+    * 完成量(方)
+    */
+    @LogField(name="完成量(方)",index=14)
+    @ApiModelProperty("完成量(方)")
+    private BigDecimal qtyMeaM3;
+    
+    /**
+    * 结算量(吉焦)
+    */
+    @LogField(name="结算量(吉焦)",index=15)
+    @ApiModelProperty("结算量(吉焦)")
+    private BigDecimal qtySettleGj;
+    
+    /**
+    * 结算量(方)
+    */
+    @LogField(name="结算量(方)",index=16)
+    @ApiModelProperty("结算量(方)")
+    private BigDecimal qtySettleM3;
+    
+    /**
+    * 结算价格(元/吉焦)(金额/总量)
+    */
+    @LogField(name="结算价格(元/吉焦)(金额/总量)",index=17)
+    @ApiModelProperty("结算价格(元/吉焦)(金额/总量)")
+    private BigDecimal priceGj;
+    
+    /**
+    * 结算价格(元/方)(金额/总量)
+    */
+    @LogField(name="结算价格(元/方)(金额/总量)",index=18)
+    @ApiModelProperty("结算价格(元/方)(金额/总量)")
+    private BigDecimal priceM3;
+    
+    /**
+    * 结算金额(自动计算，子表合计)
+    */
+    @LogField(name="结算金额(自动计算，子表合计)",index=19)
+    @ApiModelProperty("结算金额(自动计算，子表合计)")
+    private BigDecimal amount;
+    
+    /**
+    * 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)
+    */
+    @LogField(name="价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)",index=20)
+    @ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)")
+    private String priceDesc;
+    
+    /**
+    * 结算次数(第一次结算1，第二次结算2……)
+    */
+    @LogField(name="结算次数(第一次结算1，第二次结算2……)",index=21)
+    @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)")
+    private Byte settleTimes;
+    
+    /**
+    * 备注
+    */
+    @LogField(name="备注",index=22)
+    @ApiModelProperty("备注")
+    private String note;
+    
+    /**
+    * 租户id
+    */
+    @LogField(name="租户id",index=23)
+    @ApiModelProperty("租户id")
+    private Long tenantId;
+    
+
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPageVo.java
new file mode 100644
index 0000000..013b91b
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPageVo.java
@@ -0,0 +1,79 @@
+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-02-03
+* @Version 1.0
+*/
+@Data
+public class LngPngSettleHdrPageVo {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private String id;
+    /**
+    * 结算月
+    */
+    @ApiModelProperty("结算月")
+    private LocalDateTime settleMonth;
+    /**
+    * 结算月开始日期
+    */
+    @ApiModelProperty("结算月开始日期")
+    private LocalDateTime dateFrom;
+    /**
+    * 结算月结束日期
+    */
+    @ApiModelProperty("结算月结束日期")
+    private LocalDateTime dateTo;
+    /**
+    * 供应商/客户(根据结算类型关联供应商/客户)
+    */
+    @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
+    private String cpCode;
+    /**
+    * 交易主体(天然气公司/惠贸)
+    */
+    @ApiModelProperty("交易主体(天然气公司/惠贸)")
+    private Long comId;
+    /**
+    * 结算总数量(吉焦)(不包含二次结算的数量)
+    */
+    @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
+    private BigDecimal qtySettleGj;
+    /**
+    * 结算总数量(方)(不包含二次结算的数量)
+    */
+    @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
+    private BigDecimal qtySettleM3;
+    /**
+    * 结算总金额
+    */
+    @ApiModelProperty("结算总金额")
+    private BigDecimal amount;
+    /**
+    * 审批状态
+    */
+    @ApiModelProperty("审批状态")
+    private String approCode;
+    /**
+    * 结算说明
+    */
+    @ApiModelProperty("结算说明")
+    private String settleDesc;
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java
new file mode 100644
index 0000000..a44d317
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java
@@ -0,0 +1,186 @@
+package com.xjrsoft.module.dayPlan.vo;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 表单出参
+* @Author 管理员
+* @Date: 2026-02-03
+* @Version 1.0
+*/
+@Data
+public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+    
+    
+    /**
+    * 结算月
+    */
+    @ApiModelProperty("结算月")
+    private LocalDateTime settleMonth;
+    
+    
+    /**
+    * 结算月开始日期
+    */
+    @ApiModelProperty("结算月开始日期")
+    private LocalDateTime dateFrom;
+    
+    
+    /**
+    * 结算月结束日期
+    */
+    @ApiModelProperty("结算月结束日期")
+    private LocalDateTime dateTo;
+    
+    
+    /**
+    * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
+    */
+    @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
+    private String settleTypeCode;
+    
+    
+    /**
+    * 供应商/客户(根据结算类型关联供应商/客户)
+    */
+    @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
+    private String cpCode;
+    
+    
+    /**
+    * 交易主体(天然气公司/惠贸)
+    */
+    @ApiModelProperty("交易主体(天然气公司/惠贸)")
+    private Long comId;
+    
+    
+    /**
+    * 结算总数量(吉焦)(不包含二次结算的数量)
+    */
+    @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
+    private BigDecimal qtySettleGj;
+    
+    
+    /**
+    * 结算总数量(方)(不包含二次结算的数量)
+    */
+    @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
+    private BigDecimal qtySettleM3;
+    
+    
+    /**
+    * 结算总金额
+    */
+    @ApiModelProperty("结算总金额")
+    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")
+    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;
+    
+    
+
+
+    /**
+    * lngPngSettleSales
+    */
+    @ApiModelProperty("lngPngSettleSales子表")
+    private List<LngPngSettleSalesVo> lngPngSettleSalesList;
+    /**
+    * lngPngSettleSalesDtl
+    */
+    @ApiModelProperty("lngPngSettleSalesDtl子表")
+    private List<LngPngSettleSalesDtlVo> lngPngSettleSalesDtlList;
+
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java
new file mode 100644
index 0000000..5434376
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java
@@ -0,0 +1,168 @@
+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-02-03
+* @Version 1.0
+*/
+@Data
+public class LngPngSettleSalesDtlVo extends com.xjrsoft.common.model.base.BaseModel{
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+    
+    
+    /**
+    * 管道气销售日计划-销售结算主键
+    */
+    @ApiModelProperty("管道气销售日计划-销售结算主键")
+    private Long settleId;
+    
+    
+    /**
+    * 价格类型(基础量/增量)
+    */
+    @ApiModelProperty("价格类型(基础量/增量)")
+    private String priceCode;
+    
+    
+    /**
+    * 优先级
+    */
+    @ApiModelProperty("优先级")
+    private Byte sort;
+    
+    
+    /**
+    * 主计量单位(从lng_png_settle_sales带)
+    */
+    @ApiModelProperty("主计量单位(从lng_png_settle_sales带)")
+    private String uomCode;
+    
+    
+    /**
+    * 阶梯量（吉焦）
+    */
+    @ApiModelProperty("阶梯量（吉焦）")
+    private BigDecimal rateQtyGj;
+    
+    
+    /**
+    * 阶梯量（方）
+    */
+    @ApiModelProperty("阶梯量（方）")
+    private BigDecimal rateQtyM3;
+    
+    
+    /**
+    * 比值(方/吉焦)
+    */
+    @ApiModelProperty("比值(方/吉焦)")
+    private BigDecimal rateM3Gj;
+    
+    
+    /**
+    * 结算数量(吉焦)
+    */
+    @ApiModelProperty("结算数量(吉焦)")
+    private BigDecimal qtySettleGj;
+    
+    
+    /**
+    * 结算数量(方)
+    */
+    @ApiModelProperty("结算数量(方)")
+    private BigDecimal qtySettleM3;
+    
+    
+    /**
+    * 价格(元/吉焦)
+    */
+    @ApiModelProperty("价格(元/吉焦)")
+    private BigDecimal priceGj;
+    
+    
+    /**
+    * 价格(元/方)
+    */
+    @ApiModelProperty("价格(元/方)")
+    private BigDecimal priceM3;
+    
+    
+    /**
+    * 金额(自动计算)
+    */
+    @ApiModelProperty("金额(自动计算)")
+    private BigDecimal amount;
+    
+    
+    /**
+    * 备注
+    */
+    @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;
+    
+    
+
+
+
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java
new file mode 100644
index 0000000..9965008
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java
@@ -0,0 +1,231 @@
+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-02-03
+* @Version 1.0
+*/
+@Data
+public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel{
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+    
+    
+    /**
+    * 结算-管道气-销售-主表主键(lng_png_settle_hdr.id)
+    */
+    @ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)")
+    private Long settleHdrId;
+    
+    
+    /**
+    * 日计划-管道气-销售主键(lng_png_sales_pur.sales_id)
+    */
+    @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)")
+    private Long salesId;
+    
+    
+    /**
+    * 结算月(从主表带)
+    */
+    @ApiModelProperty("结算月(从主表带)")
+    private LocalDateTime settleMonth;
+    
+    
+    /**
+    * 结算类型(I-气费收入)
+    */
+    @ApiModelProperty("结算类型(I-气费收入)")
+    private String settleTypeCode;
+    
+    
+    /**
+    * 计划日期(从lng_png_sales带)
+    */
+    @ApiModelProperty("计划日期(从lng_png_sales带)")
+    private LocalDateTime datePlan;
+    
+    
+    /**
+    * 计量日期(从lng_png_sales带)
+    */
+    @ApiModelProperty("计量日期(从lng_png_sales带)")
+    private LocalDateTime dateMea;
+    
+    
+    /**
+    * 客户(从lng_png_sales带)
+    */
+    @ApiModelProperty("客户(从lng_png_sales带)")
+    private String cuCode;
+    
+    
+    /**
+    * 合同主键(从lng_png_sales带)
+    */
+    @ApiModelProperty("合同主键(从lng_png_sales带)")
+    private Long ksId;
+    
+    
+    /**
+    * 合同-国内销售-管道气-交割点主键(从lng_png_sales带)
+    */
+    @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)")
+    private Long ksppId;
+    
+    
+    /**
+    * 交割点(从lng_png_sales带)
+    */
+    @ApiModelProperty("交割点(从lng_png_sales带)")
+    private String pointDelyCode;
+    
+    
+    /**
+    * 主计量单位(从lng_png_sales带)
+    */
+    @ApiModelProperty("主计量单位(从lng_png_sales带)")
+    private String uomCode;
+    
+    
+    /**
+    * 比值(方/吉焦)
+    */
+    @ApiModelProperty("比值(方/吉焦)")
+    private BigDecimal rateM3Gj;
+    
+    
+    /**
+    * 完成量(吉焦)
+    */
+    @ApiModelProperty("完成量(吉焦)")
+    private BigDecimal qtyMeaGj;
+    
+    
+    /**
+    * 完成量(方)
+    */
+    @ApiModelProperty("完成量(方)")
+    private BigDecimal qtyMeaM3;
+    
+    
+    /**
+    * 结算量(吉焦)
+    */
+    @ApiModelProperty("结算量(吉焦)")
+    private BigDecimal qtySettleGj;
+    
+    
+    /**
+    * 结算量(方)
+    */
+    @ApiModelProperty("结算量(方)")
+    private BigDecimal qtySettleM3;
+    
+    
+    /**
+    * 结算价格(元/吉焦)(金额/总量)
+    */
+    @ApiModelProperty("结算价格(元/吉焦)(金额/总量)")
+    private BigDecimal priceGj;
+    
+    
+    /**
+    * 结算价格(元/方)(金额/总量)
+    */
+    @ApiModelProperty("结算价格(元/方)(金额/总量)")
+    private BigDecimal priceM3;
+    
+    
+    /**
+    * 结算金额(自动计算，子表合计)
+    */
+    @ApiModelProperty("结算金额(自动计算，子表合计)")
+    private BigDecimal amount;
+    
+    
+    /**
+    * 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)
+    */
+    @ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)")
+    private String priceDesc;
+    
+    
+    /**
+    * 结算次数(第一次结算1，第二次结算2……)
+    */
+    @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)")
+    private Byte settleTimes;
+    
+    
+    /**
+    * 备注
+    */
+    @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;
+    
+    
+
+
+
+}
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 a624e0d..f74072f 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
@@ -123,9 +123,9 @@ public class ContractSalesLngController {
     @SaCheckPermission("contractSalesLng:delete")
     public R delete(@Valid @RequestBody List<Long> ids){
     		
-    		boolean res = dataService.deleteByIds(UpdateLngContractPurDto.class,ids, new DataOperationListener<UpdateLngContractPurDto>() {
+    		boolean res = dataService.deleteByIds(UpdateLngContractSalesDto.class,ids, new DataOperationListener<UpdateLngContractSalesDto>() {
                 @Override
-                public UpdateLngContractPurDto before(DataOperationContent<UpdateLngContractPurDto> content) {
+                public UpdateLngContractSalesDto before(DataOperationContent<UpdateLngContractSalesDto> content) {
                  	String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", content.getTableName());
                     List<JdbcParam> params = Lists.newArrayList();
                     JdbcParam outParam = JdbcParam.ofString(null).setOut(true);
@@ -140,7 +140,7 @@ public class ContractSalesLngController {
                 }
 
                 @Override
-                public UpdateLngContractPurDto after(DataOperationContent<UpdateLngContractPurDto> content) {
+                public UpdateLngContractSalesDto after(DataOperationContent<UpdateLngContractSalesDto> content) {
                     return null;
                 }
             });
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngSta.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngSta.java
index 516fa4a..8d8a52a 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngSta.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesLngSta.java
@@ -35,6 +35,7 @@ public class LngContractSalesLngSta implements Serializable {
     * 主键
     */
     @ApiModelProperty("主键")
+    @TableId
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long id;
     
@@ -42,7 +43,6 @@ public class LngContractSalesLngSta implements Serializable {
     * 合同-档案主键
     */
     @ApiModelProperty("合同-档案主键")
-    @TableId
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long kId;
     
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java
index 849e03a..d7720a0 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java
@@ -50,10 +50,7 @@ public class ContractPurPngServiceImpl extends MPJBaseServiceImpl<LngContractPur
 	private final IFileClient fileClient;
 	
 	private final LngContractPurPngPointSalesMapper lngContractPurPngPointSalesMapper;
-	
-	//private final LngContractApproRelMapper lngContractApproRelMapper;
-	
-	//private final LngContractFactRelMapper lngContractFactRelMapper;
+
 	private final LngContractPurPngPointMapper lngContractPurPngPointMapper;
 	
 	private final LngContractFactMapper lngContractFactMapper;
@@ -115,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",
@@ -135,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());
                 }
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java
index b3e35a6..9a6a971 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesLngServiceImpl.java
@@ -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());
                 }
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java
new file mode 100644
index 0000000..e6f791e
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java
@@ -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));
+
+    }
+    
+
+}
\ No newline at end of file
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java
new file mode 100644
index 0000000..51c47ee
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java
@@ -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;
+
+}
\ No newline at end of file
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java
new file mode 100644
index 0000000..e5d0f41
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java
@@ -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;
+    
+
+
+}
\ No newline at end of file
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSalesDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSalesDtl.java
new file mode 100644
index 0000000..d17acdf
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSalesDtl.java
@@ -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;
+    
+
+
+}
\ No newline at end of file
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java
new file mode 100644
index 0000000..c624584
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java
@@ -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> {
+
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java
new file mode 100644
index 0000000..f1e68f5
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java
@@ -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> {
+
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java
new file mode 100644
index 0000000..9b1587b
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java
@@ -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> {
+
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java
new file mode 100644
index 0000000..e821310
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java
@@ -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> {
+    
+}
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java
new file mode 100644
index 0000000..8c361d3
--- /dev/null
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java
@@ -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;
+
+
+}