1 货款付款添加4个字段的导入中间表 业务表

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

@@ -22,5 +22,13 @@ public class InfExe3ExcelDTO {
     private Double appAmt;
     @ExcelProperty(index = 6) // G列 - 币别
     private String curcy;
+    @ExcelProperty(index = 7) // I列 - 付款日期
+    private String receiptNo;
+    @ExcelProperty(index = 8) // J列 - 付款日期
+    private String expanseReportId;
+    @ExcelProperty(index = 9) // K列 - 付款日期
+    private String InitNumber;
+    @ExcelProperty(index = 10) // L列 - 付款日期
+    private String InitCode;
 
 }

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

@@ -15,4 +15,7 @@ public interface SalesorderMapper extends BaseMapper <SalesOrder> {
 
     @Select("select soid from SGGMIIP.salesDtl WHERE rid=#{id} and del_flag!='1' limit 1")
     Long selectSoidById(String id);
+
+    @Select("select * from SGGMIIP.SalesOrder WHERE fno=#{s} and nvl(del_flag,0)!=1 limit 1")
+    SalesOrder selectLinShiContract(String s);
 }

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

@@ -1,5 +1,6 @@
 package com.example.backend.pAndSExe.model;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -85,5 +86,14 @@ public class InfExe3 implements Serializable {
 
     @TableField(value ="createBy")
     private String createBy;
+
+    @TableField(value ="receiptNo")
+    private String receiptNo;
+    @TableField(value ="expanseReportId")
+    private String expanseReportId;
+    @TableField(value ="InitNumber")
+    private String InitNumber;
+    @TableField(value ="InitCode")
+    private String InitCode;
 }
 

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

@@ -374,4 +374,9 @@ public class Paymgrctrl {
     /** 是否期初数据补录 */
     @TableField("isinitDate")
     private String isinitDate;
+
+    @TableField("InitNumber")
+    private String initNumber;
+    @TableField("InitCode")
+    private String initCode;
 }

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

@@ -55,6 +55,6 @@ public class SalesInvDtl {
     @TableField
     private BigDecimal poamt;
 
-    @TableField
+    @TableField("ntpoamt")
     private BigDecimal ntPoAmt;
 }

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

@@ -179,10 +179,10 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
                 salesInvDtl.setQty(inf.getQty());
                 salesInvDtl.setUt(inf.getUt());
                 salesInvDtl.setSoamt(inf.getSoamt());
-                salesInvDtl.setPoamt(inf.getSoamt());
+                // salesInvDtl.setPoamt(inf.getSoamt());
                 salesInvDtl.setOutTaxRate(inf.getOutTaxRate());
                 salesInvDtl.setNtSoAmt(inf.getNtSoAmt());
-                salesInvDtl.setNtPoAmt(inf.getNtSoAmt());
+                //salesInvDtl.setNtPoAmt(inf.getNtSoAmt());
 
 
 

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

@@ -85,6 +85,10 @@ public class PayServiceImpl implements PayService {
                 ctrl.setAcctSet(purchaseOrder.getAcctSet());
                 ctrl.setFours(purchaseOrder.getFours());
                 ctrl.setRptg(purchasecontract.getRptg());
+                ctrl.setReceiptNo(exe3.getReceiptNo());
+                ctrl.setExpanseReportId(exe3.getExpanseReportId());
+                ctrl.setInitNumber(exe3.getInitNumber());
+                ctrl.setInitCode(exe3.getInitCode());
 
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                 LocalDateTime localDateTime = LocalDateTime.parse("2025-12-31 00:00:00", formatter);

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

@@ -152,6 +152,7 @@ public class ShoukuanrenlingSettleServiceImpl implements ShoukuanrenlingSettleSe
                 breceiptdtl.setFisredDesc("已入账");
                 breceiptdtl.setFno(inf.getFno()); // 财务号
                 SalesOrder salesOrder = salesorderMapper.selectBySalesContract(inf.getSono());
+              //  salesOrder=salesorderMapper.selectLinShiContract("SODS52089260003");
                 breceiptdtl.setSoOrderNo(salesOrder.getFno());
                 breceiptdtl.setClaimAmt(inf.getClaimedAmt());
                 breceiptdtl.setPlaced("2");

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

@@ -63,6 +63,7 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
         for (InfXiaoshoujiesuankaipiao inf : infList) {
             try {
                 SalesOrder salesOrder = salesorderMapper.selectBySalesContract(inf.getSono());
+               // salesOrder =salesorderMapper.selectLinShiContract("SODS52089260003");
 
                 // -------------------- 第一步：插入主表saleSettle --------------------
                 SaleSettle saleSettle = new SaleSettle();

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

@@ -722,6 +722,10 @@ public class PsExeExcelUtil {
         entity.setAppAmt(parseBigDecimal(dto.getAppAmt(), 2));
         entity.setCurcy(trimField(dto.getCurcy())); // 新增币别字段赋值
         entity.setCreateBy(trimField(dto.getCreateBy())); // 新增制单人字段赋值
+        entity.setReceiptNo(trimField(dto.getReceiptNo()));
+        entity.setExpanseReportId(trimField(dto.getExpanseReportId()));
+        entity.setInitNumber(trimField(dto.getInitNumber()));
+        entity.setInitCode(trimField(dto.getInitCode()));
 
         //生成流水
         InfExe1Amount infExe1Amount = new InfExe1Amount();