zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

选择发票金额过滤

This commit is contained in:
zhangzhiguo 2025-12-04 14:34:11 +08:00
parent bca795b9be
commit 44bec6eaf2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmeInvoicePlugin.java
View File

@ -84,14 +84,14 @@ public class InContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn im
filter.and(new QFilter("billstatus", "=", "C"));
filter.and(new QFilter("currency", "=", currencyId));
filter.and(new QFilter("invoicestatus", "!=", "2"));
filter.and(new QFilter("unapplyamount", ">", BigDecimal.ZERO));
filter.and(new QFilter("unapplyamount", "!=", BigDecimal.ZERO));
QFilter filter1 = new QFilter("isclaimed", "=", true);
filter1.and(new QFilter("billstatus", "=", "C"));
DynamicObject contract = (DynamicObject)this.getModel().getValue("zcgj_contract");
if (contract != null) {
long contractId = contract.getLong("id");
filter1.and(new QFilter("contract", "=", contractId));
filter1.and(new QFilter("unapplyamount", ">", BigDecimal.ZERO));
filter1.and(new QFilter("unapplyamount", "!=", BigDecimal.ZERO));
DynamicObjectCollection contInvEntryCol = this.getModel().getEntryEntity("zcgj_entryentity");
if (!contInvEntryCol.isEmpty()) {
List<Long> selectedInvIds = new ArrayList<Long>(8);
@ -232,9 +232,9 @@ public class InContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn im
this.getView().showTipNotification(String.format(ResManager.loadKDString("发票号码%s，已存在分录行", "PaymentApplyEditUI_22", "ec-contract-formplugin", new Object[0]), invoice.getString("invoiceno")));
} else {
BigDecimal unApplyAmount = invoice.getBigDecimal("unapplyamount");
if (unApplyAmount != null && unApplyAmount.doubleValue() <= (double)0.0F) {
/*if (unApplyAmount != null && unApplyAmount.doubleValue() <= (double)0.0F) {
this.getView().showTipNotification(String.format(ResManager.loadKDString("发票号码%s，金额已经被关联完毕，不可重复使用", "PaymentApplyEditUI_23", "ec-contract-formplugin", new Object[0]), invoice.getString("invoiceno")));
} else {
} else {*/
DynamicObject upContract = (DynamicObject)this.getModel().getValue("zcgj_contract");
int rowIndex = this.getModel().createNewEntryRow("zcgj_entryentity");
this.getModel().setValue("zcgj_invoice", invoice.getPkValue(), rowIndex);
@ -250,7 +250,7 @@ public class InContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn im
invoice.set("project", (DynamicObject)this.getModel().getValue("zcgj_project"));
invoice.set("connecttype", "contract");
invArr.add(invoice);
}
// }
}
}

10
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeInvoicePlugin.java
View File

@ -100,7 +100,7 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
filter.and(new QFilter("billstatus", "=", "C"));
filter.and(new QFilter("currency", "=", currencyId));
filter.and(new QFilter("invoicestatus", "!=", "2"));
filter.and(new QFilter("unapplyamount", ">", BigDecimal.ZERO));
filter.and(new QFilter("unapplyamount", "!=", BigDecimal.ZERO));
filter.and(new QFilter("zcgj_isbind", "=", false)); //发票被 rim_expense_relation 关系绑定
QFilter filter1 = new QFilter("isclaimed", "=", true);
filter1.and(new QFilter("billstatus", "=", "C"));
@ -108,7 +108,7 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
if (contract != null) {
long contractId = contract.getLong("id");
filter1.and(new QFilter("contract", "=", contractId));
filter1.and(new QFilter("unapplyamount", ">", BigDecimal.ZERO));
filter1.and(new QFilter("unapplyamount", "!=", BigDecimal.ZERO));
DynamicObjectCollection contInvEntryCol = this.getModel().getEntryEntity("zcgj_entryentity");
if (contInvEntryCol.size() > 0) {
List<Long> selectedInvIds = new ArrayList(8);
@ -251,9 +251,9 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
this.getView().showTipNotification(String.format(ResManager.loadKDString("发票号码%s，已存在分录行", "PaymentApplyEditUI_22", "ec-contract-formplugin", new Object[0]), invoice.getString("invoiceno")));
} else {
BigDecimal unApplyAmount = invoice.getBigDecimal("unapplyamount");
if (unApplyAmount != null && unApplyAmount.doubleValue() <= (double)0.0F) {
/*if (unApplyAmount != null && unApplyAmount.doubleValue() <= (double)0.0F) {
this.getView().showTipNotification(String.format(ResManager.loadKDString("发票号码%s，金额已经被关联完毕，不可重复使用", "PaymentApplyEditUI_23", "ec-contract-formplugin", new Object[0]), invoice.getString("invoiceno")));
} else {
} else {*/
DynamicObject upContract = (DynamicObject)this.getModel().getValue("zcgj_contract");
int rowIndex = this.getModel().createNewEntryRow("zcgj_entryentity");
this.getModel().setValue("zcgj_invoice", invoice.getPkValue(), rowIndex);
@ -270,7 +270,7 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i
invoice.set("connecttype", "contract");
invoice.set("zcgj_isbind", true);
invArr.add(invoice);
}
// }
}
}