diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/FinaceConfirmRevWriteAmtOp.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/FinaceConfirmRevWriteAmtOp.java index f88c313..5d64c07 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/FinaceConfirmRevWriteAmtOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/FinaceConfirmRevWriteAmtOp.java @@ -47,7 +47,7 @@ public class FinaceConfirmRevWriteAmtOp extends AbstractOperationServicePlugIn { protected void updateInApplyReversaAmt(DynamicObject[] dataEntities, boolean isAudit) { for (DynamicObject dataEntity : dataEntities) { String zcgj_bolttype = dataEntity.getString("zcgj_bolttype");//冲销类型 - if ("10".equals(zcgj_bolttype)) { + if ("10".equals(zcgj_bolttype) || "40".equals(zcgj_bolttype)) { //冲销合同履约记录 DynamicObjectCollection PerFormRecCollection = dataEntity.getDynamicObjectCollection("zcgj_performrec");//冲销履约记录分录 for (DynamicObject perFormRec : PerFormRecCollection) { @@ -64,7 +64,8 @@ public class FinaceConfirmRevWriteAmtOp extends AbstractOperationServicePlugIn { ec_in_perFormRecords.set("zcgj_taxperformflot", zcgj_taxperformflot);//含税履约金额(已冲销) SaveServiceHelper.save(new DynamicObject[]{ec_in_perFormRecords}); } - } else if ("20".equals(zcgj_bolttype)) { + } + if ("20".equals(zcgj_bolttype) || "40".equals(zcgj_bolttype)) { //冲销业主支出结算 DynamicObjectCollection expenseReversalCollection = dataEntity.getDynamicObjectCollection("zcgj_expensereversal");//冲销支出结算分录 for (DynamicObject expenseReversal : expenseReversalCollection) { diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillDateSubValidatorOp.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillDateSubValidatorOp.java index 15c00e8..2b4184c 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillDateSubValidatorOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillDateSubValidatorOp.java @@ -58,7 +58,7 @@ public class MaterialInBillDateSubValidatorOp extends AbstractOperationServicePl boolean zcgj_ispurchaseapplys = ecma_MaterialInBill.getBoolean("zcgj_ispurchaseapplys");//多采购申请 if (zcgj_ispurchaseapplys) { DynamicObjectCollection zcgj_purchaseapplyentryCollection = ecma_MaterialInBill.getDynamicObjectCollection("zcgj_purchaseapplyentry");//采购申请分录 - if (zcgj_purchaseapplyentryCollection.size() > 0) { + if (zcgj_purchaseapplyentryCollection.size() == 1) { for (DynamicObject zcgj_purchaseapplyentry : zcgj_purchaseapplyentryCollection) { DynamicObject zcgj_purchaseapply = zcgj_purchaseapplyentry.getDynamicObject("zcgj_purchaseapply_f7");//采购申请 if (zcgj_purchaseapply == null) {