2 Angajamente 092b6ad0bd ... 0a3a5a6c80

Autor SHA1 Permisiunea de a trimite mesaje. Dacă este dezactivată, utilizatorul nu va putea trimite nici un fel de mesaj Data
  xuhao 0a3a5a6c80 业务处理单过滤 5 luni în urmă
  xuhao 9a7315ed2b 业务处理单过滤 5 luni în urmă

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

@@ -30,11 +30,9 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
             }
             e.getCustQFilters().add(numberQFilter);
         }else if("drawysgz".equals(type)){
-            String bdsupplier = this.getOption().getVariableValue("bdsupplier");
             String billtype = this.getOption().getVariableValue("billtype");
             QFilter numberQFilter = new QFilter("ar_finarbill.org.number", QCP.equals, orgnumber);
             numberQFilter.and("ar_finarbill.billstatus", QCP.equals, "C");
-            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");

+ 0 - 1
src/main/java/fi/em/formPlugin/BusinessProcessingUnAuditEditPlugin.java

@@ -23,7 +23,6 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                 if ( orgv== null) {
                     throw new KDBizException("核算组织为空!");
                 }
-
                 String nckdItemclasstypefield1 = this.getModel().getValue("nckd_itemclasstypefield1").toString();//基础资料类型
                 draw.getOption().setVariableValue("billtype", nckdItemclasstypefield1);
                 DynamicObjectCollection nckdEntryentity1 = this.getModel().getEntryEntity("nckd_entryentity1");

+ 14 - 1
src/main/java/fi/em/formPlugin/BxdBankListtenerFromPlugin.java

@@ -296,7 +296,7 @@ public class BxdBankListtenerFromPlugin extends AbstractListPlugin implements Pl
             //刷新分录
             this.getView().updateView("expenseentryentity");
         }else if ("nckd_paymentmethod".equals(name)) {
-            ChangeData[] changeSet = e.getChangeSet();//获取值
+            ChangeData[] changeSet = e.getChangeSet();//获取值1
             for (ChangeData changeData : changeSet) {
                 int rowIndex = changeData.getRowIndex();
                 Object newValue = changeData.getNewValue();
@@ -305,6 +305,19 @@ public class BxdBankListtenerFromPlugin extends AbstractListPlugin implements Pl
                 DynamicObject nckd_paymentmethod = (DynamicObject) newValue;
                 this.getModel().setValue("paymode", nckd_paymentmethod,0);
             }
+        }else if ("nckd_reimburseamount".equals(name)) {
+            String nckd_reimburseamount = this.getModel().getValue("nckd_reimburseamount").toString();//报销金额
+            String nckd_onaccountamount = this.getModel().getValue("nckd_onaccountamount").toString();//挂账金额
+            String nckd_yufuamount = this.getModel().getValue("nckd_yufuamount").toString();//预付金额
+            BigDecimal reimburseamount = new BigDecimal(nckd_reimburseamount);
+            BigDecimal onaccountamount = new BigDecimal(nckd_onaccountamount);
+            BigDecimal yufuamount = new BigDecimal(nckd_yufuamount);
+            reimburseamount=reimburseamount.subtract(onaccountamount);
+            reimburseamount=reimburseamount.subtract(yufuamount);
+            this.getModel().setValue("nckd_fukuanamountfield", reimburseamount);
+            this.getModel().setValue("nckd_orireceiveamount", reimburseamount, 0);
+            //刷新分录
+            this.getView().updateView("expenseentryentity");
         }
     }
 }

+ 19 - 0
src/main/java/fi/em/formPlugin/YwclF7ListtenerFromPlugin.java

@@ -39,6 +39,8 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
     private final static String nckd_basedatafield21="nckd_basedatafield21";//资产变更明细
     private final static String nckd_orgfield8="nckd_orgfield8";//资产变更明细使用后部门
     private final static String nckd_basedatafield6="nckd_basedatafield6";//资产变更明细财务
+    private final static String paycompany="paycompany";//预付借款单 共享中心
+
 
 
 //业务处理单基础资料过滤插件
@@ -88,6 +90,8 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
         fieldEdit19.addBeforeF7SelectListener(this);
         BasedataEdit fieldEdit20 = this.getView().getControl(nckd_orgvs);
         fieldEdit20.addBeforeF7SelectListener(this);
+        BasedataEdit fieldEdit21 = this.getView().getControl(paycompany);
+        fieldEdit21.addBeforeF7SelectListener(this);
 
     }
 
@@ -155,6 +159,9 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
         if (StringUtils.equals(fieldKey, nckd_payeebanknumlbs)){
             this.getQFiltersfk(beforeF7SelectEvent,nckd_payeebanknumlbs);
         }
+        if (StringUtils.equals(fieldKey, paycompany)){
+            this.getQFiltergxzx(beforeF7SelectEvent,paycompany);
+        }
     }
 
     private void getQFilter(BeforeF7SelectEvent arg0, String type) {
@@ -294,6 +301,18 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
         ListShowParameter showParameter = (ListShowParameter)arg0.getFormShowParameter();
         showParameter.getListFilterParameter().setFilter(filter);
     }
+    private void getQFiltergxzx(BeforeF7SelectEvent arg0, String type) {
+        DynamicObject data = (DynamicObject)this.getModel().getValue("costcompany") ;
+        if(data ==null){
+            throw new KDBizException("核算组织为空!");
+        }
+        String number = data.getString("number");
+        QFilter filter;
+        //给基础资料添加过滤
+        filter = new QFilter("org.number", QCP.equals, number);
+        ListShowParameter showParameter = (ListShowParameter)arg0.getFormShowParameter();
+        showParameter.getListFilterParameter().setFilter(filter);
+    }
     private void getQFilterdczc(BeforeF7SelectEvent arg0, String type) {
         String nckdDetailtype = this.getModel().getValue("nckd_detailtype").toString();
         if("E".equals(nckdDetailtype)) {