|
@@ -569,7 +569,7 @@ public class SRMSynPayApiPlugin implements Serializable {
|
|
|
entry.set("srcbilltype", "er_prepaybill");
|
|
|
entry.set("seq", srmseq);
|
|
|
|
|
|
-
|
|
|
+
|
|
|
String targetEntityNumber = "er_publicreimbursebill";
|
|
|
String targetEntryKey = "writeoffmoney";
|
|
|
String srcEntityNumber = "er_prepaybill";
|
|
@@ -581,24 +581,21 @@ public class SRMSynPayApiPlugin implements Serializable {
|
|
|
|
|
|
DynamicObjectCollection linkRows = entry.getDynamicObjectCollection("writeoffmoney_lk");
|
|
|
if (!linkRows.isEmpty()) {
|
|
|
-
|
|
|
- continue;
|
|
|
+ String lkEntryKey ="writeoffmoney_lk";
|
|
|
+ Long srcTableId = srcTableDefine.getTableId();
|
|
|
+
|
|
|
+
|
|
|
+ DynamicObject linkRow = new DynamicObject(linkRows.getDynamicObjectType());
|
|
|
+ linkRows.add(linkRow);
|
|
|
+
|
|
|
+
|
|
|
+ linkRow.set("id", ID.genLongId());
|
|
|
+ linkRow.set("seq", 1);
|
|
|
+ linkRow.set(lkEntryKey + "_stableid", srcTableId);
|
|
|
+ linkRow.set(lkEntryKey + "_sbillid", prepayBillInfo.getString("id"));
|
|
|
+ linkRow.set(lkEntryKey + "_sid", prepayEntry.getString("id"));
|
|
|
}
|
|
|
|
|
|
- String lkEntryKey ="writeoffmoney_lk";
|
|
|
- Long srcTableId = srcTableDefine.getTableId();
|
|
|
-
|
|
|
-
|
|
|
- DynamicObject linkRow = new DynamicObject(linkRows.getDynamicObjectType());
|
|
|
- linkRows.add(linkRow);
|
|
|
-
|
|
|
-
|
|
|
- linkRow.set("id", ID.genLongId());
|
|
|
- linkRow.set("seq", 1);
|
|
|
- linkRow.set(lkEntryKey + "_stableid", srcTableId);
|
|
|
- linkRow.set(lkEntryKey + "_sbillid", prepayBillInfo.getString("id"));
|
|
|
- linkRow.set(lkEntryKey + "_sid", prepayEntry.getString("id"));
|
|
|
-
|
|
|
writeoffmoney.add(entry);
|
|
|
|
|
|
totalLoanCheckAmount = totalLoanCheckAmount.add(checkAmountOri);
|
|
@@ -847,6 +844,10 @@ public class SRMSynPayApiPlugin implements Serializable {
|
|
|
entry.set("contractparta", contractInfo.getDynamicObject("parta"));
|
|
|
entry.set("contractpartbtype", "bd_supplier");
|
|
|
entry.set("contractpartb", contractparty);
|
|
|
+ entry.set("contractpartatypenew", "bos_org");
|
|
|
+ entry.set("contractpartanew", costCompany);
|
|
|
+ entry.set("nckd_contractamt", contractAmount);
|
|
|
+ entry.set("nckd_oriapplyamt", oriapplyAmount);
|
|
|
|
|
|
DynamicObjectCollection payplanEntrys = contractInfo.getDynamicObjectCollection("expenseentryentity");
|
|
|
if(payplanEntrys.size() > 0){
|
|
@@ -859,18 +860,54 @@ public class SRMSynPayApiPlugin implements Serializable {
|
|
|
entry.set("contractexpcurrency", planEntry.getDynamicObject("entrycurrency"));
|
|
|
entry.set("contractexpchangerate", planEntry.getBigDecimal("exchangerate"));
|
|
|
entry.set("contractexpquotetype", "0");
|
|
|
+ entry.set("entryprepayedamount", planEntry.getBigDecimal("pushedamount"));
|
|
|
+ entry.set("entrycurrprepayedamount", planEntry.getBigDecimal("pushedcurramount"));
|
|
|
+ entry.set("contractreimamount", planEntry.getBigDecimal("oriexppayedamount"));
|
|
|
+ entry.set("contractcurrreimamhttount", planEntry.getBigDecimal("exppayedamount"));
|
|
|
+ entry.set("contractcanamount", planEntry.getBigDecimal("orgiexpebalanceamount"));
|
|
|
+ entry.set("contractcurrcanamount", planEntry.getBigDecimal("expebalanceamount"));
|
|
|
+
|
|
|
+
|
|
|
+ entry.set("oricontractnotpayamount", planEntry.getBigDecimal("oriexpnotpayamount"));
|
|
|
entry.set("contractnotpayamount", planEntry.getBigDecimal("expnotpayamount"));
|
|
|
- entry.set("contractcanloanamount", planEntry.getBigDecimal("canloanamount"));
|
|
|
- entry.set("concurrcanloanamount", planEntry.getBigDecimal("canloancurramount"));
|
|
|
+
|
|
|
+ entry.set("contractsid", contractInfo.getLong("id"));
|
|
|
+ entry.set("contractsrcentryid", planEntry.getLong("id"));
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ String targetEntityNumber = "er_publicreimbursebill";
|
|
|
+ String targetEntryKey = "contractentry";
|
|
|
+ String srcEntityNumber = "er_contractbill";
|
|
|
+ String srcEntryKey = "expenseentryentity";
|
|
|
+
|
|
|
+ TableDefine targetTableDefine = EntityMetadataCache.loadTableDefine(targetEntityNumber, targetEntryKey);
|
|
|
+
|
|
|
+ TableDefine srcTableDefine = EntityMetadataCache.loadTableDefine(srcEntityNumber, srcEntryKey);
|
|
|
+
|
|
|
+ DynamicObjectCollection linkRows = entry.getDynamicObjectCollection("contractentry_lk");
|
|
|
+ if (linkRows.isEmpty()) {
|
|
|
+ String lkEntryKey ="contractentry_lk";
|
|
|
+ Long srcTableId = srcTableDefine.getTableId();
|
|
|
+
|
|
|
+
|
|
|
+ DynamicObject linkRow = new DynamicObject(linkRows.getDynamicObjectType());
|
|
|
+ linkRows.add(linkRow);
|
|
|
+
|
|
|
+
|
|
|
+ linkRow.set("id", ID.genLongId());
|
|
|
+ linkRow.set("seq", 1);
|
|
|
+ linkRow.set(lkEntryKey + "_stableid", srcTableId);
|
|
|
+ linkRow.set(lkEntryKey + "_sbillid", contractInfo.getString("id"));
|
|
|
+ linkRow.set(lkEntryKey + "_sid", planEntry.getString("id"));
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
- entry.set("contractpartatypenew", "bos_org");
|
|
|
- entry.set("contractpartanew", costCompany);
|
|
|
- entry.set("nckd_contractamt", contractAmount);
|
|
|
- entry.set("nckd_oriapplyamt", oriapplyAmount);
|
|
|
|
|
|
contractEntry.add(entry);
|
|
|
|
|
|
+
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -1246,6 +1283,10 @@ public class SRMSynPayApiPlugin implements Serializable {
|
|
|
entry.set("contractparta", contractInfo.getDynamicObject("parta"));
|
|
|
entry.set("contractpartbtype", "bd_supplier");
|
|
|
entry.set("contractpartb", contractparty);
|
|
|
+ entry.set("contractpartatypenew", "bos_org");
|
|
|
+ entry.set("contractpartanew", costCompany);
|
|
|
+ entry.set("nckd_contractamt", contractAmount);
|
|
|
+ entry.set("nckd_oriapplyamt", oriapplyAmount);
|
|
|
|
|
|
DynamicObjectCollection payplanEntrys = contractInfo.getDynamicObjectCollection("expenseentryentity");
|
|
|
if(payplanEntrys.size() > 0){
|
|
@@ -1258,15 +1299,51 @@ public class SRMSynPayApiPlugin implements Serializable {
|
|
|
entry.set("contractexpcurrency", planEntry.getDynamicObject("entrycurrency"));
|
|
|
entry.set("contractexpchangerate", planEntry.getBigDecimal("exchangerate"));
|
|
|
entry.set("contractexpquotetype", "0");
|
|
|
- entry.set("contractnotpayamount", planEntry.getBigDecimal("expnotpayamount"));
|
|
|
- entry.set("contractcanloanamount", planEntry.getBigDecimal("canloanamount"));
|
|
|
+
|
|
|
+ entry.set("entryprepayedamount", planEntry.getBigDecimal("pushedamount"));
|
|
|
+ entry.set("entrycurrprepayedamount", planEntry.getBigDecimal("pushedcurramount"));
|
|
|
+ entry.set("contractreimamount", planEntry.getBigDecimal("oriexppayedamount"));
|
|
|
+ entry.set("contractcurrreimamhttount", planEntry.getBigDecimal("exppayedamount"));
|
|
|
+ entry.set("contractcanloanamount", planEntry.getBigDecimal("oriexppayedamount"));
|
|
|
entry.set("concurrcanloanamount", planEntry.getBigDecimal("canloancurramount"));
|
|
|
+ entry.set("contractcanamount", planEntry.getBigDecimal("orgiexpebalanceamount"));
|
|
|
+ entry.set("contractcurrcanamount", planEntry.getBigDecimal("expebalanceamount"));
|
|
|
+
|
|
|
+
|
|
|
+ entry.set("contractnotpayamount", planEntry.getBigDecimal("oriexpnotpayamount"));
|
|
|
+
|
|
|
+ entry.set("contractsid", contractInfo.getLong("id"));
|
|
|
+ entry.set("contractsrcentryid", planEntry.getLong("id"));
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ String targetEntityNumber = "er_prepaybill";
|
|
|
+ String targetEntryKey = "contractentry";
|
|
|
+ String srcEntityNumber = "er_contractbill";
|
|
|
+ String srcEntryKey = "expenseentryentity";
|
|
|
+
|
|
|
+ TableDefine targetTableDefine = EntityMetadataCache.loadTableDefine(targetEntityNumber, targetEntryKey);
|
|
|
+
|
|
|
+ TableDefine srcTableDefine = EntityMetadataCache.loadTableDefine(srcEntityNumber, srcEntryKey);
|
|
|
+
|
|
|
+ DynamicObjectCollection linkRows = entry.getDynamicObjectCollection("contractentry_lk");
|
|
|
+ if (linkRows.isEmpty()) {
|
|
|
+ String lkEntryKey ="contractentry_lk";
|
|
|
+ Long srcTableId = srcTableDefine.getTableId();
|
|
|
+
|
|
|
+
|
|
|
+ DynamicObject linkRow = new DynamicObject(linkRows.getDynamicObjectType());
|
|
|
+ linkRows.add(linkRow);
|
|
|
+
|
|
|
+
|
|
|
+ linkRow.set("id", ID.genLongId());
|
|
|
+ linkRow.set("seq", 1);
|
|
|
+ linkRow.set(lkEntryKey + "_stableid", srcTableId);
|
|
|
+ linkRow.set(lkEntryKey + "_sbillid", contractInfo.getString("id"));
|
|
|
+ linkRow.set(lkEntryKey + "_sid", planEntry.getString("id"));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- entry.set("contractpartatypenew", "bos_org");
|
|
|
- entry.set("contractpartanew", costCompany);
|
|
|
- entry.set("nckd_contractamt", contractAmount);
|
|
|
- entry.set("nckd_oriapplyamt", oriapplyAmount);
|
|
|
|
|
|
contractEntry.add(entry);
|
|
|
|