diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java index e857737..e894e28 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java @@ -48,19 +48,26 @@ public class DailyReimbursSubOp extends AbstractOperationServicePlugIn { for (DynamicObject accountEntry : accountEntryCollection) { String payerType = accountEntry.getString("payertype");//收款人类型 if (payerType.equals("er_payeer")) { - DynamicObject payer = accountEntry.getDynamicObject("payer");//收款人(个人 - if (payer != null && applier != null) { - String applierNumber = applier.getString("number");//申请人编号 - DynamicObject payer1 = payer.getDynamicObject("payer");//收款人(个人-收款人 - if (payer1 == null) { - return; - } - String payer1Number = payer1.getString("number");//收款人编号 - if (!applierNumber.equals(payer1Number) && "".equals(zcgj_invoiceremark)) { - //申请人和收款人不一致 + String payerName = accountEntry.getString("payername");//收款人名称 + if (!"".equals(payerName) && applier != null){ + String applierName = applier.getString("name");//申请人名称 + if (!applierName.equals(payerName) && "".equals(zcgj_invoiceremark)) { this.addFatalErrorMessage(extendedDataEntity, "收款人与申请人不一致!请填写特殊说明!"); } } +// DynamicObject payer = accountEntry.getDynamicObject("payer");//收款人(个人 +// this.addFatalErrorMessage(extendedDataEntity, "收款人与申请人不一致!请填写特殊说明!"); +// if (payer != null && applier != null) { +// String applierName = applier.getString("name");//申请人编号 +// DynamicObject payer1 = payer.getDynamicObject("payer");//收款人(个人-收款人 +// if (payer1 == null) { +// return; +// } +// String payer1Number = payer1.getString("number");//收款人编号 +// if (!applierName.equals(payer1Number) && "".equals(zcgj_invoiceremark)) { +// //申请人和收款人不一致 +// } +// } } } }