Browse Source

1、修改SRM对公报销单接口的冲借款关联关系逻辑bug

wanghaiwu 1 day ago
parent
commit
dc77116fff

+ 10 - 2
code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/webapi/SRMSynPayApiPlugin.java

@@ -611,6 +611,14 @@ public class SRMSynPayApiPlugin implements Serializable {
 
 
             DynamicObjectCollection prepayEntrys = prepayBillInfo.getDynamicObjectCollection("expenseentryentity");
             DynamicObjectCollection prepayEntrys = prepayBillInfo.getDynamicObjectCollection("expenseentryentity");
             DynamicObject prepayEntry = prepayEntrys.get(0);
             DynamicObject prepayEntry = prepayEntrys.get(0);
+
+            for(DynamicObject preEntry : prepayEntrys){
+                if(preEntry.getString("seq").equals(srmseq)){
+                    prepayEntry = preEntry;
+                    break;
+                }
+            }
+
             DynamicObjectCollection prepayAccounts = prepayBillInfo.getDynamicObjectCollection("accountentry");
             DynamicObjectCollection prepayAccounts = prepayBillInfo.getDynamicObjectCollection("accountentry");
             DynamicObject prepayAccount = prepayAccounts.get(0);
             DynamicObject prepayAccount = prepayAccounts.get(0);
 
 
@@ -629,8 +637,8 @@ public class SRMSynPayApiPlugin implements Serializable {
             entry.set("loandescriptionv1", prepayBillInfo.getString("description"));//事由
             entry.set("loandescriptionv1", prepayBillInfo.getString("description"));//事由
             entry.set("loancurrency", currency);//币种
             entry.set("loancurrency", currency);//币种
             entry.set("loanexchangerate", exchangeRate);//汇率
             entry.set("loanexchangerate", exchangeRate);//汇率
-            entry.set("loanamount", prepayAccount.getBigDecimal("oriaccbalamount"));//借款余额
-            entry.set("currloanamount", prepayAccount.getBigDecimal("accbalamount"));//借款余额(本位币)
+            entry.set("loanamount", prepayEntry.getBigDecimal("orgiexpebalanceamount"));//借款余额
+            entry.set("currloanamount", prepayEntry.getBigDecimal("expebalanceamount"));//借款余额(本位币)
             entry.set("accloanamount", checkAmountOri);//冲销金额
             entry.set("accloanamount", checkAmountOri);//冲销金额
             entry.set("curraccloanamount", checkAmountOri.multiply(exchangeRate));//冲销金额(本位币)
             entry.set("curraccloanamount", checkAmountOri.multiply(exchangeRate));//冲销金额(本位币)
             entry.set("sourcebillid", prepayBillInfo.getString("id"));//源单id
             entry.set("sourcebillid", prepayBillInfo.getString("id"));//源单id