diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractValidatorSubOp.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractValidatorSubOp.java index af165d7..0467e29 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractValidatorSubOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractValidatorSubOp.java @@ -23,6 +23,9 @@ public class OutContractValidatorSubOp extends AbstractOperationServicePlugIn { super.onPreparePropertys(e); e.getFieldKeys().add("iseqsettle");//按设备费用结算单结算 e.getFieldKeys().add("eqsettleentry");//设备费用结算分录 + e.getFieldKeys().add("contract");//合同类型 + e.getFieldKeys().add("itementry");//支付项分录 + e.getFieldKeys().add("zcgj_processallocatentity");//工序分摊 } @Override @@ -57,9 +60,13 @@ public class OutContractValidatorSubOp extends AbstractOperationServicePlugIn { "qtzchtzy".equals(contractTypeNumber); } - DynamicObjectCollection processAllocEntityCollection = dataEntity.getDynamicObjectCollection("zcgj_processallocatentity");//设备费用结算分录 - boolean processAllocEmpty = processAllocEntityCollection.size() == 0; - + DynamicObjectCollection itemEntryCollection = dataEntity.getDynamicObjectCollection("itementry");//支付项分录 + boolean processAllocEmpty = false; + if (itemEntryCollection.size() > 0) { + DynamicObject itemEntry = itemEntryCollection.get(0); + DynamicObjectCollection processAllocEntityCollection = itemEntry.getDynamicObjectCollection("zcgj_processallocatentity");//工序分摊 + processAllocEmpty = processAllocEntityCollection.size() == 0; + } if (priceTypeMatch && contractTypeMatch && processAllocEmpty) { this.addFatalErrorMessage(extendedDataEntity, "工序分摊必填!!"); }