diff --git a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java index 0d91e2dc..38985e94 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java +++ b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java @@ -695,14 +695,23 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele if (usacreditamt.compareTo(balance) > 0) { // ConfirmCallBackListener confirmCallBackListener = new ConfirmCallBackListener("creditInsuranceConfirms", this); // this.getView().showConfirm(message, MessageBoxOptions.YesNo, confirmCallBackListener); - sb.append(String.format("当前客户:[ %s ] 本次订舱投保总额为 [ %s ] ,剩余限额为 [ %s ] ,已超额,不允许进行信保确认!\n\r" , + sb.append(String.format("当前客户:[ %s ] 本次订舱投保总额为 [ %s ] ,剩余限额为 [ %s ] ,已超额,不允许进行信保确认!\n\r", customer.getString("name"), usacreditamt.setScale(2, RoundingMode.HALF_UP), balance.setScale(2, RoundingMode.HALF_UP))); } BigDecimal attcount = dataEntity.getBigDecimal("yem_attcount"); - if (attcount.compareTo(BigDecimal.ZERO) == 0) { - sb.append(String.format("未上传客户汇款水单附件,不能进行信保确认!\n\r")); + BigDecimal yemPreradioCd = BigDecimal.ZERO; + DynamicObjectCollection yemCreditdetail = dataEntity.getDynamicObjectCollection("yem_creditdetail"); + if (!yemCreditdetail.isEmpty()) { + for (DynamicObject dynamicObject : yemCreditdetail) { + yemPreradioCd = yemPreradioCd.add(dynamicObject.getBigDecimal("yem_preradio_cd")); + } + } + if (yemPreradioCd.compareTo(BigDecimal.ZERO) > 0) { + if (attcount.compareTo(BigDecimal.ZERO) == 0) { + sb.append(String.format("未上传客户汇款水单附件,不能进行信保确认!\n\r")); + } } if (csrCreditLine != null && customer != null) { } else {