1 添加发票模块存储过程

src/main/java/com/example/backend/pAndSExe/controller/PsExeController.java

@@ -72,19 +72,19 @@ public class PsExeController {
         logger.info("收到库存业务导入请求，文件名: {}", file.getOriginalFilename());
         try {
             // 调用服务方法，获取导入结果
-            String resultMsg = stockService.importInfExe1ToMdkc();
-            String s = payService.importInfExe3ToPay();
-            String s1 = feePayService.importInfFeiyongfukuanToPay();
-            String s2 = feeInvoiceSettleService.importInfToSettle();
+           // String resultMsg = stockService.importInfExe1ToMdkc();
+           // String s = payService.importInfExe3ToPay();
+           // String s1 = feePayService.importInfFeiyongfukuanToPay();
+           // String s2 = feeInvoiceSettleService.importInfToSettle();
             String s3 = jinxiangInvoiceSettleService.importJinxiangInfToSettle();
-            String s4 = daodandengjiSettleService.importDaodandengjiInfToSettle();
-            String s5 = shoukuanrenlingSettleService.importShoukuanrenlingInfToSettle();
-            String s6 = xiaoshoujiesuankaipiaoSettleService.importXiaoshoujiesuankaipiaoInfToSettle();
-            String s7 = dailijiesuanSettleService.importDailijiesuanInfToSettle();
+           // String s4 = daodandengjiSettleService.importDaodandengjiInfToSettle();
+           // String s5 = shoukuanrenlingSettleService.importShoukuanrenlingInfToSettle();
+           // String s6 = xiaoshoujiesuankaipiaoSettleService.importXiaoshoujiesuankaipiaoInfToSettle();
+           // String s7 = dailijiesuanSettleService.importDailijiesuanInfToSettle();
 
 
             // 返回成功JSON
-            return Result.success(resultMsg+s+s1+s2+s3+s4+s5+s6+s7, "所有业务导入");
+            return Result.success(/*resultMsg+s+s1+s2+*/s3/*+s4+s5+s6+s7*/, "所有业务导入");
         } catch (Exception e) {
             logger.error("库存业务导入失败", e);
             // 返回失败JSON

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

@@ -1,8 +1,10 @@
 package com.example.backend.pAndSExe.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.backend.pAndSExe.model.PurMultiSettle;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 费用发票结算主表Mapper
@@ -14,4 +16,12 @@ public interface PurMultiSettleMapper extends BaseMapper<PurMultiSettle> {
     int insertPurMultiSettle(@Param("settle") PurMultiSettle settle);
 
     int insertJinxiangPurMultiSettle(@Param("settle") PurMultiSettle settle);
+
+    @InterceptorIgnore(blockAttack="true")
+    @Update("{call SGGMIIP.pro_inputInvReg_save(#{settleId})}")
+    void insertId(Long settleId);
+
+    @InterceptorIgnore(blockAttack="true")
+    @Update("{call SGGMIIP.pro_feelInvReq_save300(#{settleId})}")
+    void insertfeeId(Long settleId);
 }

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

@@ -1,8 +1,10 @@
 package com.example.backend.pAndSExe.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.backend.pAndSExe.model.SaleSettle3;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 代理结算主表Mapper
@@ -12,4 +14,9 @@ public interface SaleSettle3Mapper extends BaseMapper<SaleSettle3> {
      * 插入代理结算主表（包含通用字段）
      */
     int insertSaleSettle3(@Param("saleSettle3") SaleSettle3 saleSettle3);
-}
+
+    @InterceptorIgnore(blockAttack="true")
+    @Update("{call SGGMIIP.pro_saleSettle39_save(#{settleId})}")
+    void insertDLID(Long settleId);
+
+}

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

@@ -1,8 +1,10 @@
 package com.example.backend.pAndSExe.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.backend.pAndSExe.model.SaleSettle;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 销售结算开票主表Mapper
@@ -12,4 +14,8 @@ public interface SaleSettleMapper extends BaseMapper<SaleSettle> {
      * 插入销售结算开票主表（包含通用字段）
      */
     int insertSaleSettle(@Param("saleSettle") SaleSettle saleSettle);
+
+    @InterceptorIgnore(blockAttack="true")
+    @Update("{call SGGMIIP.pro_saleSettle36_save(#{settleId})}")
+    void insertXSID(Long settleId);
 }

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

@@ -172,6 +172,8 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
 
                 salesInvDtlMapper.insert(salesInvDtl);
 
+                saleSettle3Mapper.insertDLID(settleId);
+
                 // -------------------- 第三步：更新中间表状态为已导入 --------------------
                 //todo
                 infDailijiesuanMapper.updateStatusById(inf.getId());

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

@@ -2,10 +2,7 @@ package com.example.backend.pAndSExe.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.example.backend.pAndSExe.mapper.*;
-import com.example.backend.pAndSExe.model.InfFeiyongfapiaodengji;
-import com.example.backend.pAndSExe.model.PurMultiSettle;
-import com.example.backend.pAndSExe.model.PurStlProdDtl;
-import com.example.backend.pAndSExe.model.Rate;
+import com.example.backend.pAndSExe.model.*;
 import com.example.backend.pAndSExe.service.FeeInvoiceSettleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +31,12 @@ public class FeeInvoiceSettleServiceImpl implements FeeInvoiceSettleService {
 
     @Autowired
     private PaymgrctrlMapper paymgrctrlMapper;
+
+    @Autowired
+    private PurchaseorderMapper purchaseorderMapper;
+
+    @Autowired
+    private PurchasecontractMapper purchasecontractMapper;
     /**
      * 批量导入中间表数据到费用发票登记业务表
      */
@@ -54,6 +57,11 @@ public class FeeInvoiceSettleServiceImpl implements FeeInvoiceSettleService {
         for (InfFeiyongfapiaodengji inf : infList) {
             try {
                 // 第一步：插入主表purMultiSettle（补充公用字段赋值）
+
+                PurchaseOrder purchaseOrder = purchaseorderMapper.selectByPurchaseContract(inf.getPono());
+                Purchasecontract purchasecontract = purchasecontractMapper.selectByFno(inf.getPono());
+
+
                 PurMultiSettle settle = new PurMultiSettle();
                 Long settleId = IdWorker.getId(); // 生成19位雪花ID
                 settle.setId(settleId);
@@ -84,6 +92,73 @@ public class FeeInvoiceSettleServiceImpl implements FeeInvoiceSettleService {
                     settle.setRateUs(rate.getRateUs());
                     settle.setRate(rate.getRate());
                 }
+                settle.setFours(purchaseOrder.getFours());
+
+                settle.setFoursname(purchaseOrder.getFoursname());
+
+                settle.setSupCode(purchaseOrder.getSupCode());
+
+                settle.setSupName(purchaseOrder.getSupName());
+
+                settle.setSignLoc(purchaseOrder.getSignLoc());
+
+                settle.setBizType(purchaseOrder.getBizType());
+
+                settle.setOurBankAcct(purchaseOrder.getOurBankAcct());
+
+                settle.setOurBankNm(purchaseOrder.getOurBankNm());
+
+                settle.setServiceType(purchaseOrder.getServiceType());
+
+                settle.setBizProductType(purchaseOrder.getBizProductType());
+
+                settle.setSupAcc(purchasecontract.getSupacc());
+                settle.setSupBank(purchasecontract.getSupbank());
+                settle.setSupContact(purchasecontract.getSupcontact());
+                settle.setTrdCtry(purchasecontract.getTrdctry());
+                settle.setFours(purchaseOrder.getFours());
+                settle.setFoursname(purchaseOrder.getFoursname());
+                settle.setSupCode(purchaseOrder.getSupCode());
+                settle.setSupName(purchaseOrder.getSupName());
+
+
+                settle.setCurcy(purchaseOrder.getCurcy());
+                settle.setRate(purchaseOrder.getRate());
+                settle.setTerms(purchaseOrder.getTerms());
+
+
+                settle.setSignLoc(purchaseOrder.getSignLoc());
+                settle.setLPort(purchaseOrder.getLPort());
+                settle.setDPort(purchaseOrder.getDPort());
+
+
+                settle.setPayment(purchaseOrder.getPayment());
+                settle.setQtyOver(purchaseOrder.getQtyOver());
+                settle.setQtyShort(purchaseOrder.getQtyShort());
+                settle.setAmtOver(purchaseOrder.getAmtOver());
+                settle.setAmtShort(purchaseOrder.getAmtShort());
+
+
+                settle.setAcctSet(purchaseOrder.getAcctSet());
+                settle.setBizType(purchaseOrder.getBizType());
+
+
+                settle.setContrExecCd(purchaseOrder.getContrExecCd());
+                settle.setContrExecNm(purchaseOrder.getContrExecNm());
+                settle.setEstArrDt(purchaseOrder.getEstArrDt());
+                settle.setEstLoadDt(purchaseOrder.getEstLoadDt());
+
+
+                settle.setOurBankAcct(purchaseOrder.getOurBankAcct());
+                settle.setOurBankNm(purchaseOrder.getOurBankNm());
+
+
+                settle.setRespCtrCode(purchaseOrder.getRespCtrCode());
+                settle.setRespCtrName(purchaseOrder.getRespCtrName());
+
+                settle.setSupAcc(purchasecontract.getSupacc());
+                settle.setSupBank(purchasecontract.getSupbank());
+                settle.setTrdCtry(purchasecontract.getTrdctry());
 
 
 
@@ -108,6 +183,8 @@ public class FeeInvoiceSettleServiceImpl implements FeeInvoiceSettleService {
 
                 purStlProdDtlMapper.insert(dtl);
 
+
+                purMultiSettleMapper.insertfeeId(settleId);
                 // 更新中间表状态为已导入
                 //todo
                  infFeiyongfapiaodengjiMapper.updateStatusById(inf.getId());

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

@@ -220,6 +220,8 @@ public class JinxiangInvoiceSettleServiceImpl implements JinxiangInvoiceSettleSe
 
                 purStlProdDtlMapper.insert(dtl);
 
+                purMultiSettleMapper.insertId(settleId);
+
                 // 更新中间表状态为已导入
                 //todo
                 infJinxiangfapiaoMapper.updateStatusById(inf.getId());

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

@@ -176,6 +176,9 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
                 settleProdDtlMapper.insert(settleProdDtl);
 
 
+                saleSettleMapper.insertXSID(settleId);
+
+
 
                 // -------------------- 第三步：更新中间表状态为已导入 --------------------
                 //todo