1 添加货值暂估导入功能

src/main/java/com/example/backend/pAndSExe/dto/InfHuozhizanguExcelDTO.java

@@ -0,0 +1,31 @@
+package com.example.backend.pAndSExe.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * InfHuozhizangu Excel导入DTO (Sheet13-货值暂估)
+ */
+@Data
+public class InfHuozhizanguExcelDTO {
+    @ExcelProperty(index = 0) // A列 - 采购合同号
+    private String pono;
+    @ExcelProperty(index = 1) // B列 - 物料描述
+    private String sdesc;
+    @ExcelProperty(index = 2) // C列 - 数量
+    private Double qty;
+    @ExcelProperty(index = 3) // D列 - 单位
+    private String ut;
+    @ExcelProperty(index = 4) // E列 - 不含税金额
+    private Double ntPoAmt;
+    @ExcelProperty(index = 5) // F列 - 不含税单价
+    private Double ntPoPrice;
+    @ExcelProperty(index = 6) // G列 - 含税单价
+    private Double poPrice;
+    @ExcelProperty(index = 7) // H列 - 含税金额
+    private Double poAmt;
+    @ExcelProperty(index = 8) // I列 - 币别
+    private String curcy;
+    @ExcelProperty(index = 9) // J列 - 税率
+    private Double inTaxRate;
+}

src/main/java/com/example/backend/pAndSExe/dto/InfJinxiangfapiaoExcelDTO.java

@@ -21,24 +21,26 @@ public class InfJinxiangfapiaoExcelDTO {
     private String taxInvType;
     @ExcelProperty(index = 5) // C列 - 发票号码
     private String taxInvNo;
-    @ExcelProperty(index = 6) // D列 - 物料编码，物料描述，品牌
+    @ExcelProperty(index = 6) // D列 - 发票号
+    private String invNo;
+    @ExcelProperty(index = 7) // D列 - 物料编码，物料描述，品牌
     private String itemnoSdescBrand;
-    @ExcelProperty(index = 7) // E列 - 数量
+    @ExcelProperty(index = 8) // E列 - 数量
     private Double qty;
-    @ExcelProperty(index = 8)
+    @ExcelProperty(index = 9)
     private Double poPrice;
-    @ExcelProperty(index = 9) // F列 - 不含税单价
+    @ExcelProperty(index = 10) // F列 - 不含税单价
     private Double ntPoPrice;
-    @ExcelProperty(index = 10) // G列 - 单位
+    @ExcelProperty(index = 11) // G列 - 单位
     private String ut;
-    @ExcelProperty(index = 11)
+    @ExcelProperty(index = 12)
     private Double poamt;
-    @ExcelProperty(index = 12) // H列 - 不含税金额
+    @ExcelProperty(index = 13) // H列 - 不含税金额
     private Double ntPoAmt;
-    @ExcelProperty(index = 13) // I列 - 税率
+    @ExcelProperty(index = 14) // I列 - 税率
     private Double inTaxRate;
-    @ExcelProperty(index = 14) // J列 - 税额
+    @ExcelProperty(index = 15) // J列 - 税额
     private Double taxAmt;
-    @ExcelProperty(index = 15) // K列 - 币别
+    @ExcelProperty(index = 16) // K列 - 币别
     private String curcypo;
 }

src/main/java/com/example/backend/pAndSExe/mapper/InfHuozhizanguMapper.java

@@ -0,0 +1,23 @@
+package com.example.backend.pAndSExe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.pAndSExe.model.InfHuozhizangu;
+import com.example.backend.pAndSExe.model.InfJinxiangfapiao;
+import com.fasterxml.jackson.databind.ser.Serializers;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+@Mapper
+public interface InfHuozhizanguMapper extends BaseMapper<InfHuozhizangu> {
+
+    @Select("SELECT * FROM SGGMINFT.INF_HUOZHIZANGU WHERE dataStatus = '0'")
+    List<InfHuozhizangu> selectValidData();
+
+
+    @Update("UPDATE SGGMINFT.INF_JINXIANGFAPIAO SET dataStatus = '1' WHERE ID = #{id}")
+
+    void updateStatusById(String id);
+}

src/main/java/com/example/backend/pAndSExe/mapper/MdkcctrlMapper.java

@@ -43,7 +43,7 @@ public interface MdkcctrlMapper extends BaseMapper<Mdkcctrl> {
     List<Mdkcctrl> selectByPono(String fno);
 
     @Select("select stockno\n" +
-            "from warehouse\n" +
+            "from SGGMIIP.warehouse\n" +
             "where ifnull(del_flag, 0) <> 1\n" +
             "\tand ifnull(endsign, 0) = 1\n" +
             "and stockname=#{stockname}\n" +

src/main/java/com/example/backend/pAndSExe/mapper/PaymgrctrlMapper.java

@@ -18,12 +18,12 @@ public interface PaymgrctrlMapper extends BaseMapper<Paymgrctrl> {
 
 
     @Select("select    a.id,a.fname,a.fname1,\n" +
-            "(select rate from curcydtl where a.id=rid and targetcode='CNY' and nvl(del_flag,0)<>1) as rate ,\n" +
-            "(select rate from curcydtl where a.id=rid and targetcode='USD' and nvl(del_flag,0)<>1) rateUsd ,\n" +
-            "(SELECT b.rate from  curcyctrl a\n" +
-            "left join curcydtl b on a.id=rid\n" +
+            "(select rate from SGGMIIP.curcydtl where a.id=rid and targetcode='CNY' and nvl(del_flag,0)<>1) as rate ,\n" +
+            "(select rate from SGGMIIP.curcydtl where a.id=rid and targetcode='USD' and nvl(del_flag,0)<>1) rateUsd ,\n" +
+            "(SELECT b.rate from  SGGMIIP.curcyctrl a\n" +
+            "left join SGGMIIP.curcydtl b on a.id=rid\n" +
             "where targetcode='CNY' and a.fname='USD' and nvl(b.del_flag,0)<>1 and nvl(a.del_flag,0)<>1) as rateUs\n" +
-            "from curcyctrl A\n" +
+            "from SGGMIIP.curcyctrl A\n" +
             "where ifnull(a.del_flag, 0) <> 1\n" +
             "and fname=#{curry}\n" +
             "and ifnull(a.placed, '') = '2'\n" +

src/main/java/com/example/backend/pAndSExe/mapper/ProvInDtlMapper.java

@@ -0,0 +1,7 @@
+package com.example.backend.pAndSExe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.pAndSExe.model.ProvInDtl;
+
+public interface ProvInDtlMapper extends BaseMapper<ProvInDtl> {
+}

src/main/java/com/example/backend/pAndSExe/mapper/ProvInMapper.java

@@ -0,0 +1,7 @@
+package com.example.backend.pAndSExe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.pAndSExe.model.ProvIn;
+
+public interface ProvInMapper extends BaseMapper<ProvIn> {
+}

src/main/java/com/example/backend/pAndSExe/model/InfHuozhizangu.java

@@ -0,0 +1,88 @@
+package com.example.backend.pAndSExe.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 货值暂估信息表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("SGGMINFT.INF_HUOZHIZANGU")
+@ApiModel(value = "InfHuozhizangu对象", description = "货值暂估信息表")
+public class InfHuozhizangu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    @ApiModelProperty(value = "流水号")
+    @TableField(value = "FNO")
+    private String fno;
+
+    @ApiModelProperty(value = "采购合同号")
+    @TableField(value = "PONO")
+    private String pono;
+
+    @ApiModelProperty(value = "物料描述")
+    @TableField(value = "SDESC")
+    private String sdesc;
+
+    @ApiModelProperty(value = "数量")
+    @TableField(value = "QTY")
+    private BigDecimal qty;
+
+    @ApiModelProperty(value = "单位")
+    @TableField(value = "UT")
+    private String ut;
+
+    @ApiModelProperty(value = "不含税金额")
+    @TableField(value = "NTPOAMT")
+    private BigDecimal ntPoAmt;
+
+    @ApiModelProperty(value = "不含税单价")
+    @TableField(value = "NTPOPRICE")
+    private BigDecimal ntPoPrice;
+
+    @ApiModelProperty(value = "含税单价")
+    @TableField(value = "POPRICE")
+    private BigDecimal poPrice;
+
+    @ApiModelProperty(value = "含税金额")
+    @TableField(value = "POAMT")
+    private BigDecimal poAmt;
+
+    @ApiModelProperty(value = "币别")
+    @TableField(value = "CURCY")
+    private String curcy;
+
+    @ApiModelProperty(value = "税率")
+    @TableField(value = "INTAXRATE")
+    private BigDecimal inTaxRate;
+
+    @ApiModelProperty(value = "数据状态")
+    @TableField(value = "DATASTATUS")
+    private String dataStatus;
+
+    @ApiModelProperty(value = "错误日志")
+    @TableField(value = "ERRORLOG")
+    private String errorLog;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "CREATETIME")
+    private Date createTime;
+}

src/main/java/com/example/backend/pAndSExe/model/InfJinxiangfapiao.java

@@ -112,4 +112,7 @@ public class InfJinxiangfapiao implements Serializable {
 
     @TableField(value ="receiptNo")
     private String receiptNo;
+
+    @TableField(value="invNo")
+    private String invNo;
 }

src/main/java/com/example/backend/pAndSExe/model/ProvIn.java

@@ -0,0 +1,244 @@
+package com.example.backend.pAndSExe.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 进项发票主表（SGGMIIP.provIn）
+ */
+@Data
+@TableName("SGGMIIP.provIn") // 数据库表名
+public class ProvIn {
+
+    /** 主键ID（雪花ID，19位数字） */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    // ========== 基础信息 ==========
+    /** 单据单号 */
+    @TableField("fno")
+    private String fno;
+
+    /** 单据日期 */
+    @TableField("fdate")
+    private Date fdate;
+
+    /** 销售合同号 */
+    @TableField("sono")
+    private String sono;
+
+    /** 我方代码 */
+    @TableField("fours")
+    private String fours;
+
+    /** 我方名称 */
+    @TableField("foursname")
+    private String foursname;
+
+    /** 供应商代码 */
+    @TableField("supCode")
+    private String supCode;
+
+    /** 供应商名称 */
+    @TableField("supName")
+    private String supName;
+
+    /** 开票总金额 */
+    @TableField("invTotalAmt")
+    private BigDecimal invTotalAmt;
+
+    /** 备注 */
+    @TableField("remark")
+    private String remark;
+
+    // ========== 基础流程/来源信息 ==========
+    /** 流程实例id */
+    @TableField("process_instance_id")
+    private String processInstanceId;
+
+    /** 单据状态 */
+    @TableField("placed")
+    private String placed;
+
+    /** 业务id */
+    @TableField("fmodalid")
+    private Long fmodalid;
+
+    /** 数据来源id */
+    @TableField("sourceid")
+    private Long sourceid;
+
+    /** 数据来源表 */
+    @TableField("sourcetable")
+    private String sourcetable;
+
+    /** 图片 */
+    @TableField("img_ids")
+    private String imgIds;
+
+    /** 调取次数 */
+    @TableField("inc")
+    private Integer inc;
+
+    /** 关联id */
+    @TableField("rid")
+    private Long rid;
+
+    /** 归档状态 0-未归档，1-已归档 */
+    @TableField("fsaved")
+    private String fsaved;
+
+    /** 模版名称 */
+    @TableField("sys_template_name")
+    private String sysTemplateName;
+
+    /** 采购合同号 */
+    @TableField("pono")
+    private String pono;
+
+    /** 业务账套 */
+    @TableField("acctSet")
+    private String acctSet;
+
+    /** 币别 */
+    @TableField("curcy")
+    private String curcy;
+
+    /** 汇率 */
+    @TableField("rate")
+    private BigDecimal rate;
+
+    /** 美元汇率 */
+    @TableField("rateUsd")
+    private BigDecimal rateUsd;
+
+    /** 人民币发票金额 */
+    @TableField("invTotalCnyAmt")
+    private BigDecimal invTotalCnyAmt;
+
+    /** 美元发票金额 */
+    @TableField("invTotalUsdAmt")
+    private BigDecimal invTotalUsdAmt;
+
+    /** 仓库代码 */
+    @TableField("stockno")
+    private String stockno;
+
+    /** 仓库名称 */
+    @TableField("stockname")
+    private String stockname;
+
+    /** IMP同步PLMS接口状态 */
+    @TableField("impToPLMSStatus")
+    private String impToPLMSStatus;
+
+    /** IMP同步PLMS接口数据状态 */
+    @TableField("impToPLMSFlag")
+    private String impToPLMSFlag;
+
+    /** IMP同步PLMS接口来源系统代码 */
+    @TableField("SYSID")
+    private String sysid;
+
+    /** IMP同步PLMS接口账套代码 */
+    @TableField("bookId")
+    private String bookId;
+
+    /** IMP同步PLMS接口PLMS组织ID */
+    @TableField("orgId")
+    private String orgId;
+
+    /** 提交审批日期 */
+    @TableField("submissionDate")
+    private Date submissionDate;
+
+    /** 成本类型 */
+    @TableField("costType")
+    private String costType;
+
+    /** 费用类型 */
+    @TableField("feeType")
+    private String feeType;
+
+    /** 期间 */
+    @TableField("periodCode")
+    private String periodCode;
+
+    /** 报表字段 */
+    @TableField("rptg")
+    private String rptg;
+
+    /** 业务类型 */
+    @TableField("serviceType")
+    private String serviceType;
+
+    /** 合同类型 */
+    @TableField("bizType")
+    private String bizType;
+
+    /** 合同产品类型 */
+    @TableField("bizProductType")
+    private String bizProductType;
+
+    /** 暂估单价预警 */
+    @TableField("estimatePriceWarning")
+    private String estimatePriceWarning;
+
+    /** 暂估单价预警原因 */
+    @TableField("estimatePriceReason")
+    private String estimatePriceReason;
+
+    /** 是否期初数据补录 */
+    @TableField("isinitDate")
+    private String isinitDate;
+
+    /** 期初标识 */
+    @TableField("QICHU")
+    private String qichu;
+
+    /** 销售订单ID */
+    @TableField("SOLOID")
+    private String soloid;
+
+    // ========== 公共审计字段 ==========
+    /** 创建账号 */
+    @TableField("create_by")
+    private String createBy;
+
+    /** 创建时间 */
+    @TableField("create_time")
+    private Date createTime;
+
+    /** 创建人 */
+    @TableField("create_by_name")
+    private String createByName;
+
+    /** 更新账号 */
+    @TableField("update_by")
+    private String updateBy;
+
+    /** 更新时间 */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /** 更新人 */
+    @TableField("update_by_name")
+    private String updateByName;
+
+    /** 是否删除（0-未删除，1-已删除） */
+    @TableField("del_flag")
+    private Integer delFlag;
+
+    /** 部门名称 */
+    @TableField("dept_name")
+    private String deptName;
+
+    /** 部门ID */
+    @TableField("dept_id")
+    private String deptId;
+}

src/main/java/com/example/backend/pAndSExe/model/ProvInDtl.java

@@ -0,0 +1,368 @@
+package com.example.backend.pAndSExe.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 进项发票明细表（SGGMIIP.provInDtl）
+ */
+@Data
+@TableName("SGGMIIP.provInDtl") // 数据库表名
+public class ProvInDtl {
+
+    /** 主键ID（雪花ID，19位数字） */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    // ========== 基础信息 ==========
+    /** 行号 */
+    @TableField("line")
+    private BigDecimal line;
+
+    /** 采购合同号 */
+    @TableField("pono")
+    private String pono;
+
+    /** 品名 */
+    @TableField("sdesc")
+    private String sdesc;
+
+    /** 规格 */
+    @TableField("spec")
+    private String spec;
+
+    /** 含税单价 */
+    @TableField("poPrice")
+    private BigDecimal poPrice;
+
+    /** 数量 */
+    @TableField("qty")
+    private BigDecimal qty;
+
+    /** 单位 */
+    @TableField("ut")
+    private String ut;
+
+    /** 含税金额 */
+    @TableField("poAmt")
+    private BigDecimal poAmt;
+
+    /** 税额 */
+    @TableField("taxAmt")
+    private BigDecimal taxAmt;
+
+    /** 不含税单价 */
+    @TableField("ntPoPrice")
+    private BigDecimal ntPoPrice;
+
+    /** 不含税金额 */
+    @TableField("ntPoAmt")
+    private BigDecimal ntPoAmt;
+
+    /** 税率 % */
+    @TableField("taxRate")
+    private BigDecimal taxRate;
+
+    /** 备注 */
+    @TableField("remark")
+    private String remark;
+
+    /** 商品编号 */
+    @TableField("itemno")
+    private String itemno;
+
+    /** 进项税率 */
+    @TableField("inTaxRate")
+    private BigDecimal inTaxRate;
+
+    /** 资源号 */
+    @TableField("resourceNo")
+    private String resourceNo;
+
+    /** 销售合同号 */
+    @TableField("sono")
+    private String sono;
+
+    /** 采购订单号 */
+    @TableField("poOrderNo")
+    private String poOrderNo;
+
+    /** 销售订单号 */
+    @TableField("soOrderNo")
+    private String soOrderNo;
+
+    /** 出口关税税率% */
+    @TableField("eDutyRate")
+    private BigDecimal eDutyRate;
+
+    /** 采购产品ID */
+    @TableField("poid")
+    private Long poid;
+
+    /** 销售产品ID */
+    @TableField("soid")
+    private Long soid;
+
+    /** 来源单号 */
+    @TableField("sourceno")
+    private String sourceno;
+
+    /** 仓库代码 */
+    @TableField("stockno")
+    private String stockno;
+
+    /** 仓库名称 */
+    @TableField("stockname")
+    private String stockname;
+
+    /** plms仓库代码 */
+    @TableField("plmsccno")
+    private String plmsccno;
+
+    /** plms仓库名称 */
+    @TableField("plmsccname")
+    private String plmsccname;
+
+    /** 美元采购金额 */
+    @TableField("usdpoamt")
+    private BigDecimal usdpoamt;
+
+    /** 人民币采购金额 */
+    @TableField("cnypoamt")
+    private BigDecimal cnypoamt;
+
+    /** 供应商代码 */
+    @TableField("supCode")
+    private String supCode;
+
+    /** 供应商名称 */
+    @TableField("supName")
+    private String supName;
+
+    /** 币别 */
+    @TableField("curcy")
+    private String curcy;
+
+    /** 汇率 */
+    @TableField("rate")
+    private BigDecimal rate;
+
+    /** 采购人民币汇率 */
+    @TableField("ratepo")
+    private BigDecimal ratepo;
+
+    /** 采购美元汇率 */
+    @TableField("rateusdpo")
+    private BigDecimal rateusdpo;
+
+    /** 采购币别 */
+    @TableField("curcypo")
+    private String curcypo;
+
+    /** 采购币别 */
+    @TableField("mdkcdtl")
+    private String mdkcdtl;
+
+    /** 湿吨数量 */
+    @TableField("wetTonQty")
+    private BigDecimal wetTonQty;
+
+    /** 干吨数量 */
+    @TableField("dryTonQty")
+    private BigDecimal dryTonQty;
+
+    /** 捆单重 */
+    @TableField("fnum6")
+    private BigDecimal fnum6;
+
+    /** 钢厂资源号 */
+    @TableField("SMRNo")
+    private String smrNo;
+
+    /** 批次号 */
+    @TableField("batchNo")
+    private String batchNo;
+
+    /** 计重方式 */
+    @TableField("ftype4")
+    private String ftype4;
+
+    /** 色标 */
+    @TableField("ftype5")
+    private String ftype5;
+
+    /** 文本预留字段1 */
+    @TableField("ftype6")
+    private String ftype6;
+
+    /** 文本预留字段2 */
+    @TableField("ftype7")
+    private String ftype7;
+
+    /** 煤焦计价水% */
+    @TableField("coalMoisture")
+    private BigDecimal coalMoisture;
+
+    /** 宽 */
+    @TableField("fnum2")
+    private BigDecimal fnum2;
+
+    /** 长 */
+    @TableField("fnum3")
+    private BigDecimal fnum3;
+
+    /** 捆支数 */
+    @TableField("fnum7")
+    private BigDecimal fnum7;
+
+    /** 数值预留字段1 */
+    @TableField("fnum8")
+    private BigDecimal fnum8;
+
+    /** 件数 */
+    @TableField("qua")
+    private BigDecimal qua;
+
+    /** 牌号 */
+    @TableField("brand")
+    private String brand;
+
+    /** 计价方式 */
+    @TableField("priceMtd")
+    private String priceMtd;
+
+    /** 卷重范围 */
+    @TableField("ftype1")
+    private String ftype1;
+
+    /** H型钢规格 */
+    @TableField("ftype2")
+    private String ftype2;
+
+    /** 规格 */
+    @TableField("ftype3")
+    private String ftype3;
+
+    /** 英文品名 */
+    @TableField("edesc")
+    private String edesc;
+
+    /** 数值预留字段 */
+    @TableField("fnum1")
+    private BigDecimal fnum1;
+
+    /** 数值预留字段 */
+    @TableField("fnum4")
+    private BigDecimal fnum4;
+
+    /** 数值预留字段 */
+    @TableField("fnum5")
+    private BigDecimal fnum5;
+
+    /** 数值预留字段 */
+    @TableField("fnum9")
+    private BigDecimal fnum9;
+
+    /** 业务账套 */
+    @TableField("acctSet")
+    private String acctSet;
+
+    /** 水分% */
+    @TableField("moisture")
+    private BigDecimal moisture;
+
+    /** 含铁量% */
+    @TableField("ironCont")
+    private BigDecimal ironCont;
+
+    // ========== 基础流程/来源信息 ==========
+    /** 流程实例id */
+    @TableField("process_instance_id")
+    private String processInstanceId;
+
+    /** 单据号 */
+    @TableField("fno")
+    private String fno;
+
+    /** 单据日期 */
+    @TableField("fdate")
+    private Date fdate;
+
+    /** 单据状态 */
+    @TableField("placed")
+    private String placed;
+
+    /** 业务id */
+    @TableField("fmodalid")
+    private Long fmodalid;
+
+    /** 数据来源id */
+    @TableField("sourceid")
+    private Long sourceid;
+
+    /** 数据来源表 */
+    @TableField("sourcetable")
+    private String sourcetable;
+
+    /** 图片 */
+    @TableField("img_ids")
+    private String imgIds;
+
+    /** 调取次数 */
+    @TableField("inc")
+    private Integer inc;
+
+    /** 关联id */
+    @TableField("rid")
+    private Long rid;
+
+    /** 归档状态 0-未归档，1-已归档 */
+    @TableField("fsaved")
+    private String fsaved;
+
+    /** 模版名称 */
+    @TableField("sys_template_name")
+    private String sysTemplateName;
+
+    /** 部门名称 */
+    @TableField("dept_name")
+    private String deptName;
+
+    /** 部门ID */
+    @TableField("dept_id")
+    private String deptId;
+
+    // ========== 公共审计字段 ==========
+    /** 创建账号 */
+    @TableField("create_by")
+    private String createBy;
+
+    /** 创建时间 */
+    @TableField("create_time")
+    private Date createTime;
+
+    /** 创建人 */
+    @TableField("create_by_name")
+    private String createByName;
+
+    /** 更新账号 */
+    @TableField("update_by")
+    private String updateBy;
+
+    /** 更新时间 */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /** 更新人 */
+    @TableField("update_by_name")
+    private String updateByName;
+
+    /** 是否删除（0-未删除，1-已删除） */
+    @TableField("del_flag")
+    private Integer delFlag;
+}

src/main/java/com/example/backend/pAndSExe/service/HuozhizanguSettleService.java

@@ -0,0 +1,5 @@
+package com.example.backend.pAndSExe.service;
+
+public interface HuozhizanguSettleService {
+    String importHuozhizanguInfToSettle();
+}

src/main/java/com/example/backend/pAndSExe/service/impl/HuozhizanguSettleServiceImpl.java

@@ -0,0 +1,78 @@
+package com.example.backend.pAndSExe.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.example.backend.pAndSExe.mapper.InfHuozhizanguMapper;
+import com.example.backend.pAndSExe.mapper.ProvInMapper;
+import com.example.backend.pAndSExe.mapper.ProvInDtlMapper;
+import com.example.backend.pAndSExe.model.InfHuozhizangu;
+import com.example.backend.pAndSExe.model.ProvIn;
+import com.example.backend.pAndSExe.model.ProvInDtl;
+import com.example.backend.pAndSExe.service.HuozhizanguSettleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
+
+    @Autowired
+    private InfHuozhizanguMapper infHuozhizanguMapper;
+
+    @Autowired
+    private ProvInMapper provInMapper;
+
+    @Autowired
+    private ProvInDtlMapper provInDtlMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    public String importHuozhizanguInfToSettle() {
+        List<InfHuozhizangu> infList = infHuozhizanguMapper.selectValidData();
+        if (infList.isEmpty()) {
+            return "未查询到货值暂估中间表中有效数据（dataStatus=0），无需导入";
+        }
+
+        int successCount = 0;
+        int failCount = 0;
+
+        for (InfHuozhizangu inf : infList) {
+            try {
+                ProvIn provIn = new ProvIn();
+                Long provInId = IdWorker.getId();
+                provIn.setId(provInId);
+                provIn.setPono(inf.getPono());
+                provIn.setCurcy(inf.getCurcy());
+                provIn.setQichu("1");
+                provIn.setSoloid(inf.getId());
+                provInMapper.insert(provIn);
+
+                ProvInDtl provInDtl = new ProvInDtl();
+                Long dtlId = IdWorker.getId();
+                provInDtl.setId(dtlId);
+                provInDtl.setInTaxRate(inf.getInTaxRate());
+                provInDtl.setRid(provInId);
+                provInDtl.setSdesc(inf.getSdesc());
+                provInDtl.setQty(inf.getQty());
+                provInDtl.setUt(inf.getUt());
+                provInDtl.setNtPoAmt(inf.getNtPoAmt());
+                provInDtl.setNtPoPrice(inf.getNtPoPrice());
+                provInDtl.setPoPrice(inf.getPoPrice());
+                provInDtl.setPoAmt(inf.getPoAmt());
+                provInDtl.setCurcy(inf.getCurcy());
+                provInDtlMapper.insert(provInDtl);
+
+                infHuozhizanguMapper.updateStatusById(inf.getId());
+                successCount++;
+            } catch (Exception e) {
+                failCount++;
+                System.err.println("导入货值暂估中间表数据到业务表失败，inf.id=" + inf.getId() + "，错误：" + e.getMessage());
+                e.printStackTrace();
+                continue;
+            }
+        }
+
+        return String.format("货值暂估中间表数据导入业务表完成：总条数=%d，成功=%d，失败=%d",
+                infList.size(), successCount, failCount);
+    }
+}

src/main/java/com/example/backend/pAndSExe/util/PsExeExcelUtil.java

@@ -70,6 +70,8 @@ public class PsExeExcelUtil {
           SHEET_MAPPINGS.add(new SheetMapping("销售结算开票", InfXiaoshoujiesuankaipiaoExcelDTO.class, "InfXiaoshoujiesuankaipiao"));
           //SHEET_MAPPINGS.add(new SheetMapping("费用结算登记", InfFeiyongjiesuandengjiExcelDTO.class, "InfFeiyongjiesuandengji"));
           SHEET_MAPPINGS.add(new SheetMapping("代理结算", InfDailijiesuanExcelDTO.class, "InfDailijiesuan"));
+
+          SHEET_MAPPINGS.add(new SheetMapping("货值暂估", InfHuozhizanguExcelDTO.class, "InfHuozhizangu"));
         /*SHEET_MAPPINGS.add(new SheetMapping("收款登记", InfExe6ExcelDTO.class, "InfExe6"));
         SHEET_MAPPINGS.add(new SheetMapping("销售结算开票", InfExe7ExcelDTO.class, "InfExe7"));*/
     }
@@ -203,6 +205,12 @@ public class PsExeExcelUtil {
                         .filter(entity -> entity != null)
                         .collect(Collectors.toList());
                 break;
+            case "InfHuozhizangu":
+                resultList = ((List<InfHuozhizanguExcelDTO>) dtoList).stream()
+                        .map(this::convertToInfHuozhizangu)
+                        .filter(entity -> entity != null)
+                        .collect(Collectors.toList());
+                break;
 
             default:
                 System.err.println("未知业务类型：" + businessType + "，无法转换DTO为实体");
@@ -1057,6 +1065,9 @@ public class PsExeExcelUtil {
             errorLogList.add("含税金额为空");
         }
         if (dto.getTaxInvNo() == null || dto.getTaxInvNo().isEmpty()) {
+            errorLogList.add("税票号码为空");
+        }
+        if (dto.getInvNo()==null|| dto.getInvNo().isEmpty()) {
             errorLogList.add("发票号码为空");
         }
 
@@ -1125,6 +1136,7 @@ public class PsExeExcelUtil {
             String createBy=infExe1Mapper.selectCreateByFromPono(dto.getPono());
             entity.setCreateBy(createBy);
         }
+        entity.setInvNo(dto.getInvNo());
 
         entity.setDataStatus(errorLog.isEmpty() ? "0" : "9"); // 0=有效，9=无效
         entity.setErrorLog(errorLog); // 错误日志
@@ -1299,7 +1311,7 @@ public class PsExeExcelUtil {
         } else {
             // 拆分规则：按第一个空格/逗号拆分，左侧为编号，右侧为名称
 
-            String[] ctArr = ctNoCtName.split("[-,\\s]+");
+            String[] ctArr = ctNoCtName.split("-");
 
             if (ctArr.length<2) {
                 errorLogList.add("客户编号+客户名称格式不正确");
@@ -1908,6 +1920,144 @@ public class PsExeExcelUtil {
 
         return entity;
     }
+
+
+
+    private InfHuozhizangu convertToInfHuozhizangu(InfHuozhizanguExcelDTO dto) {
+        List<String> errorLogList = new ArrayList<>();
+
+        // 采购合同号校验
+        String pono = trimField(dto.getPono());
+        if (pono.isEmpty()) {
+            errorLogList.add("采购合同号为空");
+        } else {
+            int pContractCount = infExe1Mapper.selectFnoByFno(pono);
+            if (pContractCount == 0) {
+                errorLogList.add("采购合同号【" + pono + "】不存在");
+            }
+        }
+
+        // 物料描述校验
+        String sdesc = trimField(dto.getSdesc());
+        if (sdesc.isEmpty()) {
+            errorLogList.add("物料描述为空");
+        }
+
+        // 数量校验
+        BigDecimal qty = BigDecimal.ZERO;
+        if (dto.getQty() == null) {
+            errorLogList.add("数量为空");
+        } else {
+            qty = BigDecimal.valueOf(dto.getQty()).setScale(6, BigDecimal.ROUND_HALF_UP);
+            if (qty.compareTo(BigDecimal.ZERO) <= 0) {
+                errorLogList.add("数量必须大于0，当前值：" + dto.getQty());
+            }
+        }
+
+        // 单位校验
+        String ut = trimField(dto.getUt());
+        if (ut.isEmpty()) {
+            errorLogList.add("单位为空");
+        }
+
+        // 不含税金额校验
+        BigDecimal ntPoAmt = BigDecimal.ZERO;
+        if (dto.getNtPoAmt() == null) {
+            errorLogList.add("不含税金额为空");
+        } else {
+            ntPoAmt = BigDecimal.valueOf(dto.getNtPoAmt()).setScale(6, BigDecimal.ROUND_HALF_UP);
+            if (ntPoAmt.compareTo(BigDecimal.ZERO) <= 0) {
+                errorLogList.add("不含税金额必须大于0，当前值：" + dto.getNtPoAmt());
+            }
+        }
+
+        // 不含税单价校验
+        BigDecimal ntPoPrice = BigDecimal.ZERO;
+        if (dto.getNtPoPrice() == null) {
+            errorLogList.add("不含税单价为空");
+        } else {
+            ntPoPrice = BigDecimal.valueOf(dto.getNtPoPrice()).setScale(6, BigDecimal.ROUND_HALF_UP);
+            if (ntPoPrice.compareTo(BigDecimal.ZERO) <= 0) {
+                errorLogList.add("不含税单价必须大于0，当前值：" + dto.getNtPoPrice());
+            }
+        }
+
+        // 含税单价校验
+        BigDecimal poPrice = BigDecimal.ZERO;
+        if (dto.getPoPrice() == null) {
+            errorLogList.add("含税单价为空");
+        } else {
+            poPrice = BigDecimal.valueOf(dto.getPoPrice()).setScale(6, BigDecimal.ROUND_HALF_UP);
+            if (poPrice.compareTo(BigDecimal.ZERO) <= 0) {
+                errorLogList.add("含税单价必须大于0，当前值：" + dto.getPoPrice());
+            }
+        }
+
+        // 含税金额校验
+        BigDecimal poAmt = BigDecimal.ZERO;
+        if (dto.getPoAmt() == null) {
+            errorLogList.add("含税金额为空");
+        } else {
+            poAmt = BigDecimal.valueOf(dto.getPoAmt()).setScale(6, BigDecimal.ROUND_HALF_UP);
+            if (poAmt.compareTo(BigDecimal.ZERO) <= 0) {
+                errorLogList.add("含税金额必须大于0，当前值：" + dto.getPoAmt());
+            }
+        }
+
+        // 币别校验
+        String curcy = trimField(dto.getCurcy());
+        if (curcy.isEmpty()) {
+            errorLogList.add("币别为空");
+        }
+
+        // 税率校验
+        BigDecimal inTaxRate = BigDecimal.ZERO;
+        if (dto.getInTaxRate() == null) {
+            errorLogList.add("税率为空");
+        } else {
+            inTaxRate = BigDecimal.valueOf(dto.getInTaxRate()).setScale(6, BigDecimal.ROUND_HALF_UP);
+            if (inTaxRate.compareTo(BigDecimal.ZERO) < 0 || inTaxRate.compareTo(new BigDecimal("100")) > 0) {
+                errorLogList.add("税率必须在0-100之间，当前值：" + dto.getInTaxRate());
+            }
+        }
+
+        String errorLog = errorLogList.isEmpty() ? "" : String.join("；", errorLogList);
+
+        InfHuozhizangu entity = new InfHuozhizangu();
+        entity.setId(UUID.randomUUID().toString().replace("-", ""));
+        entity.setDataStatus(errorLog.isEmpty() ? "0" : "9");
+        entity.setErrorLog(errorLog);
+        entity.setCreateTime(new Date());
+        entity.setPono(pono);
+        entity.setSdesc(sdesc);
+        entity.setQty(qty);
+        entity.setUt(ut);
+        entity.setNtPoAmt(ntPoAmt);
+        entity.setNtPoPrice(ntPoPrice);
+        entity.setPoPrice(poPrice);
+        entity.setPoAmt(poAmt);
+        entity.setCurcy(curcy);
+        entity.setInTaxRate(inTaxRate);
+
+        // 生成流水号（HZ+年月+6位自增ID）
+        InfExe1Amount infExe1Amount = new InfExe1Amount();
+        infExe1Amount.setCreateTime(new Date());
+        infExe1AmountMapper.insert(infExe1Amount);
+        Integer id = infExe1Amount.getId();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyMM");
+        String yearMonth = sdf.format(new Date());
+        StringBuilder sb = new StringBuilder();
+        StringBuilder liushuihao = sb.append("POTI").append(yearMonth).append(String.format(String.valueOf(id))).append("-QC");
+        entity.setFno(liushuihao.toString());
+
+        return entity;
+    }
+
+
+
+
+
+
     /*private   InfExe3 convertToInfExe4(InfExe3ExcelDTO dto) {
         if (dto.getPfno() == null || dto.getPfno().isEmpty()) {
             System.err.println("InfExe3：采购合同号为空，过滤该条数据：" + dto);

src/main/resources/application.yml

@@ -10,8 +10,9 @@ spring:
       max-request-size: 10MB
   datasource:
     driver-class-name: dm.jdbc.driver.DmDriver
-    url: jdbc:dm://10.19.13.211:5236
-    username: SGGMIIP
+    #url: jdbc:dm://10.19.13.211:5236
+    url: jdbc:dm://10.19.14.22:5236
+    username: SGGMINFT
     password: SXxxjsgs2025
     druid:
       initial-size: 5