From 9ee3230dbd5ff0a007bc386274a2d847ce0f05a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=9A=E8=B1=86=E8=B1=86?=
 <13356128+sunandmoon60@user.noreply.gitee.com>
Date: Tue, 19 Aug 2025 18:03:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BF=94=E5=88=A9=E8=A7=84=E5=88=99=E5=A2=9E?=
 =?UTF-8?q?=E8=A1=8C=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4=202.=E6=8A=B5?=
 =?UTF-8?q?=E6=89=A3=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/plugin/form/ap/ApHandSettleFormPlugin.java  |  4 +++-
 .../app/plugin/form/conm/RebateRulesBillPlugin.java | 13 +++++++++++++
 .../form/conm/purconmAddRebateRulesPlugin.java      |  3 ++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lc123/cloud/app/plugin/form/ap/ApHandSettleFormPlugin.java b/lc123/cloud/app/plugin/form/ap/ApHandSettleFormPlugin.java
index e9d23cf..6cd9504 100644
--- a/lc123/cloud/app/plugin/form/ap/ApHandSettleFormPlugin.java
+++ b/lc123/cloud/app/plugin/form/ap/ApHandSettleFormPlugin.java
@@ -38,7 +38,9 @@ public class ApHandSettleFormPlugin extends AbstractBillPlugIn implements Plugin
             bos_org = BusinessDataServiceHelper.loadSingle("bos_org", new QFilter[]{new QFilter("number", QCP.equals, number1)});
             this.getModel().setValue("org", bos_org);
             this.getModel().setValue("asstactvalue", supplier);
+            this.getModel().setValue("settlerelation", "apself");
+            this.getModel().setValue("pagedisplay", "entry");
+
         }
-        this.getModel().setValue("settlerelation", "apself");
     }
 }
\ No newline at end of file
diff --git a/lc123/cloud/app/plugin/form/conm/RebateRulesBillPlugin.java b/lc123/cloud/app/plugin/form/conm/RebateRulesBillPlugin.java
index 0e15f91..a84f16d 100644
--- a/lc123/cloud/app/plugin/form/conm/RebateRulesBillPlugin.java
+++ b/lc123/cloud/app/plugin/form/conm/RebateRulesBillPlugin.java
@@ -39,21 +39,34 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements Plugin
         // 获取自定义参数
         String billno = (String) formShowParameter.getCustomParam("purcontract_billno");
         JSONObject purcontract_supplier = formShowParameter.getCustomParam("purcontract_supplier");
+        JSONObject purcontract_tqq9_dxpp = formShowParameter.getCustomParam("purcontract_tqq9_dxpp");
         DynamicObject supplier = null;
+        DynamicObject tqq9_dxpp = null;
         if (purcontract_supplier != null) {
             String number = purcontract_supplier.get("number").toString();
             supplier = BusinessDataServiceHelper.loadSingle("bd_supplier", new QFilter[]{new QFilter("number", QCP.equals, number)});
         }
+        if (purcontract_tqq9_dxpp != null) {
+            String number = purcontract_tqq9_dxpp.get("number").toString();
+            tqq9_dxpp = BusinessDataServiceHelper.loadSingle("tqq9_brand", new QFilter[]{new QFilter("number", QCP.equals, number)});
+        }
 
         // 把参数值赋值到页面文本字段上
         DynamicObject purcontract = BusinessDataServiceHelper.loadSingle("conm_purcontract", new QFilter[]{new QFilter("billno", QCP.equals, billno)});
         DynamicObjectCollection tqq9_supplier = this.getModel().getDataEntity().getDynamicObjectCollection("tqq9_supplier");
+        DynamicObjectCollection tqq9_rebatebrand = this.getModel().getDataEntity().getDynamicObjectCollection("tqq9_rebatebrand");
         DynamicObject newsupplier = new DynamicObject(tqq9_supplier.getDynamicObjectType());
+        DynamicObject newbrand = new DynamicObject(tqq9_rebatebrand.getDynamicObjectType());
         if (supplier != null) {
             newsupplier.set("fbasedataId", supplier);
             tqq9_supplier.add(newsupplier);
             this.getModel().setValue("tqq9_supplier", tqq9_supplier);
         }
+        if (tqq9_dxpp != null) {
+            newbrand.set("fbasedataId", tqq9_dxpp);
+            tqq9_rebatebrand.add(newbrand);
+            this.getModel().setValue("tqq9_rebatebrand", tqq9_rebatebrand);
+        }
         this.getModel().setValue("tqq9_conm_purcontract", purcontract);
 
     }
diff --git a/lc123/cloud/app/plugin/form/conm/purconmAddRebateRulesPlugin.java b/lc123/cloud/app/plugin/form/conm/purconmAddRebateRulesPlugin.java
index c1d793d..3d2cb6a 100644
--- a/lc123/cloud/app/plugin/form/conm/purconmAddRebateRulesPlugin.java
+++ b/lc123/cloud/app/plugin/form/conm/purconmAddRebateRulesPlugin.java
@@ -60,7 +60,8 @@ public class purconmAddRebateRulesPlugin extends AbstractFormPlugin implements P
             BillShowParameter param = new BillShowParameter();
             param.setFormId("tqq9_pur_rebate");
             param.setCustomParam("purcontract_billno", this.getModel().getValue("billno"));
-            param.setCustomParam("purcontract_supplier", (DynamicObject) this.getModel().getValue("supplier"));
+            param.setCustomParam("purcontract_supplier",  this.getModel().getValue("supplier"));
+            param.setCustomParam("purcontract_tqq9_dxpp",  this.getModel().getValue("tqq9_dxpp"));
             param.setCloseCallBack(new CloseCallBack(this, "entry_rebateSync"));
             param.getOpenStyle().setShowType(ShowType.Modal);
             this.getView().showForm(param);