Browse Source

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

11816 2 months ago
parent
commit
0cbf7b4e8b

+ 1
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/DailijiesuanSettleServiceImpl.java View File

82
                 saleSettle3.setCreateTime(new Date());
82
                 saleSettle3.setCreateTime(new Date());
83
                 saleSettle3.setUpdateTime(new Date());
83
                 saleSettle3.setUpdateTime(new Date());
84
                 saleSettle3.setPlaced("2");
84
                 saleSettle3.setPlaced("2");
85
+                saleSettle3.setRptg(salesOrder.getRptg());
85
 
86
 
86
 
87
 
87
                 saleSettle3.setFours(salesOrder.getFours());
88
                 saleSettle3.setFours(salesOrder.getFours());

+ 6
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/DaodandengjiSettleServiceImpl.java View File

4
 import com.example.backend.pAndSExe.mapper.InfDaodandengjiMapper;
4
 import com.example.backend.pAndSExe.mapper.InfDaodandengjiMapper;
5
 import com.example.backend.pAndSExe.mapper.LcctrlMapper;
5
 import com.example.backend.pAndSExe.mapper.LcctrlMapper;
6
 import com.example.backend.pAndSExe.mapper.MdkcctrlMapper;
6
 import com.example.backend.pAndSExe.mapper.MdkcctrlMapper;
7
+import com.example.backend.pAndSExe.mapper.PurchasecontractMapper;
7
 import com.example.backend.pAndSExe.model.InfDaodandengji;
8
 import com.example.backend.pAndSExe.model.InfDaodandengji;
8
 import com.example.backend.pAndSExe.model.Lcctrl;
9
 import com.example.backend.pAndSExe.model.Lcctrl;
10
+import com.example.backend.pAndSExe.model.Purchasecontract;
9
 import com.example.backend.pAndSExe.service.DaodandengjiSettleService;
11
 import com.example.backend.pAndSExe.service.DaodandengjiSettleService;
10
 import org.springframework.beans.factory.annotation.Autowired;
12
 import org.springframework.beans.factory.annotation.Autowired;
11
 import org.springframework.stereotype.Service;
13
 import org.springframework.stereotype.Service;
27
     private LcctrlMapper lcctrlMapper;
29
     private LcctrlMapper lcctrlMapper;
28
     @Autowired
30
     @Autowired
29
     private MdkcctrlMapper mdkcctrlMapper;
31
     private MdkcctrlMapper mdkcctrlMapper;
32
+    @Autowired
33
+    private PurchasecontractMapper purchasecontractMapper;
30
 
34
 
31
     /**
35
     /**
32
      * 批量导入到货登记中间表数据到业务表
36
      * 批量导入到货登记中间表数据到业务表
65
                 lcctrl.setUpdateTime(new Date());
69
                 lcctrl.setUpdateTime(new Date());
66
                 lcctrl.setPlaced("2");
70
                 lcctrl.setPlaced("2");
67
                 lcctrl.setFno(inf.getFno());
71
                 lcctrl.setFno(inf.getFno());
72
+                Purchasecontract purchasecontract = purchasecontractMapper.selectByFno(inf.getPono());
73
+                lcctrl.setRptg(purchasecontract.getRptg());
68
 
74
 
69
 
75
 
70
                 // 插入业务表
76
                 // 插入业务表

+ 1
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/FeeInvoiceSettleServiceImpl.java View File

72
                 settle.setTaxInvType(inf.getTaxInvType()); // 映射中间表发票类型
72
                 settle.setTaxInvType(inf.getTaxInvType()); // 映射中间表发票类型
73
                 settle.setExpNode(inf.getExpNode());   // 映射中间表业务类别
73
                 settle.setExpNode(inf.getExpNode());   // 映射中间表业务类别
74
                 settle.setCateName(inf.getCateName()); // 映射中间表类别名称
74
                 settle.setCateName(inf.getCateName()); // 映射中间表类别名称
75
+                settle.setRptg(purchasecontract.getRptg());
75
 
76
 
76
                 Feiyongleixing feiyongleixing=purMultiSettleMapper.selectFeeCateNameByFeeNm(inf.getFeeNm());
77
                 Feiyongleixing feiyongleixing=purMultiSettleMapper.selectFeeCateNameByFeeNm(inf.getFeeNm());
77
                 settle.setCateName(feiyongleixing.getCateName());
78
                 settle.setCateName(feiyongleixing.getCateName());

+ 2
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/FeePayServiceImpl.java View File

78
                 ctrl.setCurcy(fee.getCurcy());        // 对应inf_feiyongfukuan.curcy(币别)
78
                 ctrl.setCurcy(fee.getCurcy());        // 对应inf_feiyongfukuan.curcy(币别)
79
                 ctrl.setQichu("1");                   // 固定值1(和Exe3/Exe1一致)
79
                 ctrl.setQichu("1");                   // 固定值1(和Exe3/Exe1一致)
80
                 ctrl.setPlaced("2");
80
                 ctrl.setPlaced("2");
81
+
81
                 ctrl.setCreateBy(fee.getCreateBy());
82
                 ctrl.setCreateBy(fee.getCreateBy());
82
                 ctrl.setFmodalid(16L);
83
                 ctrl.setFmodalid(16L);
83
                 Rate rate=paymgrctrlMapper.selectRate(fee.getCurcy());
84
                 Rate rate=paymgrctrlMapper.selectRate(fee.getCurcy());
93
                 if (fee.getPono()!=null&& !fee.getPono().isEmpty()){
94
                 if (fee.getPono()!=null&& !fee.getPono().isEmpty()){
94
                     purchasecontract= purchasecontractMapper.selectByFno(fee.getPono());
95
                     purchasecontract= purchasecontractMapper.selectByFno(fee.getPono());
95
                     if (purchasecontract!=null){
96
                     if (purchasecontract!=null){
97
+                        ctrl.setRptg(purchasecontract.getRptg());
96
                         ctrl.setFours(purchasecontract.getFours());
98
                         ctrl.setFours(purchasecontract.getFours());
97
                         ctrl.setFoursname(purchasecontract.getFoursname());
99
                         ctrl.setFoursname(purchasecontract.getFoursname());
98
                     }
100
                     }

+ 1
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/HuozhizanguSettleServiceImpl.java View File

76
                 provIn.setDelFlag(0);
76
                 provIn.setDelFlag(0);
77
                 provIn.setFno(inf.getFno());
77
                 provIn.setFno(inf.getFno());
78
                 provIn.setCreateTime(new Date());
78
                 provIn.setCreateTime(new Date());
79
+                provIn.setRptg(purchasecontract.getRptg());
79
                 provInMapper.insert(provIn);
80
                 provInMapper.insert(provIn);
80
 
81
 
81
 
82
 

+ 1
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/JinxiangInvoiceSettleServiceImpl.java View File

81
                 settle.setCreateTime(new Date());
81
                 settle.setCreateTime(new Date());
82
                 settle.setUpdateTime(new Date());
82
                 settle.setUpdateTime(new Date());
83
                 settle.setPlaced("2");
83
                 settle.setPlaced("2");
84
+                settle.setRptg(purchasecontract.getRptg());
84
                 if (purchasecontract.getBiztype().equals("内贸采购")) {
85
                 if (purchasecontract.getBiztype().equals("内贸采购")) {
85
                     settle.setFmodalid(13L);
86
                     settle.setFmodalid(13L);
86
 
87
 

+ 1
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/PayServiceImpl.java View File

81
                 ctrl.setPlaced("2");
81
                 ctrl.setPlaced("2");
82
                 ctrl.setAcctSet(purchaseOrder.getAcctSet());
82
                 ctrl.setAcctSet(purchaseOrder.getAcctSet());
83
                 ctrl.setFours(purchaseOrder.getFours());
83
                 ctrl.setFours(purchaseOrder.getFours());
84
+                ctrl.setRptg(purchasecontract.getRptg());
84
 
85
 
85
                 ctrl.setFoursname(purchaseOrder.getFoursname());
86
                 ctrl.setFoursname(purchaseOrder.getFoursname());
86
 
87
 

+ 1
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/ShoukuanrenlingSettleServiceImpl.java View File

76
                 breceiptctrl.setPlaced("2");
76
                 breceiptctrl.setPlaced("2");
77
                 breceiptctrl.setFmodalid(19L);
77
                 breceiptctrl.setFmodalid(19L);
78
                 breceiptctrl.setSoAdd(inf.getSono());
78
                 breceiptctrl.setSoAdd(inf.getSono());
79
+                breceiptctrl.setRptg(salesContract.getRptg());
79
 
80
 
80
 
81
 
81
                 String s = mdkcctrlMapper.selectCreateByName(inf.getCreateBy());
82
                 String s = mdkcctrlMapper.selectCreateByName(inf.getCreateBy());

+ 4
- 1
src/main/java/com/example/backend/pAndSExe/service/impl/StockServiceImpl.java View File

79
                 ctrl.setSono1(exe1.getSfno());
79
                 ctrl.setSono1(exe1.getSfno());
80
                 ctrl.setFmodalid(exe1.getFmodalid());// 对应inf_exe1.fmodalid
80
                 ctrl.setFmodalid(exe1.getFmodalid());// 对应inf_exe1.fmodalid
81
                 ctrl.setCreateBy(exe1.getCreateBy());
81
                 ctrl.setCreateBy(exe1.getCreateBy());
82
+
82
                 ctrl.setQiChu("1");
83
                 ctrl.setQiChu("1");
83
                 ctrl.setPlaced("2");
84
                 ctrl.setPlaced("2");
84
                 String userName = mdkcctrlMapper.selectCreateByName(ctrl.getCreateBy());
85
                 String userName = mdkcctrlMapper.selectCreateByName(ctrl.getCreateBy());
102
                     purchasecontract=mdkcctrlMapper.selectFoursnameByPono(exe1.getPfno());
103
                     purchasecontract=mdkcctrlMapper.selectFoursnameByPono(exe1.getPfno());
103
                     String pono =purchasecontract.getFno();
104
                     String pono =purchasecontract.getFno();
104
                     purchaseOrder=purchaseorderMapper.selectByPurchaseContract(pono);
105
                     purchaseOrder=purchaseorderMapper.selectByPurchaseContract(pono);
105
-
106
+                        ctrl.setRptg(purchasecontract.getRptg());
106
                         ctrl.setFours(purchaseOrder.getFours());
107
                         ctrl.setFours(purchaseOrder.getFours());
107
                         ctrl.setFoursname(purchaseOrder.getFoursname());
108
                         ctrl.setFoursname(purchaseOrder.getFoursname());
108
                         ctrl.setAcctSet(purchaseOrder.getAcctSet());
109
                         ctrl.setAcctSet(purchaseOrder.getAcctSet());
118
                 }else if (exe1.getFmodalid()==24){
119
                 }else if (exe1.getFmodalid()==24){
119
                      salesOrder = salesorderMapper.selectBySalesContract(exe1.getSfno());
120
                      salesOrder = salesorderMapper.selectBySalesContract(exe1.getSfno());
120
                     salesContract = salesContractExeMapper.selectByFno(exe1.getSfno());
121
                     salesContract = salesContractExeMapper.selectByFno(exe1.getSfno());
122
+                    ctrl.setRptg(salesContract.getRptg());
121
                         ctrl.setFours(salesOrder.getFours());
123
                         ctrl.setFours(salesOrder.getFours());
122
                         ctrl.setFoursname(salesOrder.getFoursname());
124
                         ctrl.setFoursname(salesOrder.getFoursname());
123
                         ctrl.setAcctSet(salesOrder.getAcctSet());
125
                         ctrl.setAcctSet(salesOrder.getAcctSet());
182
                 dtl.setFphno(exe1.getFphno());// 对应inf_exe1.SMRNo
184
                 dtl.setFphno(exe1.getFphno());// 对应inf_exe1.SMRNo
183
                 dtl.setQiChu("1");
185
                 dtl.setQiChu("1");
184
 
186
 
187
+
185
                 if (exe1.getFmodalid()==22){
188
                 if (exe1.getFmodalid()==22){
186
                     POrderDtl pOrderDtl=pOrderDtlMapper.selectByPurchaseContractId(purchasecontract.getId());
189
                     POrderDtl pOrderDtl=pOrderDtlMapper.selectByPurchaseContractId(purchasecontract.getId());
187
                     dtl.setFcat(1);
190
                     dtl.setFcat(1);

+ 1
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/XiaoshoujiesuankaipiaoSettleServiceImpl.java View File

85
                 saleSettle.setCreateTime(new Date());
85
                 saleSettle.setCreateTime(new Date());
86
                 saleSettle.setUpdateTime(new Date());
86
                 saleSettle.setUpdateTime(new Date());
87
                 saleSettle.setPlaced("2");
87
                 saleSettle.setPlaced("2");
88
+                saleSettle.setRptg(salesOrder.getRptg());
88
 
89
 
89
                 // 我方代码
90
                 // 我方代码
90
                 saleSettle.setFours(salesOrder.getFours());
91
                 saleSettle.setFours(salesOrder.getFours());

Loading…
Cancel
Save