xuhao преди 5 месеца
родител
ревизия
e70060b321

+ 2 - 2
src/main/java/fi/em/formPlugin/BusinessProcessingConvertPlugIn.java

@@ -42,11 +42,11 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
             }
             e.getCustQFilters().add(numberQFilter);
         }else if("drawzlht".equals(type)){
-            String bdsupplier = this.getOption().getVariableValue("bdsupplier");
+            //String bdsupplier = this.getOption().getVariableValue("bdsupplier");
             String billtype = this.getOption().getVariableValue("billtype");
             QFilter numberQFilter = new QFilter("fa_lease_contract.org.number", QCP.equals, orgnumber);
 //            numberQFilter.and("fa_lease_contract.asstacttype", QCP.equals, billtype);
-            numberQFilter.and("fa_lease_contract.leaser.number", QCP.equals, bdsupplier);
+            //numberQFilter.and("fa_lease_contract.leaser.number", QCP.equals, bdsupplier);
             for(int i=0;i<objects.size();i++){
                 JSONObject jsonObject = objects.getJSONObject(i);
                 String id = jsonObject.getString("id");

+ 6 - 6
src/main/java/fi/em/opplugin/ExpenseAccountFileOpPlugin.java

@@ -6,6 +6,8 @@ import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.entity.EntityMetadataCache;
 import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
 import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
+import kd.bos.entity.validate.ErrorLevel;
+import kd.bos.entity.validate.ValidationErrorInfo;
 import kd.bos.exception.KDBizException;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
@@ -28,12 +30,10 @@ public class ExpenseAccountFileOpPlugin extends AbstractOperationServicePlugIn {
             JSONObject object = new JSONObject();
             //当前单头数据包
             DynamicObject info = BusinessDataServiceHelper.loadSingle(dynamicObjects[i].getPkValue(), dynamicObjects[i].getDynamicObjectType().getName());
-            DynamicObjectCollection writeoffapply = info.getDynamicObjectCollection("writeoffapply");
-            if(writeoffapply.size()<=0){
-                List<Map<String, Object>> attachments = AttachmentServiceHelper.getAttachments("er_publicreimbursebill", info.getLong("id"), "nckd_attachmentpanelsq", true);
-                if(attachments.size()<=0){
-                    throw new KDBizException("请上传费用申请附件!");
-                }
+            BigDecimal reimburseamount = info.getBigDecimal("reimburseamount");
+            if(reimburseamount.compareTo(new BigDecimal(50000)) > -1){
+                this.operationResult.addErrorInfo(new ValidationErrorInfo("",info.getPkValue(),
+                        0,0,"err","billtitle",info.getString("billno")+"请关联出差申请单或上传线下审批单!", ErrorLevel.Error));
             }
         }
     }