xuhao 6 månader sedan
förälder
incheckning
75ca5a9ea0

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

@@ -62,7 +62,9 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
             }
             e.getCustQFilters().add(numberQFilter);
         }else if("draw-ssysd".equals(type)){
+            String bdsupplier = this.getOption().getVariableValue("bdsupplier");
             QFilter numberQFilter = new QFilter("ar_finarbill.org.number", QCP.equals, orgnumber);
+            numberQFilter.and("ar_finarbill.asstact.id", QCP.equals, Long.valueOf(bdsupplier));
             for(int i=0;i<objects.size();i++){
                 JSONObject jsonObject = objects.getJSONObject(i);
                 String id = jsonObject.getString("id");

+ 9 - 2
src/main/java/fi/em/formPlugin/BusinessProcessingUnAuditEditPlugin.java

@@ -23,10 +23,10 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                 DynamicObject dynamicObject = (DynamicObject) value;
                 Object nckd_orgv = this.getModel().getValue("nckd_orgfield");//获取当前单据付款人
                 DynamicObject orgv = (DynamicObject) nckd_orgv;
-                if (dynamicObject == null) {
+                if ( orgv== null) {
                     throw new KDBizException("核算组织为空!");
                 }
-                if (orgv == null) {
+                if (dynamicObject == null) {
                     throw new KDBizException("收款信息收款人为空!");
                 }
                 String nckdItemclasstypefield1 = this.getModel().getValue("nckd_itemclasstypefield1").toString();//基础资料类型
@@ -104,11 +104,16 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                 draw.getOption().setVariableValue("type", "drawzlht");
             }else if (draw.getOperateKey().equals("draw-ssysd")) {
                 //诉讼核销
+                Object values = this.getModel().getValue("nckd_payeenamev");//获取当前单据付款人
+                DynamicObject dynamicObjects = (DynamicObject) values;
                 Object value = this.getModel().getValue("nckd_orgfield");//获取当前单据付款人
                 DynamicObject dynamicObject = (DynamicObject) value;
                 if (dynamicObject == null) {
                     throw new KDBizException("核算组织为空!");
                 }
+                if (dynamicObjects == null) {
+                    throw new KDBizException("收款信息收款人为空!");
+                }
                 DynamicObjectCollection nckdEntryentity1 = this.getModel().getEntryEntity("nckd_entryentity11");
                 JSONArray jSONArray = new JSONArray();
                 for(int i=0;i<nckdEntryentity1.size();i++){
@@ -118,6 +123,8 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                     jsonObject.put("id",nckdTextfield7);
                     jSONArray.add(jsonObject);
                 }
+                String bdsupplier = dynamicObjects.getString("id");//当前单据付款供应商 11
+                draw.getOption().setVariableValue("bdsupplier", bdsupplier);
                 String number = dynamicObject.getString("number");
                 draw.getOption().setVariableValue("orgnumber", number);
                 draw.getOption().setVariableValue("JSONArray", jSONArray.toString());