修改大量

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

@@ -1,13 +1,8 @@
 package com.example.backend.pAndSExe.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.example.backend.pAndSExe.mapper.InfDailijiesuanMapper;
-import com.example.backend.pAndSExe.mapper.MdkcctrlMapper;
-import com.example.backend.pAndSExe.mapper.SaleSettle3Mapper;
-import com.example.backend.pAndSExe.mapper.SettleProdDtl3Mapper;
-import com.example.backend.pAndSExe.model.InfDailijiesuan;
-import com.example.backend.pAndSExe.model.SaleSettle3;
-import com.example.backend.pAndSExe.model.SettleProdDtl3;
+import com.example.backend.pAndSExe.mapper.*;
+import com.example.backend.pAndSExe.model.*;
 import com.example.backend.pAndSExe.service.DailijiesuanSettleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +29,15 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
     @Autowired
     private MdkcctrlMapper mdkcctrlMapper;
 
+    @Autowired
+    private SalesorderMapper salesorderMapper;
+
+    @Autowired
+    private PaymgrctrlMapper paymgrctrlMapper;
+
+    @Autowired
+    private SalesInvDtlMapper salesInvDtlMapper;
+
     /**
      * 批量导入代理结算中间表数据到业务表
      */
@@ -42,7 +46,7 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
         // 1. 查询中间表有效数据（dataStatus=0）
         List<InfDailijiesuan> infList = infDailijiesuanMapper.selectValidData();
         //todo
-        infList=infDailijiesuanMapper.selectAllData();
+        //infList=infDailijiesuanMapper.selectAllData();
         if (infList.isEmpty()) {
             return "未查询到代理结算中间表中有效数据（dataStatus=0），无需导入";
         }
@@ -54,6 +58,9 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
         for (InfDailijiesuan inf : infList) {
             try {
                 // -------------------- 第一步：插入主表saleSettle3 --------------------
+
+                SalesOrder salesOrder = salesorderMapper.selectBySalesContract(inf.getSono());
+
                 SaleSettle3 saleSettle3 = new SaleSettle3();
                 Long settleId = IdWorker.getId(); // 19位雪花ID（主表）
                 saleSettle3.setId(settleId);
@@ -75,6 +82,53 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
                 saleSettle3.setUpdateTime(new Date());
                 saleSettle3.setPlaced("2");
 
+
+                saleSettle3.setFours(salesOrder.getFours());
+                saleSettle3.setFoursname(salesOrder.getFoursname());
+                saleSettle3.setCtNo(salesOrder.getCtNo());
+                saleSettle3.setCtName(salesOrder.getCtName());
+                saleSettle3.setCurcy(salesOrder.getCurcy());
+                saleSettle3.setRate(salesOrder.getRate());
+                saleSettle3.setTerms(salesOrder.getTerms());
+                saleSettle3.setSignLoc(salesOrder.getSignLoc());
+                saleSettle3.setDelivLoc(salesOrder.getDelivLoc());
+                saleSettle3.setTrdCtry(salesOrder.getTrdCtry());
+                saleSettle3.setPayment(salesOrder.getPayment());
+                saleSettle3.setTradeway(salesOrder.getTradeway());
+                saleSettle3.setSoOrderNo(salesOrder.getFno());
+                saleSettle3.setQtyOver(salesOrder.getQtyOver());
+                saleSettle3.setQtyShort(salesOrder.getQtyShort());
+                saleSettle3.setAmtOver(salesOrder.getAmtOver());
+                saleSettle3.setAmtShort(salesOrder.getAmtShort());
+                saleSettle3.setChnShipName(salesOrder.getChnShipName());
+                saleSettle3.setEngShipName(salesOrder.getEngShipName());
+                saleSettle3.setCtOrderNo(salesOrder.getCtOrderNo());
+                saleSettle3.setPono(salesOrder.getPono());
+                saleSettle3.setRcptMtd(salesOrder.getRcptMtd());
+                saleSettle3.setSignDate(salesOrder.getSignDate());
+                saleSettle3.setOrigin(salesOrder.getOrigin());
+                saleSettle3.setOurBankNm(salesOrder.getOurBankNm());
+                saleSettle3.setOurBankAcct(salesOrder.getOurBankAcct());
+                saleSettle3.setBizType(salesOrder.getBizType());
+                saleSettle3.setAcctSet(salesOrder.getAcctSet());
+                saleSettle3.setCtBankName(salesOrder.getCtBankName());
+                saleSettle3.setPriceDesc(salesOrder.getPriceDesc());
+                saleSettle3.setCtBankAcct(salesOrder.getCtBankAcct());
+                saleSettle3.setServiceType(salesOrder.getServiceType());
+                saleSettle3.setIfClearBottom(salesOrder.getIfClearBottom());
+                saleSettle3.setBizProductType(salesOrder.getBizProductType());
+                saleSettle3.setRptg(salesOrder.getRptg());
+                saleSettle3.setCtContNm(salesOrder.getCtContNm());
+                saleSettle3.setIfgc(salesOrder.getIfgc());
+                saleSettle3.setIfWeighedSalesQty(salesOrder.getIfWeighedSalesQty());
+
+                Rate rate=paymgrctrlMapper.selectRate(salesOrder.getCurcy());
+                if (rate!=null ){
+                    saleSettle3.setRateUsd(rate.getRateUsd());
+                    saleSettle3.setRateUs(rate.getRateUs());
+                    saleSettle3.setRate(rate.getRate());
+                }
+
                 saleSettle3Mapper.insert(saleSettle3);
 
                 // -------------------- 第二步：插入从表settleProdDtl3 --------------------
@@ -91,13 +145,36 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
                 settleProdDtl3.setSoamt(inf.getSoamt());
                 settleProdDtl3.setOutTaxRate(inf.getOutTaxRate());
                 settleProdDtl3.setNtSoAmt(inf.getNtSoAmt());
+                settleProdDtl3.setCtOrderNo(inf.getSono());
+                settleProdDtl3.setSono(inf.getSono());
+                settleProdDtl3.setAcctSet(salesOrder.getAcctSet());
+                settleProdDtl3.setCtName(salesOrder.getCtName());
+                settleProdDtl3.setCtNo(salesOrder.getCtNo());
+
+
 
 
                 settleProdDtl3Mapper.insert(settleProdDtl3);
 
+                SalesInvDtl salesInvDtl=new SalesInvDtl();
+                Long invDtlId = IdWorker.getId(); // 19位雪花ID（从表）
+                salesInvDtl.setId(invDtlId);
+                salesInvDtl.setRid(settleId); // 关联主表ID
+                salesInvDtl.setItemno(inf.getItemno());
+                salesInvDtl.setSdesc(inf.getSdesc());
+                salesInvDtl.setBrand(inf.getBrand());
+                salesInvDtl.setQty(inf.getQty());
+                salesInvDtl.setUt(inf.getUt());
+                salesInvDtl.setSoamt(inf.getSoamt());
+                salesInvDtl.setOutTaxRate(inf.getOutTaxRate());
+                salesInvDtl.setNtSoAmt(inf.getNtSoAmt());
+
+
+                salesInvDtlMapper.insert(salesInvDtl);
+
                 // -------------------- 第三步：更新中间表状态为已导入 --------------------
                 //todo
-                //infDailijiesuanMapper.updateStatusById(inf.getId());
+                infDailijiesuanMapper.updateStatusById(inf.getId());
                 successCount++;
             } catch (Exception e) {
                 failCount++;

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

@@ -35,6 +35,9 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
     @Autowired
     private PaymgrctrlMapper paymgrctrlMapper;
 
+    @Autowired
+    private SettleProdDtlMapper settleProdDtlMapper;
+
 
 
     /**
@@ -151,7 +154,28 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
                 salesInvDtl.setOutTaxRate(inf.getOutTaxRate());
                 salesInvDtl.setNtSoAmt(inf.getNtSoAmt());
 
-                salesInvDtlMapper.insertSalesInvDtl(salesInvDtl);
+                salesInvDtlMapper.insert(salesInvDtl);
+
+                SettleProdDtl settleProdDtl =new SettleProdDtl();
+                Long prodDtlId = IdWorker.getId(); // 19位雪花ID（从表）
+                settleProdDtl.setId(prodDtlId);
+                settleProdDtl.setRid(settleId); // 关联主表ID
+                settleProdDtl.setItemno(inf.getItemno());
+                settleProdDtl.setSdesc(inf.getSdesc());
+                settleProdDtl.setQty(inf.getQty());
+                settleProdDtl.setUt(inf.getUt());
+                settleProdDtl.setSoamt(inf.getSoamt());
+                settleProdDtl.setNtSoAmt(inf.getNtSoAmt());
+                settleProdDtl.setOutTaxRate(inf.getOutTaxRate());
+                settleProdDtl.setCtOrderNo(inf.getSono());
+                settleProdDtl.setSono(inf.getSono());
+                settleProdDtl.setAcctSet(salesOrder.getAcctSet());
+                settleProdDtl.setCtName(salesOrder.getCtName());
+                settleProdDtl.setCtNo(salesOrder.getCtNo());
+
+                settleProdDtlMapper.insert(settleProdDtl);
+
+
 
                 // -------------------- 第三步：更新中间表状态为已导入 --------------------
                 //todo