From 45aaec8cfbe2399de3c586b5e3c72600ca42aa65 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 16 Apr 2025 13:48:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SalesContractEntity.java | 64 +++++++++++++++++++ .../entity/SalesContractEntity.xml | 21 ++++-- .../SalesContractPluginInitializer.java | 8 +++ 3 files changed, 87 insertions(+), 6 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java index 8ad14d90..66a1955b 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java @@ -31,6 +31,70 @@ public class SalesContractEntity extends BaseEntity { private String def26;//当前账簿兑人民币汇率 private String pushStatus;//推送标识 private String billdate;//申请日期 + private String custbillno;//CPO订单编码 + private String placementdate;//CPO下达日期 + private String country;//国家地区编码 + private String vnote;//备注 + private String def9;//合同类型 + private String def2;//合同性质 + private String def41;//单据归属区域 + + + public String getCustbillno() { + return custbillno; + } + + public void setCustbillno(String custbillno) { + this.custbillno = custbillno; + } + + public String getPlacementdate() { + return placementdate; + } + + public void setPlacementdate(String placementdate) { + this.placementdate = placementdate; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getVnote() { + return vnote; + } + + public void setVnote(String vnote) { + this.vnote = vnote; + } + + public String getDef9() { + return def9; + } + + public void setDef9(String def9) { + this.def9 = def9; + } + + public String getDef2() { + return def2; + } + + public void setDef2(String def2) { + this.def2 = def2; + } + + public String getDef41() { + return def41; + } + + public void setDef41(String def41) { + this.def41 = def41; + } public String getBilldate() { return billdate; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml index c7a7a818..a9456cbd 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml @@ -24,12 +24,12 @@ 'OA' as creator, -- 创建人用户 to_char(field0007,'yyyy-MM-dd HH24:mi:ss') as creationtime, -- 创建时间 to_char(field0007,'yyyy-MM-dd') as billdate, -- 申请日期 - '' as contractor, -- 订单负责人名称 + field0144 as contractor, -- 订单负责人名称 '' as cdeptid, -- 事业部 '-1' as approvestatus, -- 审批状态默认 - '' as belongtodeptid, -- 单据归属部门 + field0152 as belongtodeptid, -- 单据归属部门 '' as dpk_custclass, -- 合同对应客户大类 - '' as dcustomerid, -- 合同对应客户大类 + field0133 as dcustomerid, -- 合同对应客户大类 '' as zcustomerid, '' as cinvoicecustid, -- 开票客户名称 field0145 as cemployeeid, -- 业务人员 @@ -37,13 +37,20 @@ field0012 as totalamount, -- 原币总金额 '' as rmbtotalamount, -- 人民币总金额 '' as presentrate, -- 汇率 - '' as def13, -- IPO合同号 + field0148 as def13, -- IPO合同号 '' as def16, -- IPO汇率 myfs.SORTNUMBER as def8, -- 贸易方式 '' as def27, -- IPO币种 skzq.SORTNUMBER as def17, -- 收款账期 '' as def18, -- 账簿本币金额 - '' as def26 -- 当前账簿兑人民币汇率 + '' as def26, -- 当前账簿兑人民币汇率 + field0147 as custbillno, -- CPO订单编码 + '' as placementdate, -- CPO下达日期 + field0151 as country, -- 国家地区编码 + '' as vnote, --备注 + field0140 as def9, -- 合同类型 + htxz.SORTNUMBER as def2, -- 合同性质 + djgsqy.SORTNUMBER as def41 -- 单据归属区域 @@ -55,9 +62,11 @@ LEFT JOIN COL_SUMMARY summary ON summary.FORM_RECORDID = formmain_8694.id left join CTP_ENUM_ITEM myfs on myfs.id=field0141 left join CTP_ENUM_ITEM skzq on skzq.id=field0138 + left join CTP_ENUM_ITEM htxz on htxz.id=field0149 + left join CTP_ENUM_ITEM djgsqy on djgsqy.id=field0135 where field0146 is null and to_char(field0007,'yyyy-MM-dd HH24:mi:ss')>'2025-01-01' -- and summary.state in ('1','3') - and field0132 is not null and field0001='SW15-004-2025003491' + and field0132 is not null and field0001='SW15-004-2025003509' and id = #{id} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java index a93893fd..11f5b414 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java @@ -173,6 +173,14 @@ public class SalesContractPluginInitializer extends PluginBaseEntity { bill.put("def17",contractEntity.getDef17());//收款账期 bill.put("def18",contractEntity.getDef18());//账簿本币金额 bill.put("def26",contractEntity.getDef26());//当前账簿兑人民币汇率 + + bill.put("custbillno",contractEntity.getCustbillno());//CPO订单编码 + bill.put("placementdate",contractEntity.getPlacementdate());//CPO下达日期 + bill.put("country",contractEntity.getCountry());//国家地区编码 + bill.put("vnote",contractEntity.getVnote());//备注 + bill.put("def9",contractEntity.getDef9());//合同类型 + bill.put("def2",contractEntity.getDef2());//合同性质 + bill.put("def41",contractEntity.getDef41());//单据归属区域 JSONObject htdd01Master=new JSONObject(); htdd01Master.put("htdd01Master",bill); return htdd01Master;