From a996973e015b5589f86f82690cd618712276425b Mon Sep 17 00:00:00 2001 From: zzs Date: Wed, 18 Dec 2024 17:24:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=A1=E4=BF=9D=E5=9B=9E=E5=A1=AB?= =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=90=8C=E5=9B=9E=E6=AC=BE=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=9B=9E=E5=A1=AB=E9=A2=9D=E5=BA=A6=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamic/CreditBackFillEdit.java | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/yem/wm/es/storagetrans/dynamic/CreditBackFillEdit.java b/src/main/java/com/yem/wm/es/storagetrans/dynamic/CreditBackFillEdit.java index 1c6ce174..a963c785 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/dynamic/CreditBackFillEdit.java +++ b/src/main/java/com/yem/wm/es/storagetrans/dynamic/CreditBackFillEdit.java @@ -160,14 +160,15 @@ public class CreditBackFillEdit extends AbstractFormPlugin { parentModel.setValue("yem_creditremark", subMap.get("creditRemark"), i);//信保备注 parentModel.setValue("yem_creditquotation", subMap.get("yem_creditquotation"), i); - parentModel.setValue("yem_sinosurerate_cd", subMap.get("yem_sinosurerate_cd")); - parentModel.setValue("yem_term_cd", subMap.get("yem_term_cd")); + parentModel.setValue("yem_sinosurerate_cd", subMap.get("yem_sinosurerate_cd"), i); + parentModel.setValue("yem_term_cd", subMap.get("yem_term_cd"), i); // parentModel.setValue("yem_year_e", subMap.get("year")); dynamicObject.set("yem_year_e", subMap.get("year")); - parentModel.setValue("yem_creditstatus_e", subMap.get("creditstatus")); + parentModel.setValue("yem_creditstatus_e", subMap.get("creditstatus"), i); - parentModel.setValue("yem_insuranceamt_cd", subMap.get("yem_premium"));//保险费 + parentModel.setValue("yem_insuranceamt_cd", subMap.get("yem_premium"), i);//保险费 + parentModel.setValue("yem_contractpayamt", subMap.get("yem_contractpayamt"), i);//合同回款金额 } } subEntryBackFill(); @@ -181,6 +182,17 @@ public class CreditBackFillEdit extends AbstractFormPlugin { } } + /** + * + * ②信保回填弹窗界面：业务手动维护当前收款币别对应的合同回款币别金额，点击确认时，【合同回款金额】必填； + *
+ * ③信保回填弹窗界面，确认时：判断当前合同下的【合同回款金额】汇总值  是否超出收款单认领到该合同尾款的【收款认领金额】汇总值，如果超出，不允许通过，并提示：合同号：***，合同回款总金额：***元，尾款（账期）认领总金额：***元，已超额，请认领完成后在操作信保回款。否则可以通过 + *
+ * + * @link 文档 + * + * @return Boolean + */ private boolean beforeOkOperationValidator() { IDataModel model = this.getModel(); IFormView view = this.getView(); @@ -336,6 +348,8 @@ public class CreditBackFillEdit extends AbstractFormPlugin { map.put("yem_premium", model.getValue("yem_premium", i));//保险费 + map.put("yem_contractpayamt", model.getValue("yem_contractpayamt", i));//合同回款金额 + Long pkValue = dynamicObject.getLong("yem_parententryid"); collectionMap.put(pkValue, map); } @@ -407,6 +421,7 @@ public class CreditBackFillEdit extends AbstractFormPlugin { dynamicObject.set("yem_creditstatus_e", map.get("creditstatus")); dynamicObject.set("yem_premium", map.get("yem_premium")); + dynamicObject.set("yem_contractpayamt", map.get("yem_contractpayamt")); } } SaveServiceHelper.save(new DynamicObject[]{csrCreditLine}); @@ -465,6 +480,7 @@ public class CreditBackFillEdit extends AbstractFormPlugin { addNew.set("yem_crenote", crecollection.getString("yem_crenote"));//收款备注 addNew.set("yem_crecollecurrency", crecollection.getDynamicObject("yem_crecollecurrency"));//收款币别 addNew.set("yem_crecollecamt", crecollection.getBigDecimal("yem_crecollecamt"));//收款金额 + addNew.set("yem_contractpayamt_e", crecollection.getBigDecimal("yem_contractpayamt_e")); } } } else { @@ -517,6 +533,7 @@ public class CreditBackFillEdit extends AbstractFormPlugin { parentAddNer.set("yem_crenote", crecollection.getString("yem_crenote"));//收款备注 parentAddNer.set("yem_crecollecurrency", crecollection.getDynamicObject("yem_crecollecurrency"));//收款币别 parentAddNer.set("yem_crecollecamt", crecollection.getBigDecimal("yem_crecollecamt"));//收款金额 + parentAddNer.set("yem_contractpayamt_e", crecollection.getBoolean("yem_contractpayamt_e"));//合同回款金额 } } BigDecimal creactualamt = BigDecimal.ZERO;// 实际收汇金额