2 Säilykkeet 70968d6340 ... 025c64334d

Tekijä SHA1 Viesti Päivämäärä
  xuhao 025c64334d Merge remote-tracking branch 'origin/master' 5 kuukautta sitten
  xuhao 892cab4122 差旅过滤 5 kuukautta sitten

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

@@ -58,8 +58,8 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
             }
             e.getCustQFilters().add(numberQFilter);
         }else if("draw-ssysd".equals(type)){
-            String customersid = this.getOption().getVariableValue("customersid");
-            QFilter numberQFilter = new QFilter("ar_finarbill.asstact.id", QCP.equals, customersid);
+            String orgid = this.getOption().getVariableValue("customersid");
+            QFilter numberQFilter = new QFilter("ar_finarbill.org.id", QCP.equals, orgid);
             numberQFilter.and("ar_finarbill.billstatus", QCP.equals, "C");
             for(int i=0;i<objects.size();i++){
                 JSONObject jsonObject = objects.getJSONObject(i);

+ 23 - 0
src/main/java/fi/em/formPlugin/BusinessProcessingEditPlugin.java

@@ -12,6 +12,7 @@ import kd.bos.form.FormShowParameter;
 import kd.bos.form.ShowType;
 import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.events.ClosedCallBackEvent;
+import kd.bos.list.ListShowParameter;
 import kd.bos.list.plugin.AbstractListPlugin;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
@@ -22,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 
 public class BusinessProcessingEditPlugin extends AbstractListPlugin implements Plugin {
     public static String btn_cysgzmx = "cysgzmx"; //冲应收挂账
@@ -407,6 +409,27 @@ public class BusinessProcessingEditPlugin extends AbstractListPlugin implements
                     }
                 }
             }
+        }else if ("nckd_orgfield".equals(name)) {
+            ChangeData[] changeSet = e.getChangeSet();//获取值
+            for (ChangeData changeData : changeSet) {
+                int rowIndex = changeData.getRowIndex();
+                Object newValue = changeData.getNewValue();
+                Object oldValue = changeData.getOldValue();
+                DynamicObject payeenamevs = (DynamicObject) newValue;
+                QFilter filter;
+                //给基础资料添加过滤
+                filter = new QFilter("fromorg.number", QCP.equals, payeenamevs.getString("number"));
+                filter.and("typerelation.number", QCP.equals,"accounting2capital");
+                Map<Object, DynamicObject> objectDynamicObjectMap = BusinessDataServiceHelper.loadFromCache("bos_org_orgrelation", new QFilter[]{filter});
+                if(objectDynamicObjectMap.size()==1){
+                    for(Object idkey:objectDynamicObjectMap.keySet()){
+                        DynamicObject dynamicObject = objectDynamicObjectMap.get(idkey);
+                        DynamicObject toorg = dynamicObject.getDynamicObject("toorg");
+                        this.getModel().setValue("nckd_orgfield", toorg);
+                        this.getView().updateView("nckd_orgfield");
+                    }
+                }
+            }
         }
     }
     }

+ 3 - 3
src/main/java/fi/em/formPlugin/BusinessProcessingUnAuditEditPlugin.java

@@ -89,10 +89,10 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                 draw.getOption().setVariableValue("type", "drawzlht");
             }else if (draw.getOperateKey().equals("draw-ssysd")) {
                 //诉讼核销
-                Object values = this.getModel().getValue("nckd_customers");//获取当前诉讼客户
+                Object values = this.getModel().getValue("nckd_orgfield");//获取当前核算组织
                 DynamicObject dynamicObjects = (DynamicObject) values;
                 if (dynamicObjects == null) {
-                    throw new KDBizException("单头诉讼客户为空!");
+                    throw new KDBizException("核算组织为空!");
                 }
                 DynamicObjectCollection nckdEntryentity1 = this.getModel().getEntryEntity("nckd_entryentity11");
                 JSONArray jSONArray = new JSONArray();
@@ -108,7 +108,7 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                 draw.getOption().setVariableValue("customersid", customersid);
                 draw.getOption().setVariableValue("JSONArray", jSONArray.toString());
                 draw.getOption().setVariableValue("type", "draw-ssysd");
-            }else if (draw.getOperateKey().equals("draw-clyf")) {
+            }else if (draw.getOperateKey().equals("draw-ssysd")) {
                 //诉讼核销
                 Object values = this.getModel().getValue("applier");//获取当前单据报销人
                 DynamicObject dynamicObjects = (DynamicObject) values;