From f5577e70921794d43151ec3861b91027571235bd Mon Sep 17 00:00:00 2001 From: weiyunlong Date: Wed, 21 May 2025 17:46:11 +0800 Subject: [PATCH] =?UTF-8?q?-=20[x]=20=E5=A4=84=E7=90=86=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E5=8D=95=E6=8A=A5=E9=94=99=20-=20[x]=20=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E5=8D=95(=E5=90=8C=E5=90=8D=E8=BD=AC=E8=B4=A6&&=E8=B7=A8?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=B0=83=E6=8B=A8)=E6=90=BA=E5=B8=A6?= =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E7=A7=91=E7=9B=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96,=E8=BF=9B=E5=85=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96(=E5=BA=94?= =?UTF-8?q?=E4=BB=98=20&&=20=20=E8=A2=AB=E5=8A=A8=E4=BB=98=E6=AC=BE)=20s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jhzj7/fi/fi/plugin/form/RecBillFromPlugin.java | 13 ++++++++----- .../fi/fi/plugin/operate/PayBillSaveOperation.java | 12 +++++++++++- main/java/shjh/jhzj7/fi/fi/utils/EsbUtils.java | 2 +- .../fi/fi/webapi/ApplyAdjustBillControler.java | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/form/RecBillFromPlugin.java b/main/java/shjh/jhzj7/fi/fi/plugin/form/RecBillFromPlugin.java index f1f1f6f..8579478 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/form/RecBillFromPlugin.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/form/RecBillFromPlugin.java @@ -40,14 +40,17 @@ public class RecBillFromPlugin extends AbstractFormPlugin implements Plugin { //携带付款人编码 String payerformid = ""+this.getView().getModel().getValue("payerformid");//付款人类型标识ID Long payer = Long.valueOf(""+this.getView().getModel().getValue("payer"));//付款人ID - if (!"other".equals(payerformid)) { - DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(payer, payerformid); - if (null != dynamicObject) { - Label label1 = this.getView().getControl("shjh_positionbr4"); - label1.setText(dynamicObject.getString("number")); + if (payer != 0 && payerformid!= null &&!payerformid.isEmpty()) { + if (!"other".equals(payerformid)) { + DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(payer, payerformid); + if (null != dynamicObject) { + Label label1 = this.getView().getControl("shjh_positionbr4"); + label1.setText(dynamicObject.getString("number")); + } } } + //携带生单规则分录的业务大类,业务小类,成本中心,利润中心到收款处理单头__逻辑迁移到单据保存操作插件 // carryCustomer(); //根据分录清账状态去默认表头的清账状态 diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java index 4af7849..879a664 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java @@ -41,11 +41,16 @@ public class PayBillSaveOperation extends AbstractOperationServicePlugIn impleme DynamicObject shjhMembersubject = bill.getDynamicObject("shjh_membersubject"); if (null != paymentidentify && null == shjhMembersubject) { String paymentidentifyNumber = paymentidentify.getString("number"); - if ("FKBS02".equals(paymentidentifyNumber)) { + //被动 || 来源系统不为应付 + String sourcetype = bill.getString("sourcetype"); + + if ("FKBS02".equals(paymentidentifyNumber) || !"AP".equals(sourcetype)) { //根据配置表携带资金计划科目 bill.set("shjh_membersubject", xdMembersubject(bill)); } + //来源系统资金调度 + } } SaveServiceHelper.update(dataEntities); @@ -240,6 +245,11 @@ public class PayBillSaveOperation extends AbstractOperationServicePlugIn impleme QFilter q2 = new QFilter("shjh_bhcgz.fbasedataid", QCP.equals, null); qFilter = qFilter.and(q2); } + }else { + QFilter q2 = new QFilter("shjh_yym.fbasedataid", QCP.equals, null); + QFilter q3 = new QFilter("shjh_kjkm.fbasedataid", QCP.equals, null); + QFilter q4 = new QFilter("shjh_bhcgz.fbasedataid", QCP.equals, null); + qFilter = qFilter.and(q2).and(q3).and(q4); } DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_pay_account", "id,shjh_membersubject", qFilter.toArray()); diff --git a/main/java/shjh/jhzj7/fi/fi/utils/EsbUtils.java b/main/java/shjh/jhzj7/fi/fi/utils/EsbUtils.java index 77928d5..f673f68 100644 --- a/main/java/shjh/jhzj7/fi/fi/utils/EsbUtils.java +++ b/main/java/shjh/jhzj7/fi/fi/utils/EsbUtils.java @@ -54,7 +54,7 @@ public class EsbUtils { public static Map getOrgNumberIds(){ Map orgids = new HashMap<>(); DynamicObject[] orginfos = BusinessDataServiceHelper.load(orgName,"id,number", - new QFilter[]{new QFilter("fisaccounting","=",1)}); + new QFilter[]{new QFilter("fisaccounting","=","1")}); for (DynamicObject orginfo : orginfos) { orgids.put(orginfo.getString("number"),orginfo.getLong("id")); } diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java index df8e950..26000d6 100644 --- a/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java +++ b/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java @@ -782,7 +782,7 @@ public class ApplyAdjustBillControler { /** * 设置付款类型 外部系统单据类型 * @param ap_payapply 付款申请单的动态对象 - * @param accountingsubject 会计科目 + * @param uuid 单据号 */ public static void setPaymentType(DynamicObject ap_payapply, String uuid) { // String paymentTypeName = "1221020200".equals(accountingsubject) ? "对私付款" : "对公付款";