weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

财务结算结算币种按照组织管理来查询

Browse Source
This commit is contained in:
秦鸿展
2026-07-06 11:41:18 +08:00
parent 196410331b
commit bc2fc833a2
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/mapper/ReconciliationMapper.java
+1 -1
View File
@@ -43,7 +43,7 @@ public interface ReconciliationMapper extends BaseMapper<Reconciliation>
String getDocumentPreparerNcCode(@Param("salesmanId") String salesmanId); String getDocumentPreparerNcCode(@Param("salesmanId") String salesmanId);
String getSettlementCurrencyNcCode(@Param("settlementCurrency") String settlementCurrency); String getSettlementCurrencyNcCode(@Param("settlementCurrency") String settlementCurrency, @Param("organizationId") Long organizationId);
String getServiceItemsCodeNc(@Param("name") String name); String getServiceItemsCodeNc(@Param("name") String name);
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+4 -4
View File
@@ -754,7 +754,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
String deptName = reconciliationMapper.getDeptName(customerUserDept); String deptName = reconciliationMapper.getDeptName(customerUserDept);
String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId); String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId);
makerCodeNc= documentPreparerNcCode; makerCodeNc= documentPreparerNcCode;
String settlementCurrencyNcCode = settlementCurrency; String settlementCurrencyNcCode = reconciliationMapper.getSettlementCurrencyNcCode(settlementCurrency, reconciliation.getOrganizationId());
String invoiceNumber=make.getInvoiceNumber(); String invoiceNumber=make.getInvoiceNumber();
R<List<TmsMakeOutInvoiceItem>> itemR = wlhyServiceFeign.selectMakeOutInvoiceItemList(make); R<List<TmsMakeOutInvoiceItem>> itemR = wlhyServiceFeign.selectMakeOutInvoiceItemList(make);
if (itemR.getCode()==200) { if (itemR.getCode()==200) {
@@ -1062,7 +1062,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
String deptName = reconciliationMapper.getDeptName(customerUserDept); String deptName = reconciliationMapper.getDeptName(customerUserDept);
String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId); String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId);
makerCodeNc= documentPreparerNcCode; makerCodeNc= documentPreparerNcCode;
String settlementCurrencyNcCode = settlementCurrency; String settlementCurrencyNcCode = reconciliationMapper.getSettlementCurrencyNcCode(settlementCurrency, reconciliation.getOrganizationId());
String invoiceNumber=make.getInvoiceNumber(); String invoiceNumber=make.getInvoiceNumber();
R<List<TmsMakeOutInvoiceItem>> itemR = wlhyServiceFeign.selectMakeOutInvoiceItemList(make); R<List<TmsMakeOutInvoiceItem>> itemR = wlhyServiceFeign.selectMakeOutInvoiceItemList(make);
if (itemR.getCode()==200) { if (itemR.getCode()==200) {
@@ -1633,7 +1633,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
} }
String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId); String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId);
String settlementCurrency=order.getSettlementCurrency(); String settlementCurrency=order.getSettlementCurrency();
String settlementCurrencyNcCode = settlementCurrency; String settlementCurrencyNcCode = reconciliationMapper.getSettlementCurrencyNcCode(settlementCurrency, reconciliation.getOrganizationId());
makerCodeNc=documentPreparerNcCode; makerCodeNc=documentPreparerNcCode;
SKitem item=new SKitem(); SKitem item=new SKitem();
if (deptValue != null && !deptValue.isEmpty()) { if (deptValue != null && !deptValue.isEmpty()) {
@@ -1941,7 +1941,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
} }
String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId); String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId);
String settlementCurrency=order.getSettlementCurrency(); String settlementCurrency=order.getSettlementCurrency();
String settlementCurrencyNcCode = settlementCurrency; String settlementCurrencyNcCode = reconciliationMapper.getSettlementCurrencyNcCode(settlementCurrency, reconciliation.getOrganizationId());
makerCodeNc=documentPreparerNcCode; makerCodeNc=documentPreparerNcCode;
mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml
+7 -2
View File
@@ -381,8 +381,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT DOCUMENT_PREPARER_NC_CODE FROM NGWL_TEST_USER."USER" where del_flag = 1 and user_id = #{salesmanId} limit 1 SELECT DOCUMENT_PREPARER_NC_CODE FROM NGWL_TEST_USER."USER" where del_flag = 1 and user_id = #{salesmanId} limit 1
</select> </select>
<select id="getSettlementCurrencyNcCode" parameterType="java.lang.String" resultType="java.lang.String"> <select id="getSettlementCurrencyNcCode" resultType="java.lang.String">
SELECT NC_SYSTEM_CODE FROM NGWL_TEST_WLHY."TMS_SETTLEMENT_EXCHANGE_RATE" where IS_DELETE = '0' and ENGLISH_NAME = #{settlementCurrency} limit 1 SELECT NC_SYSTEM_CODE FROM NGWL_TEST_WLHY."TMS_SETTLEMENT_EXCHANGE_RATE"
where IS_DELETE = '0' and ENGLISH_NAME = #{settlementCurrency}
<if test="organizationId != null">
and ORGANIZATION_ID = #{organizationId}
</if>
limit 1
</select> </select>
<select id="getServiceItemsCodeNc" parameterType="java.lang.String" resultType="java.lang.String"> <select id="getServiceItemsCodeNc" parameterType="java.lang.String" resultType="java.lang.String">