diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/PrepaybillNoContractCkOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/PrepaybillNoContractCkOp.java index bb1b6bf..f2dd0b6 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/PrepaybillNoContractCkOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/PrepaybillNoContractCkOp.java @@ -31,8 +31,8 @@ public class PrepaybillNoContractCkOp extends AbstractOperationServicePlugIn { e.getFieldKeys().add("zcgj_nocontract");//合同付款类型 无合同付款 NOCONTRACT , 合同付款 CONTRACT e.getFieldKeys().add("contractentry");//关联合同 e.getFieldKeys().add("zcgj_bizype");//业务类型 - e.getFieldKeys().add("zcgj_maintenanceackentry");//设备维修 - e.getFieldKeys().add("zcgj_materialinbillentry");//入库单 + e.getFieldKeys().add("zcgj_maintenance");//设备维修申请单 + e.getFieldKeys().add("zcgj_purchaseapply");//采购申请单 } @Override @@ -52,12 +52,7 @@ public class PrepaybillNoContractCkOp extends AbstractOperationServicePlugIn { class ValidatorExt extends AbstractValidator { @Override public void validate() { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM"); ExtendedDataEntity[] extendedDataEntities = this.getDataEntities(); - Map> allMap = new HashMap<>(); - //当前提交的探亲单据id集合 - Map> currentBillIdListMap = new HashMap<>(); - for (ExtendedDataEntity extendedDataEntity : extendedDataEntities) { DynamicObject dataEntity = extendedDataEntity.getDataEntity(); Object costcompanyObj = dataEntity.get("costcompany"); @@ -71,14 +66,14 @@ public class PrepaybillNoContractCkOp extends AbstractOperationServicePlugIn { String bisType = dataEntity.getString("zcgj_bizype"); //物资采购 WZCG if("WZCG".equals(bisType)){ - DynamicObjectCollection entry = dataEntity.getDynamicObjectCollection("zcgj_materialinbillentry"); //入库单 + DynamicObjectCollection entry = dataEntity.getDynamicObjectCollection("zcgj_purchaseapply"); //采购申请单 if((entry == null || entry.isEmpty())){ - this.addFatalErrorMessage(extendedDataEntity, String.format("业务类型为物资采购时,入库单分录不能为空!")); + this.addFatalErrorMessage(extendedDataEntity, String.format("业务类型为物资采购时,采购申请单分录不能为空!")); } }else if("SBWX".equals(bisType)){//设备维修 SBWX - DynamicObjectCollection entry = dataEntity.getDynamicObjectCollection("zcgj_maintenanceackentry"); //入库单 + DynamicObjectCollection entry = dataEntity.getDynamicObjectCollection("zcgj_maintenance"); //维修申请单 if((entry == null || entry.isEmpty())){ - this.addFatalErrorMessage(extendedDataEntity, String.format("业务类型为设备维修时,维修确认单分录不能为空!")); + this.addFatalErrorMessage(extendedDataEntity, String.format("业务类型为设备维修时,设备维修申请单分录不能为空!")); } } //其他工程款 QTGCK 不交易