diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java index 477769a..c167bb1 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java @@ -76,6 +76,28 @@ public class OutContractSettleFiConfirmWorkFlowPlugin implements IWorkflowPlugin outFinaceconfirm.set("zcgj_amount_all",amountAll); outFinaceconfirm.set("zcgj_taxamt_all",taxamtAll); + //冲销预付分录 + DynamicObjectCollection zcgj_prepayEntryCollection = outContractSettle.getDynamicObjectCollection("zcgj_prepayentry");//支出合同结算-冲销预付分录 + DynamicObjectCollection zcgj_prepayEntryCollection2 = outFinaceconfirm.getDynamicObjectCollection("zcgj_prepayentry");//支出财务确认单-冲销预付分录 + if (zcgj_prepayEntryCollection.size() > 0) { + outFinaceconfirm.set("zcgj_isprepay", "10");//冲销预付-是 + zcgj_prepayEntryCollection2.clear(); + for (DynamicObject prepayEntry : zcgj_prepayEntryCollection) { + DynamicObject NewPrepayEntry = zcgj_prepayEntryCollection2.addNew(); + NewPrepayEntry.set("zcgj_paynumber", prepayEntry.getString("zcgj_paynumber"));//付款申请单号 + NewPrepayEntry.set("zcgj_cx_expenseitem", prepayEntry.getDynamicObject("zcgj_cx_expenseitem"));//费用项目 + NewPrepayEntry.set("zcgj_paysupplier", prepayEntry.getDynamicObject("zcgj_paysupplier"));//供应商 + NewPrepayEntry.set("zcgj_paydate", prepayEntry.getDate("zcgj_paydate"));//申请日期 + NewPrepayEntry.set("zcgj_prepayamount", prepayEntry.getBigDecimal("zcgj_prepayamount"));//预付金额 + NewPrepayEntry.set("zcgj_boltamount", prepayEntry.getBigDecimal("zcgj_boltamount"));//冲销金额 + NewPrepayEntry.set("zcgj_paydecs", prepayEntry.getString("zcgj_paydecs"));//付款说明 + NewPrepayEntry.set("zcgj_sourceapplybillid", prepayEntry.getLong("zcgj_sourceapplybillid"));//来源单据id + NewPrepayEntry.set("zcgj_sourceapplyentryid", prepayEntry.getLong("zcgj_sourceapplyentryid"));//付款分录ID + } + } else { + outFinaceconfirm.set("zcgj_isprepay", "20");//冲销预付-否 + } + DynamicObjectCollection expenseItemEntryCollection = outFinaceconfirm.getDynamicObjectCollection("zcgj_expenseitementry");//支出财务确认单-费用项目分录 expenseItemEntryCollection.clear(); for (DynamicObject itemEntry : itementry) { diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java index 65c48af..1bbdd01 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java @@ -77,6 +77,28 @@ public class OutContractSettleInvalidWorkFlowPlugin implements IWorkflowPlugin { outFinaceconfirm.set("zcgj_amount_all",amountAll); outFinaceconfirm.set("zcgj_taxamt_all",taxamtAll); + //冲销预付分录 + DynamicObjectCollection zcgj_prepayEntryCollection = outContractSettle.getDynamicObjectCollection("zcgj_prepayentry");//支出合同结算-冲销预付分录 + DynamicObjectCollection zcgj_prepayEntryCollection2 = outFinaceconfirm.getDynamicObjectCollection("zcgj_prepayentry");//支出财务确认单-冲销预付分录 + if (zcgj_prepayEntryCollection.size() > 0) { + outFinaceconfirm.set("zcgj_isprepay", "10");//冲销预付-是 + zcgj_prepayEntryCollection2.clear(); + for (DynamicObject prepayEntry : zcgj_prepayEntryCollection) { + DynamicObject NewPrepayEntry = zcgj_prepayEntryCollection2.addNew(); + NewPrepayEntry.set("zcgj_paynumber", prepayEntry.getString("zcgj_paynumber"));//付款申请单号 + NewPrepayEntry.set("zcgj_cx_expenseitem", prepayEntry.getDynamicObject("zcgj_cx_expenseitem"));//费用项目 + NewPrepayEntry.set("zcgj_paysupplier", prepayEntry.getDynamicObject("zcgj_paysupplier"));//供应商 + NewPrepayEntry.set("zcgj_paydate", prepayEntry.getDate("zcgj_paydate"));//申请日期 + NewPrepayEntry.set("zcgj_prepayamount", prepayEntry.getBigDecimal("zcgj_prepayamount"));//预付金额 + NewPrepayEntry.set("zcgj_boltamount", prepayEntry.getBigDecimal("zcgj_boltamount"));//冲销金额 + NewPrepayEntry.set("zcgj_paydecs", prepayEntry.getString("zcgj_paydecs"));//付款说明 + NewPrepayEntry.set("zcgj_sourceapplybillid", prepayEntry.getLong("zcgj_sourceapplybillid"));//来源单据id + NewPrepayEntry.set("zcgj_sourceapplyentryid", prepayEntry.getLong("zcgj_sourceapplyentryid"));//付款分录ID + } + } else { + outFinaceconfirm.set("zcgj_isprepay", "20");//冲销预付-否 + } + DynamicObjectCollection expenseItemEntryCollection = outFinaceconfirm.getDynamicObjectCollection("zcgj_expenseitementry");//支出财务确认单-费用项目分录 expenseItemEntryCollection.clear(); for (DynamicObject itemEntry : itementry) { diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java index 9c8b8b2..73c815b 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java @@ -125,6 +125,28 @@ public class OutContractSettleReversalWorkFlowPlugin implements IWorkflowPlugin item.set("zcgj_remark",dynamicObject.getString("remark")); } + //冲销预付分录 + DynamicObjectCollection zcgj_prepayEntryCollection = outContractSettle.getDynamicObjectCollection("zcgj_prepayentry");//支出合同结算-冲销预付分录 + DynamicObjectCollection zcgj_prepayEntryCollection2 = outFinaceconfirm.getDynamicObjectCollection("zcgj_prepayentry");//支出财务确认单-冲销预付分录 + if (zcgj_prepayEntryCollection.size() > 0) { + outFinaceconfirm.set("zcgj_isprepay", "10");//冲销预付-是 + zcgj_prepayEntryCollection2.clear(); + for (DynamicObject prepayEntry : zcgj_prepayEntryCollection) { + DynamicObject NewPrepayEntry = zcgj_prepayEntryCollection2.addNew(); + NewPrepayEntry.set("zcgj_paynumber", prepayEntry.getString("zcgj_paynumber"));//付款申请单号 + NewPrepayEntry.set("zcgj_cx_expenseitem", prepayEntry.getDynamicObject("zcgj_cx_expenseitem"));//费用项目 + NewPrepayEntry.set("zcgj_paysupplier", prepayEntry.getDynamicObject("zcgj_paysupplier"));//供应商 + NewPrepayEntry.set("zcgj_paydate", prepayEntry.getDate("zcgj_paydate"));//申请日期 + NewPrepayEntry.set("zcgj_prepayamount", prepayEntry.getBigDecimal("zcgj_prepayamount"));//预付金额 + NewPrepayEntry.set("zcgj_boltamount", prepayEntry.getBigDecimal("zcgj_boltamount"));//冲销金额 + NewPrepayEntry.set("zcgj_paydecs", prepayEntry.getString("zcgj_paydecs"));//付款说明 + NewPrepayEntry.set("zcgj_sourceapplybillid", prepayEntry.getLong("zcgj_sourceapplybillid"));//来源单据id + NewPrepayEntry.set("zcgj_sourceapplyentryid", prepayEntry.getLong("zcgj_sourceapplyentryid"));//付款分录ID + } + } else { + outFinaceconfirm.set("zcgj_isprepay", "20");//冲销预付-否 + } + DynamicObjectCollection expenseItemEntryCollection = outFinaceconfirm.getDynamicObjectCollection("zcgj_expenseitementry");//支出财务确认单-费用项目分录 expenseItemEntryCollection.clear(); for (DynamicObject itemEntry : itementry) {