1 给所有模块添加对Rptg的赋值

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

@@ -82,6 +82,7 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
                 saleSettle3.setCreateTime(new Date());
                 saleSettle3.setUpdateTime(new Date());
                 saleSettle3.setPlaced("2");
+                saleSettle3.setRptg(salesOrder.getRptg());
 
 
                 saleSettle3.setFours(salesOrder.getFours());

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

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.example.backend.pAndSExe.mapper.InfDaodandengjiMapper;
 import com.example.backend.pAndSExe.mapper.LcctrlMapper;
 import com.example.backend.pAndSExe.mapper.MdkcctrlMapper;
+import com.example.backend.pAndSExe.mapper.PurchasecontractMapper;
 import com.example.backend.pAndSExe.model.InfDaodandengji;
 import com.example.backend.pAndSExe.model.Lcctrl;
+import com.example.backend.pAndSExe.model.Purchasecontract;
 import com.example.backend.pAndSExe.service.DaodandengjiSettleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,6 +29,8 @@ public class DaodandengjiSettleServiceImpl implements DaodandengjiSettleService
     private LcctrlMapper lcctrlMapper;
     @Autowired
     private MdkcctrlMapper mdkcctrlMapper;
+    @Autowired
+    private PurchasecontractMapper purchasecontractMapper;
 
     /**
      * 批量导入到货登记中间表数据到业务表
@@ -65,6 +69,8 @@ public class DaodandengjiSettleServiceImpl implements DaodandengjiSettleService
                 lcctrl.setUpdateTime(new Date());
                 lcctrl.setPlaced("2");
                 lcctrl.setFno(inf.getFno());
+                Purchasecontract purchasecontract = purchasecontractMapper.selectByFno(inf.getPono());
+                lcctrl.setRptg(purchasecontract.getRptg());
 
 
                 // 插入业务表

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

@@ -72,6 +72,7 @@ public class FeeInvoiceSettleServiceImpl implements FeeInvoiceSettleService {
                 settle.setTaxInvType(inf.getTaxInvType()); // 映射中间表发票类型
                 settle.setExpNode(inf.getExpNode());   // 映射中间表业务类别
                 settle.setCateName(inf.getCateName()); // 映射中间表类别名称
+                settle.setRptg(purchasecontract.getRptg());
 
                 Feiyongleixing feiyongleixing=purMultiSettleMapper.selectFeeCateNameByFeeNm(inf.getFeeNm());
                 settle.setCateName(feiyongleixing.getCateName());

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

@@ -78,6 +78,7 @@ public class FeePayServiceImpl implements FeePayService {
                 ctrl.setCurcy(fee.getCurcy());        // 对应inf_feiyongfukuan.curcy（币别）
                 ctrl.setQichu("1");                   // 固定值1（和Exe3/Exe1一致）
                 ctrl.setPlaced("2");
+
                 ctrl.setCreateBy(fee.getCreateBy());
                 ctrl.setFmodalid(16L);
                 Rate rate=paymgrctrlMapper.selectRate(fee.getCurcy());
@@ -93,6 +94,7 @@ public class FeePayServiceImpl implements FeePayService {
                 if (fee.getPono()!=null&& !fee.getPono().isEmpty()){
                     purchasecontract= purchasecontractMapper.selectByFno(fee.getPono());
                     if (purchasecontract!=null){
+                        ctrl.setRptg(purchasecontract.getRptg());
                         ctrl.setFours(purchasecontract.getFours());
                         ctrl.setFoursname(purchasecontract.getFoursname());
                     }

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

@@ -76,6 +76,7 @@ public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
                 provIn.setDelFlag(0);
                 provIn.setFno(inf.getFno());
                 provIn.setCreateTime(new Date());
+                provIn.setRptg(purchasecontract.getRptg());
                 provInMapper.insert(provIn);
 
 

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

@@ -81,6 +81,7 @@ public class JinxiangInvoiceSettleServiceImpl implements JinxiangInvoiceSettleSe
                 settle.setCreateTime(new Date());
                 settle.setUpdateTime(new Date());
                 settle.setPlaced("2");
+                settle.setRptg(purchasecontract.getRptg());
                 if (purchasecontract.getBiztype().equals("内贸采购")) {
                     settle.setFmodalid(13L);
 

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

@@ -81,6 +81,7 @@ public class PayServiceImpl implements PayService {
                 ctrl.setPlaced("2");
                 ctrl.setAcctSet(purchaseOrder.getAcctSet());
                 ctrl.setFours(purchaseOrder.getFours());
+                ctrl.setRptg(purchasecontract.getRptg());
 
                 ctrl.setFoursname(purchaseOrder.getFoursname());
 

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

@@ -76,6 +76,7 @@ public class ShoukuanrenlingSettleServiceImpl implements ShoukuanrenlingSettleSe
                 breceiptctrl.setPlaced("2");
                 breceiptctrl.setFmodalid(19L);
                 breceiptctrl.setSoAdd(inf.getSono());
+                breceiptctrl.setRptg(salesContract.getRptg());
 
 
                 String s = mdkcctrlMapper.selectCreateByName(inf.getCreateBy());

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

@@ -79,6 +79,7 @@ public class StockServiceImpl implements StockService {
                 ctrl.setSono1(exe1.getSfno());
                 ctrl.setFmodalid(exe1.getFmodalid());// 对应inf_exe1.fmodalid
                 ctrl.setCreateBy(exe1.getCreateBy());
+
                 ctrl.setQiChu("1");
                 ctrl.setPlaced("2");
                 String userName = mdkcctrlMapper.selectCreateByName(ctrl.getCreateBy());
@@ -102,7 +103,7 @@ public class StockServiceImpl implements StockService {
                     purchasecontract=mdkcctrlMapper.selectFoursnameByPono(exe1.getPfno());
                     String pono =purchasecontract.getFno();
                     purchaseOrder=purchaseorderMapper.selectByPurchaseContract(pono);
-
+                        ctrl.setRptg(purchasecontract.getRptg());
                         ctrl.setFours(purchaseOrder.getFours());
                         ctrl.setFoursname(purchaseOrder.getFoursname());
                         ctrl.setAcctSet(purchaseOrder.getAcctSet());
@@ -118,6 +119,7 @@ public class StockServiceImpl implements StockService {
                 }else if (exe1.getFmodalid()==24){
                      salesOrder = salesorderMapper.selectBySalesContract(exe1.getSfno());
                     salesContract = salesContractExeMapper.selectByFno(exe1.getSfno());
+                    ctrl.setRptg(salesContract.getRptg());
                         ctrl.setFours(salesOrder.getFours());
                         ctrl.setFoursname(salesOrder.getFoursname());
                         ctrl.setAcctSet(salesOrder.getAcctSet());
@@ -182,6 +184,7 @@ public class StockServiceImpl implements StockService {
                 dtl.setFphno(exe1.getFphno());// 对应inf_exe1.SMRNo
                 dtl.setQiChu("1");
 
+
                 if (exe1.getFmodalid()==22){
                     POrderDtl pOrderDtl=pOrderDtlMapper.selectByPurchaseContractId(purchasecontract.getId());
                     dtl.setFcat(1);

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

@@ -85,6 +85,7 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
                 saleSettle.setCreateTime(new Date());
                 saleSettle.setUpdateTime(new Date());
                 saleSettle.setPlaced("2");
+                saleSettle.setRptg(salesOrder.getRptg());
 
                 // 我方代码
                 saleSettle.setFours(salesOrder.getFours());