2 Säilykkeet cea7aedf8f ... f45e184465

Tekijä SHA1 Viesti Päivämäärä
  xuhao f45e184465 Merge remote-tracking branch 'origin/master' 5 kuukautta sitten
  xuhao d9fb1a33a3 业务处理单过滤 5 kuukautta sitten

+ 4 - 5
src/main/java/fi/em/formPlugin/BusinessProcessingConvertPlugIn.java

@@ -62,14 +62,13 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
             }
             }
             e.getCustQFilters().add(numberQFilter);
             e.getCustQFilters().add(numberQFilter);
         }else if("draw-ssysd".equals(type)){
         }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));
-            numberQFilter.and("ar_finarbill.billstatus", QCP.equals, "C");
+            String customersid = this.getOption().getVariableValue("customersid");
+            QFilter numberQFilter = new QFilter("nckd_customers.id", QCP.equals, customersid);
+            numberQFilter.and("nckd_customers.enable", QCP.equals, "1");
             for(int i=0;i<objects.size();i++){
             for(int i=0;i<objects.size();i++){
                 JSONObject jsonObject = objects.getJSONObject(i);
                 JSONObject jsonObject = objects.getJSONObject(i);
                 String id = jsonObject.getString("id");
                 String id = jsonObject.getString("id");
-                numberQFilter.and("ar_finarbill.id", QCP.not_equals2, Long.valueOf(id));
+                numberQFilter.and("nckd_customers.id", QCP.not_equals2, Long.valueOf(id));
             }
             }
             e.getCustQFilters().add(numberQFilter);
             e.getCustQFilters().add(numberQFilter);
         }else if("draw-clyf".equals(type)){
         }else if("draw-clyf".equals(type)){

+ 5 - 11
src/main/java/fi/em/formPlugin/BusinessProcessingUnAuditEditPlugin.java

@@ -104,15 +104,10 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                 draw.getOption().setVariableValue("type", "drawzlht");
                 draw.getOption().setVariableValue("type", "drawzlht");
             }else if (draw.getOperateKey().equals("draw-ssysd")) {
             }else if (draw.getOperateKey().equals("draw-ssysd")) {
                 //诉讼核销
                 //诉讼核销
-                Object values = this.getModel().getValue("nckd_payeenamev");//获取当前单据付款人
+                Object values = this.getModel().getValue("nckd_customers");//获取当前诉讼客户
                 DynamicObject dynamicObjects = (DynamicObject) values;
                 DynamicObject dynamicObjects = (DynamicObject) values;
-                Object value = this.getModel().getValue("nckd_orgfield");//获取当前单据付款人
-                DynamicObject dynamicObject = (DynamicObject) value;
-                if (dynamicObject == null) {
-                    throw new KDBizException("核算组织为空!");
-                }
                 if (dynamicObjects == null) {
                 if (dynamicObjects == null) {
-                    throw new KDBizException("收款信息收款人为空!");
+                    throw new KDBizException("单头诉讼客户为空!");
                 }
                 }
                 DynamicObjectCollection nckdEntryentity1 = this.getModel().getEntryEntity("nckd_entryentity11");
                 DynamicObjectCollection nckdEntryentity1 = this.getModel().getEntryEntity("nckd_entryentity11");
                 JSONArray jSONArray = new JSONArray();
                 JSONArray jSONArray = new JSONArray();
@@ -123,10 +118,9 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                     jsonObject.put("id",nckdTextfield7);
                     jsonObject.put("id",nckdTextfield7);
                     jSONArray.add(jsonObject);
                     jSONArray.add(jsonObject);
                 }
                 }
-                String bdsupplier = dynamicObjects.getString("id");//当前单据付款供应商
-                draw.getOption().setVariableValue("bdsupplier", bdsupplier);
-                String number = dynamicObject.getString("number");
-                draw.getOption().setVariableValue("orgnumber", number);
+                String customersid = dynamicObjects.getString("id");//当前单据付款供应商
+                draw.getOption().setVariableValue("orgnumber", customersid);
+                draw.getOption().setVariableValue("customersid", customersid);
                 draw.getOption().setVariableValue("JSONArray", jSONArray.toString());
                 draw.getOption().setVariableValue("JSONArray", jSONArray.toString());
                 draw.getOption().setVariableValue("type", "draw-ssysd");
                 draw.getOption().setVariableValue("type", "draw-ssysd");
             }else if (draw.getOperateKey().equals("draw-clyf")) {
             }else if (draw.getOperateKey().equals("draw-clyf")) {