From 6e124797cffb5de054a5f534434a8fcabfb8c97a Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Tue, 19 Jul 2022 12:06:46 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=87=91=E8=9D=B6?= =?UTF-8?q?=E5=BA=94=E4=BB=98=E5=8D=95=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-fin/anrui-fin-api/pom.xml | 5 + .../anrui/fin/api/kingdee/KingDeeBillId.java | 20 ++ .../{JsonsRootBean.java => Data.java} | 39 ++- .../entrybill/paymentslip/Fbilltypeid.java | 2 +- .../entrybill/paymentslip/Fchargeid.java | 2 +- .../entrybill/paymentslip/Fcurrencyid.java | 2 +- .../entrybill/paymentslip/Fexchangetype.java | 2 +- .../paymentslip/Fmainbookstdcurrid.java | 2 +- .../entrybill/paymentslip/Fmaterialid.java | 2 +- .../entrybill/paymentslip/Forderid.java | 4 +- .../entrybill/paymentslip/Fpayconditon.java | 2 +- .../entrybill/paymentslip/Fpayorgid.java | 2 +- .../entrybill/paymentslip/Fpriceunitid.java | 2 +- .../paymentslip/Fpurchasedeptid.java | 2 +- .../entrybill/paymentslip/Fsettleorgid.java | 2 +- .../entrybill/paymentslip/Fstockunitid.java | 2 +- .../entrybill/paymentslip/Fsubheadfinc.java | 19 +- .../entrybill/paymentslip/Fsupplierid.java | 2 +- .../entrybill/paymentslip/Ftransferid.java | 2 +- .../kingdee/entrybill/paymentslip/Model.java | 88 ++++++- .../biz/kingdee/FinKingDeeFeignService.java | 6 +- .../EntryBillCastToKingDeeBillFields.java | 225 +++++++++++++++++- 22 files changed, 406 insertions(+), 28 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java rename anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/{JsonsRootBean.java => Data.java} (69%) diff --git a/anrui-fin/anrui-fin-api/pom.xml b/anrui-fin/anrui-fin-api/pom.xml index 853da9b53d..15079da1bb 100644 --- a/anrui-fin/anrui-fin-api/pom.xml +++ b/anrui-fin/anrui-fin-api/pom.xml @@ -33,6 +33,11 @@ org.hibernate.validator hibernate-validator + + com.fasterxml.jackson.core + jackson-annotations + 2.10.1 + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java new file mode 100644 index 0000000000..9fb804f954 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.fin.api.kingdee; + +public enum KingDeeBillId { + AP_PAYABLE("AP_Payable","应付单"),; + private String ID; + private String NAME; + + KingDeeBillId(String ID, String NAME) { + this.ID = ID; + this.NAME = NAME; + } + + public String getID() { + return ID; + } + + public String getNAME() { + return NAME; + } +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/JsonsRootBean.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Data.java similarity index 69% rename from anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/JsonsRootBean.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Data.java index 476cebddfd..b72c2d5bfb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/JsonsRootBean.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Data.java @@ -4,34 +4,67 @@ import java.util.List; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * Json格式数据（详情参考Json格式数据）（必录） * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ -public class JsonsRootBean { - +public class Data { + /** + * Creator：创建者内码（非必录） + */ @JSONField(alternateNames ="Creator") private String creator; + /** + * NeedUpDateFields：需要更新的字段，数组类型，格式：[key1,key2,...]（非必录），注（更新单据体字段得加上单据体key） + */ @JSONField(alternateNames ="NeedUpDateFields") private List needupdatefields; + /** + * NeedReturnFields：需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录），注（返回单据体字段格式：entitykey.key） + */ @JSONField(alternateNames ="NeedReturnFields") private List needreturnfields; + /** + * IsDeleteEntry：是否删除已存在的分录，布尔类型，默认true（非必录） + */ @JSONField(alternateNames ="IsDeleteEntry") private String isdeleteentry; + /** + * SubSystemId：表单所在的子系统内码，字符串类型（非必录） + */ @JSONField(alternateNames ="SubSystemId") private String subsystemid; + /** + * IsVerifyBaseDataField：是否验证所有的基础资料有效性，布尔类，默认false（非必录） + */ @JSONField(alternateNames ="IsVerifyBaseDataField") private String isverifybasedatafield; + /** + * IsEntryBatchFill：是否批量填充分录，默认true（非必录） + */ @JSONField(alternateNames ="IsEntryBatchFill") private String isentrybatchfill; + /** + * ValidateFlag：是否验证标志，布尔类型，默认true（非必录） + */ @JSONField(alternateNames ="ValidateFlag") private String validateflag; + /** + * 是否用编码搜索基础资料，布尔类型，默认true（非必录） + */ @JSONField(alternateNames ="NumberSearch") private String numbersearch; + /** + * InterationFlags：交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录），例如（允许负库存标识：STK_InvCheckResult） + */ @JSONField(alternateNames ="InterationFlags") private String interationflags; + /** + * Model：表单数据包，Json类型（必录） + */ @JSONField(alternateNames ="Model") private Model model; + public void setCreator(String creator) { this.creator = creator; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fbilltypeid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fbilltypeid.java index 45cee5492c..17f3f93bb0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fbilltypeid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fbilltypeid.java @@ -13,7 +13,7 @@ public class Fbilltypeid { public void setFnumber(String fnumber) { this.fnumber = fnumber; } - public String getFnumber() { + public String getFnumber() { return fnumber; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fchargeid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fchargeid.java index c794de94d9..2aa350de75 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fchargeid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fchargeid.java @@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 收款方:FChargeId * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fcurrencyid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fcurrencyid.java index 42e4cc213e..e849504e34 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fcurrencyid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fcurrencyid.java @@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + *币别:FCURRENCYID (必填项) * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fexchangetype.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fexchangetype.java index 422985b8a3..c3ad359ff5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fexchangetype.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fexchangetype.java @@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 汇率类型:FEXCHANGETYPE * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmainbookstdcurrid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmainbookstdcurrid.java index f692681719..9cba73868b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmainbookstdcurrid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmainbookstdcurrid.java @@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 本位币:FMAINBOOKSTDCURRID * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmaterialid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmaterialid.java index 7a1945e4a1..3bdd1771c5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmaterialid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fmaterialid.java @@ -4,7 +4,7 @@ import java.util.Date; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 物料编码:FMATERIALID * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Forderid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Forderid.java index 074cf78854..bf27a56263 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Forderid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Forderid.java @@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 订货方:FORDERID * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ @@ -13,7 +13,7 @@ public class Forderid { public void setFnumber(String fnumber) { this.fnumber = fnumber; } - public String getFnumber() { + public String getFnumber() { return fnumber; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayconditon.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayconditon.java index d5ef43fdb7..eb51b0935e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayconditon.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayconditon.java @@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 付款条件:FPayConditon * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayorgid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayorgid.java index d3dbc9d859..266248c28a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayorgid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpayorgid.java @@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 付款组织:FPAYORGID (必填项) * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpriceunitid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpriceunitid.java index 155c5d7d28..1f88fc0c60 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpriceunitid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpriceunitid.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 计价单位:FPRICEUNITID * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpurchasedeptid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpurchasedeptid.java index a3545f816c..4008c5f518 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpurchasedeptid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fpurchasedeptid.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 采购部门:FPURCHASEDEPTID (必填项) * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsettleorgid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsettleorgid.java index 2178621ca2..9edfeb6130 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsettleorgid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsettleorgid.java @@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 结算组织:FSETTLEORGID (必填项) * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fstockunitid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fstockunitid.java index db64e03741..ae8e67246c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fstockunitid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fstockunitid.java @@ -2,7 +2,7 @@ package com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip; import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 库存单位:FStockUnitId * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsubheadfinc.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsubheadfinc.java index 752299956c..b85679b41c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsubheadfinc.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsubheadfinc.java @@ -7,17 +7,34 @@ import com.alibaba.fastjson.annotation.JSONField; * @website http://www.jsons.cn/json2java/ */ public class Fsubheadfinc { - + /** + * 到期日计算日期:FACCNTTIMEJUDGETIME + */ @JSONField(alternateNames ="FACCNTTIMEJUDGETIME") private String faccnttimejudgetime; + /** + * 本位币:FMAINBOOKSTDCURRID + */ @JSONField(alternateNames ="FMAINBOOKSTDCURRID") private Fmainbookstdcurrid fmainbookstdcurrid; + /** + * 汇率类型:FEXCHANGETYPE + */ @JSONField(alternateNames ="FEXCHANGETYPE") private Fexchangetype fexchangetype; + /** + * 汇率:FExchangeRate + */ @JSONField(alternateNames ="FExchangeRate") private int fexchangerate; + /** + * 税额:FTaxAmountFor + */ @JSONField(alternateNames ="FTaxAmountFor") private double ftaxamountfor; + /** + * 不含税金额:FNoTaxAmountFor + */ @JSONField(alternateNames ="FNoTaxAmountFor") private double fnotaxamountfor; public void setFaccnttimejudgetime(String faccnttimejudgetime) { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsupplierid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsupplierid.java index 9fd3cec3ad..b441ed556d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsupplierid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Fsupplierid.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 供应商:FSUPPLIERID (必填项) * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Ftransferid.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Ftransferid.java index 94b6409242..18522ac857 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Ftransferid.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Ftransferid.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 供货方:FTRANSFERID * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Model.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Model.java index 5bff70e885..4438d3f7de 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Model.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/entrybill/paymentslip/Model.java @@ -6,72 +6,156 @@ import com.yxt.anrui.fin.api.kingdee.entrybill.*; /** * Auto-generated: 2022-07-19 8:42:28 - * + * 单据类型:FBillTypeID (必填项) * @author www.jsons.cn * @website http://www.jsons.cn/json2java/ */ public class Model { - @JSONField(alternateNames ="FID") private int fid; + /** + * 单据类型:FBillTypeID (必填项) + */ @JSONField(alternateNames ="FBillTypeID") private Fbilltypeid fbilltypeid; + /** + * 单据编号:FBillNo + */ @JSONField(alternateNames ="FBillNo") private String fbillno; + /** + * 是否期初单据:FISINIT + */ @JSONField(alternateNames ="FISINIT") private boolean fisinit; + /** + * 业务日期:FDATE (必填项) + */ @JSONField(alternateNames ="FDATE") private String fdate; + /** + * 到期日:FENDDATE_H + */ @JSONField(alternateNames ="FENDDATE_H") private String fenddateH; + /** + * 单据状态:FDOCUMENTSTATUS (必填项) + */ @JSONField(alternateNames ="FDOCUMENTSTATUS") private String fdocumentstatus; + /** + * 供应商:FSUPPLIERID (必填项) + */ @JSONField(alternateNames ="FSUPPLIERID") private Fsupplierid fsupplierid; + /** + * 币别:FCURRENCYID (必填项) + */ @JSONField(alternateNames ="FCURRENCYID") private Fcurrencyid fcurrencyid; + /** + * 付款条件:FPayConditon + */ @JSONField(alternateNames ="FPayConditon") private Fpayconditon fpayconditon; + /** + * 价外税:FISPRICEEXCLUDETAX + */ @JSONField(alternateNames ="FISPRICEEXCLUDETAX") private boolean fispriceexcludetax; + /** + * 业务类型:FBUSINESSTYPE (必填项) + */ @JSONField(alternateNames ="FBUSINESSTYPE") private String fbusinesstype; + /** + * 按含税单价录入:FISTAX + */ @JSONField(alternateNames ="FISTAX") private boolean fistax; + /** + * 结算组织:FSETTLEORGID (必填项) + */ @JSONField(alternateNames ="FSETTLEORGID") private Fsettleorgid fsettleorgid; + /** + * 付款组织:FPAYORGID (必填项) + */ @JSONField(alternateNames ="FPAYORGID") private Fpayorgid fpayorgid; + /** + * 立账类型:FSetAccountType + */ @JSONField(alternateNames ="FSetAccountType") private String fsetaccounttype; + /** + *税额计入成本:FISTAXINCOST + */ @JSONField(alternateNames ="FISTAXINCOST") private boolean fistaxincost; + /** + * 备注:FAP_Remark + */ @JSONField(alternateNames ="FAP_Remark") private String fapRemark; + /** + * 参与暂估应付核销:FISHookMatch + */ @JSONField(alternateNames ="FISHookMatch") private boolean fishookmatch; + /** + *采购部门:FPURCHASEDEPTID (必填项) + */ @JSONField(alternateNames ="FPURCHASEDEPTID") private Fpurchasedeptid fpurchasedeptid; + /** + * 作废状态:FCancelStatus (必填项) + */ @JSONField(alternateNames ="FCancelStatus") private String fcancelstatus; + /** + *是发票审核自动生成:FISBYIV + */ @JSONField(alternateNames ="FISBYIV") private boolean fisbyiv; + /** + * 是否需要成本调整:FISGENHSADJ + */ @JSONField(alternateNames ="FISGENHSADJ") private boolean fisgenhsadj; + /** + * 先到票后入库:FISINVOICEARLIER + */ @JSONField(alternateNames ="FISINVOICEARLIER") private boolean fisinvoicearlier; + /** + * 发票号码:F_PAEZ_Text + */ @JSONField(alternateNames ="F_PAEZ_Text") private String fPaezText; + /** + * 项目类别:F_PMZC_Assistant1 + */ @JSONField(alternateNames ="F_PMZC_Assistant1") private FPmzcAssistant1 fPmzcAssistant1; + /** + * + */ @JSONField(alternateNames ="FsubHeadSuppiler") private Fsubheadsuppiler fsubheadsuppiler; + /** + * + */ @JSONField(alternateNames ="FsubHeadFinc") private Fsubheadfinc fsubheadfinc; @JSONField(alternateNames ="FEntityDetail") private List fentitydetail; + /** + * + */ @JSONField(alternateNames ="FEntityPlan") private List fentityplan; + public void setFid(int fid) { this.fid = fid; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java index 260540a3a4..d30ca09974 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java @@ -1,8 +1,9 @@ package com.yxt.anrui.fin.biz.kingdee; import com.alibaba.fastjson.JSONObject; -import com.yxt.anrui.fin.api.kingdee.Data; +import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.entrybill.EntryBillDto; +import com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip.Data; import com.yxt.anrui.fin.biz.kingdee.entrybill.EntryBillCastToKingDeeBillFields; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; @@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class FinKingDeeFeignService { + /** * 保存入账申请接口生成的应付单的数据，推送到金蝶的平台中 * @param entryBillDto @@ -22,7 +24,7 @@ public class FinKingDeeFeignService { Data data=new Data(); EntryBillCastToKingDeeBillFields.cast(entryBillDto,data); try { - return saveBill("",data); + return saveBill(KingDeeBillId.AP_PAYABLE.getID(),data); } catch (Exception e) { e.printStackTrace(); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/EntryBillCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/EntryBillCastToKingDeeBillFields.java index 00511a17c2..9875a306b0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/EntryBillCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/EntryBillCastToKingDeeBillFields.java @@ -1,8 +1,10 @@ package com.yxt.anrui.fin.biz.kingdee.entrybill; -import com.yxt.anrui.fin.api.kingdee.Data; import com.yxt.anrui.fin.api.kingdee.entrybill.EntryBillDto; -import org.springframework.stereotype.Service; +import com.yxt.anrui.fin.api.kingdee.entrybill.paymentslip.*; + +import java.util.ArrayList; +import java.util.List; /** * 封装转换的类 @@ -18,11 +20,226 @@ public class EntryBillCastToKingDeeBillFields { /** * InterationFlags：交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录），例如（允许负库存标识：STK_InvCheckResult） */ - target.setInterationFlags(" "); + target.setInterationflags(" "); /** * IsDeleteEntry：是否删除已存在的分录，布尔类型，默认true（非必录） */ - target.setIsDeleteEntry("True "); + target.setIsdeleteentry("True "); + /** + * IsEntryBatchFill：是否批量填充分录，默认true（非必录） + */ + target.setIsentrybatchfill("True "); + /** + * IsVerifyBaseDataField：是否验证所有的基础资料有效性，布尔类，默认false（非必录） + */ + target.setIsverifybasedatafield("false "); + /** + * 构造model + */ + createModel(source,target); + /** + * 需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录），注（返回单据体字段格式：entitykey.key） + */ + List needreturnfields =new ArrayList<>(); + target.setNeedreturnfields(needreturnfields); + /** + * NeedUpDateFields：需要更新的字段，数组类型，格式：[key1,key2,...]（非必录），注（更新单据体字段得加上单据体key） + */ + List needupdatefields=new ArrayList<>(); + target.setNeedupdatefields(needupdatefields); + /** + * 是否用编码搜索基础资料，布尔类型，默认true（非必录） + */ + target.setNumbersearch("True "); + /** + * SubSystemId：表单所在的子系统内码，字符串类型（非必录） + */ + target.setSubsystemid(" "); + /** + * ValidateFlag：是否验证标志，布尔类型，默认true（非必录） + */ + target.setValidateflag("True "); + } + + /** + * 创建 Model + * @param target + */ + private static void createModel(EntryBillDto source,Data target) { + /** + * Model：表单数据包，Json类型（必录） + */ + Model model=new Model(); + model.setFid(0); + /** + * 单据类型:FBillTypeID (必填项) + */ + Fbilltypeid fbilltypeid=new Fbilltypeid(); + fbilltypeid.setFnumber("YFD01_SYS "); + model.setFbilltypeid(fbilltypeid); + /** + * + */ + model.setFbillno(source.getApplicationCode()); + /** + * 是否期初单据:FISINIT + */ + model.setFisinit(false); + /** + * 业务日期:FDATE (必填项) + */ + model.setFdate("2022-07-16 00:00:00 "); + /** + * 到期日:FENDDATE_H + */ + model.setFenddateH("2022-07-16 00:00:00 "); + /** + * 单据状态:FDOCUMENTSTATUS (必填项) + */ + model.setFdocumentstatus("Z "); + /** + * 供应商:FSUPPLIERID (必填项) + */ + Fsupplierid fsupplierid=new Fsupplierid(); + fsupplierid.setFnumber("010001 "); + model.setFsupplierid(fsupplierid); + /** + * 币别:FCURRENCYID (必填项) + */ + Fcurrencyid fcurrencyid=new Fcurrencyid(); + fcurrencyid.setFnumber( "PRE001 "); + model.setFcurrencyid( fcurrencyid); + /** + * 付款条件:FPayConditon + */ + Fpayconditon fpayconditon=new Fpayconditon(); + fpayconditon.setFnumber("FKTJ01_SYS "); + model.setFpayconditon(fpayconditon) ; + /** + * 价外税:FISPRICEEXCLUDETAX + */ + model.setFispriceexcludetax(true); + /** + * 业务类型:FBUSINESSTYPE (必填项) + */ + model.setFbusinesstype("CG ") ; + /** + * 按含税单价录入:FISTAX + */ + model.setFistax(true); + /** + * 表头基本 -未付款核销金额（作废）:FNOTWRITTENOFFAMOUNTFOR + * 结算组织:FSETTLEORGID (必填项) + */ + Fsettleorgid fsettleorgid=new Fsettleorgid(); + fsettleorgid.setFnumber("101 "); + model.setFsettleorgid(fsettleorgid); + /** + * 付款组织:FPAYORGID (必填项) + */ + Fpayorgid fpayorgid=new Fpayorgid(); + fpayorgid.setFnumber("101 "); + model.setFpayorgid(fpayorgid); + /** + * 立账类型:FSetAccountType + */ + model.setFsetaccounttype("2 ") ; + /** + * 税额计入成本:FISTAXINCOST + */ + model.setFistaxincost(false) ; + /** + * 备注:FAP_Remark + */ + model.setFapRemark("122112 "); + /** + * 参与暂估应付核销:FISHookMatch + */ + model.setFishookmatch(false); + /** + * 采购部门:FPURCHASEDEPTID (必填项) + */ + Fpurchasedeptid fpurchasedeptid=new Fpurchasedeptid(); + fpurchasedeptid.setFnumber("02 "); + model.setFpurchasedeptid(fpurchasedeptid); + /** + * 作废状态:FCancelStatus (必填项) + */ + model.setFcancelstatus("A ") ; + /** + *是发票审核自动生成:FISBYIV + */ + model.setFisbyiv(false); + /** + * 是否需要成本调整:FISGENHSADJ + */ + model.setFisgenhsadj(false) ; + /** + * 先到票后入库:FISINVOICEARLIER + */ + model.setFisinvoicearlier(false); + /** + * 发票号码:F_PAEZ_Text + */ + model.setFPaezText("1221121212 ") ; + /** + * 项目类别:F_PMZC_Assistant1 + */ + FPmzcAssistant1 fPmzcAssistant1=new FPmzcAssistant1 (); + fPmzcAssistant1.setFnumber("00 "); + model.setFPmzcAssistant1( fPmzcAssistant1); + /** + * + */ + Fsubheadsuppiler fsubheadsuppiler=new Fsubheadsuppiler (); + Forderid forderid=new Forderid(); + forderid.setFnumber("010001 "); + fsubheadsuppiler.setForderid( forderid); + Ftransferid ftransferid=new Ftransferid(); + ftransferid.setFnumber("010001 "); + fsubheadsuppiler.setFtransferid( ftransferid); + Fchargeid fchargeid=new Fchargeid(); + fchargeid.setFnumber("010001 "); + fsubheadsuppiler.setFchargeid( fchargeid); + model.setFsubheadsuppiler(fsubheadsuppiler) ; + + Fsubheadfinc fsubheadfinc=new Fsubheadfinc(); + + fsubheadfinc.setFaccnttimejudgetime("2022-07-16 00:00:00 ") ; + + /** + * 本位币:FMAINBOOKSTDCURRID + */ + Fmainbookstdcurrid fmainbookstdcurrid=new Fmainbookstdcurrid(); + fmainbookstdcurrid.setFnumber("PRE001 "); + fsubheadfinc.setFmainbookstdcurrid(fmainbookstdcurrid); + /** + * 汇率类型:FEXCHANGETYPE + */ + Fexchangetype fexchangetype=new Fexchangetype(); + fexchangetype.setFnumber("HLTX01_SYS "); + fsubheadfinc.setFexchangetype(fexchangetype); + /** + * 汇率:FExchangeRate + */ + fsubheadfinc.setFexchangerate(1) ; + /** + * 税额:FTaxAmountFor + */ + fsubheadfinc.setFtaxamountfor(1.0) ; + /** + * 不含税金额:FNoTaxAmountFor + */ + fsubheadfinc.setFnotaxamountfor( 1.98) ; + model.setFsubheadfinc(fsubheadfinc); + List fentitydetail=new ArrayList<>(); + model.setFentitydetail(fentitydetail); + List fentityplan=new ArrayList<>(); + model.setFentityplan(fentityplan); + /** + * Model：表单数据包，Json类型（必录） + */ + target.setModel(model); } } \ No newline at end of file From 2f5cf09e8c3f337ca9852912f2fa2d9a0a36dbae Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Tue, 19 Jul 2022 13:51:39 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=87=91=E8=9D=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/fin/api/kingdee/Data.java | 111 ------------------ .../fin/api/kingdee/FinKingDeeFeign.java | 8 +- 2 files changed, 4 insertions(+), 115 deletions(-) delete mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/Data.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/Data.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/Data.java deleted file mode 100644 index 2e7453f982..0000000000 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/Data.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.yxt.anrui.fin.api.kingdee; - -import com.alibaba.fastjson.annotation.JSONField; -import com.alibaba.fastjson.annotation.JSONType; - -import java.util.List; - -@JSONType(orders={"Creator","NeedUpDateFields","NeedReturnFields","IsDeleteEntry","SubSystemId", - "IsVerifyBaseDataField","IsEntryBatchFill","ValidateFlag","NumberSearch","InterationFlags","Model"}) -public class Data { - @JSONField(name = "Creator") - private String Creator; - @JSONField(name = "NeedUpDateFields") - private List NeedUpDateFields; - @JSONField(name = "NeedReturnFields") - private List NeedReturnFields; - @JSONField(name = "IsDeleteEntry") - private String IsDeleteEntry; - @JSONField(name = "SubSystemId") - private String SubSystemId; - @JSONField(name = "IsVerifyBaseDataField") - private String IsVerifyBaseDataField; - @JSONField(name = "IsEntryBatchFill") - private String IsEntryBatchFill; - @JSONField(name = "ValidateFlag") - private String ValidateFlag; - @JSONField(name = "NumberSearch") - private String NumberSearch; - @JSONField(name = "InterationFlags") - private String InterationFlags; - /*@JSONField(name = "Model") - private Model Model;*/ - public void setCreator(String Creator) { - this.Creator = Creator; - } - public String getCreator() { - return Creator; - } - - public void setNeedUpDateFields(List NeedUpDateFields) { - this.NeedUpDateFields = NeedUpDateFields; - } - public List getNeedUpDateFields() { - return NeedUpDateFields; - } - - public void setNeedReturnFields(List NeedReturnFields) { - this.NeedReturnFields = NeedReturnFields; - } - public List getNeedReturnFields() { - return NeedReturnFields; - } - - public void setIsDeleteEntry(String IsDeleteEntry) { - this.IsDeleteEntry = IsDeleteEntry; - } - public String getIsDeleteEntry() { - return IsDeleteEntry; - } - - public void setSubSystemId(String SubSystemId) { - this.SubSystemId = SubSystemId; - } - public String getSubSystemId() { - return SubSystemId; - } - - public void setIsVerifyBaseDataField(String IsVerifyBaseDataField) { - this.IsVerifyBaseDataField = IsVerifyBaseDataField; - } - public String getIsVerifyBaseDataField() { - return IsVerifyBaseDataField; - } - - public void setIsEntryBatchFill(String IsEntryBatchFill) { - this.IsEntryBatchFill = IsEntryBatchFill; - } - public String getIsEntryBatchFill() { - return IsEntryBatchFill; - } - - public void setValidateFlag(String ValidateFlag) { - this.ValidateFlag = ValidateFlag; - } - public String getValidateFlag() { - return ValidateFlag; - } - - public void setNumberSearch(String NumberSearch) { - this.NumberSearch = NumberSearch; - } - public String getNumberSearch() { - return NumberSearch; - } - - public void setInterationFlags(String InterationFlags) { - this.InterationFlags = InterationFlags; - } - public String getInterationFlags() { - return InterationFlags; - } - - /*public void setModel(Model model) { - this.Model = model; - } - public Model getModel() { - return Model; - }*/ - -} - diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index d02b4f4cb0..a8fdc98f9c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestBody; */ @Api(tags = "财务模块调用金蝶保存业务单据的接口") @FeignClient( - contextId = "anrui-fin-FinKingDeeFeign", - name = "anrui-kingdee", - path = "v1/finKingDee", - fallback =FinKingDeeFeignFallBack.class + contextId = "anrui-fin-FinKingDeeFeign", + name = "anrui-kingdee", + path = "v1/finKingDee", + fallback =FinKingDeeFeignFallBack.class ) public interface FinKingDeeFeign { /** From 647c73834b2c6828a613fab6c1299db9455b0c77 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 19 Jul 2022 14:37:04 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=B4=BD=E8=B0=88=E6=A0=B9=E6=8D=AE=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedistributor/BaseDistributorMapper.xml | 4 ++-- .../BaseDistributorService.java | 8 +++---- .../AppCrmVehicleDemandUpdateDto.java | 5 ++++ .../AppCrmVehicledemandDetailsVo.java | 5 ++++ .../AppCrmVehicledemandVo.java | 20 +++++++++++++--- .../crmvehicledemand/CrmVehicledemand.java | 5 ++++ .../CrmCustomerTempService.java | 14 ++++++++++- .../CrmVehicledemandMapper.java | 2 ++ .../CrmVehicledemandMapper.xml | 24 +++++++++++++++---- .../CrmVehicledemandService.java | 9 +++++-- 10 files changed, 80 insertions(+), 16 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index 7261372e16..18b9d8ee81 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -170,14 +170,14 @@ select * from base_distributor where sid = #{sid} - and length(disName) = 0 + and length(disName) > 0 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 71e127ea7b..d40b991726 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -580,15 +580,15 @@ public class BaseDistributorService extends MybatisBaseService 0) { diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java index d09beb7823..47168d20ee 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java @@ -33,4 +33,9 @@ public class AppCrmVehicleDemandUpdateDto implements Dto { @ApiModelProperty("意向车型sid") private String intentionSid; + + @ApiModelProperty(value = "金融方案key") + private String financePlan; + @ApiModelProperty(value = "金融方案value") + private String financePlanValue; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java index ce2e362bf2..b8a21f5201 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java @@ -42,4 +42,9 @@ public class AppCrmVehicledemandDetailsVo implements Vo { @ApiModelProperty(value = "其他配置:pc") private String otherConfig; + @ApiModelProperty(value = "金融方案key") + private String financePlan; + @ApiModelProperty(value = "金融方案value") + private String financePlanValue; + } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java index b227ae5622..aa35fb97c1 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java @@ -6,13 +6,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import java.util.Date; - @ApiModel(value = "客户车辆需求信息 视图数据对象", description = "客户车辆需求信息 视图数据对象") @Data public class AppCrmVehicledemandVo implements Vo { + private static final long serialVersionUID = -3885773306949969375L; @ApiModelProperty("车辆需求sid") private String sid; @@ -31,6 +29,22 @@ public class AppCrmVehicledemandVo implements Vo { @ApiModelProperty("购车方式value") private String purchaseType; + @ApiModelProperty(value = "购车方式key") + private String purchaseKey; + @ApiModelProperty(value = "客户sid") + private String customerSid; + @ApiModelProperty(value = "客户名称") + private String customerName; + @ApiModelProperty(value = "客户手机号") + private String customerMobile; + @ApiModelProperty(value = "购车方式key") + private String payTypeUpKey; + @ApiModelProperty(value = "购车方式value") + private String payTypeUpValue; + + @ApiModelProperty(value = "新建销售订单按钮是否显示") + private Boolean showAddOrderBtn; + } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java index f132c582dd..6f5385a5aa 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java @@ -78,4 +78,9 @@ public class CrmVehicledemand extends BaseEntity { @ApiModelProperty("常用配置sid") private String comonConfigSid; + + @ApiModelProperty(value = "金融方案key") + private String financePlan; + @ApiModelProperty(value = "金融方案value") + private String financePlanValue; } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 65c501fbe9..96088ff15a 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -12,6 +12,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.*; import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum; import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo; +import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand; import com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo; import com.yxt.anrui.crm.api.crmvisit.CrmVisitVo; import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto; @@ -338,7 +339,18 @@ public class CrmCustomerTempService extends MybatisBaseService appCrmVehicledemandVos = crmVehicledemandService.selectCustomerSid(sid); - if (appCrmVehicledemandVos.size() > 0) { + appCrmVehicledemandVos.removeAll(Collections.singleton(null)); + if (!appCrmVehicledemandVos.isEmpty()) { + for (AppCrmVehicledemandVo v : appCrmVehicledemandVos) { + String vehicSid = v.getSid(); + //根据车辆需求sid查询是否已完善 + CrmVehicledemand crmVehicledemand = crmVehicledemandService.selectOneBySid(vehicSid); + if (crmVehicledemand != null) { + v.setShowAddOrderBtn(true); + } else { + v.setShowAddOrderBtn(false); + } + } vo.setAppCrmVehicledemandVos(appCrmVehicledemandVos); } else { List list = new ArrayList<>(); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java index 2ee9c0983e..283fd8ad0d 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java @@ -108,4 +108,6 @@ public interface CrmVehicledemandMapper extends BaseMapper { IPage getWantCarList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); void updateByPrice(@Param("sid") String sid); + + CrmVehicledemand selectOneBySid(String vehicSid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 22ff4b5c15..8f903e651b 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -32,10 +32,17 @@ cvcd.modelName, cvcd.modelSid, cvcd.comonConfigSid, - cvcd.saleReferencePrice AS guidancePrice, - cvcd.createTime, - cvcd.purchaseMethodValue AS purchaseType + cvcd.saleReferencePrice AS guidancePrice, + DATE_FORMAT(cvcd.createTime, '%Y-%m-%d') as createTime, + cvcd.purchaseMethodValue AS purchaseType, + cvcd.purchaseMethod as purchaseKey, + cvcd.financePlan as payTypeUpKey, + cvcd.financePlanValue as payTypeUpValue, + cct.sid as customerSid, + cct.name as customerName, + cct.mobile as customerMobile FROM crm_vehicledemand cvcd + left join crm_customer_temp cct on cvcd.customerSid = cct.sid WHERE cvcd.customerSid = #{customerSid} AND cvcd.states = 1 @@ -99,7 +106,9 @@ cv.number, cv.estimatedPickupDate AS `date`, cv.otherConfig, - cv.sketChconfiguration as configName + cv.sketChconfiguration as configName, + cv.financePlan, + cv.financePlanValue FROM crm_vehicledemand cv WHERE cv.sid = #{intentionSid} @@ -152,4 +161,11 @@ set vehicleModelOffer = NULL where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index d16d8b1080..955830bdbc 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -354,10 +354,11 @@ public class CrmVehicledemandService extends MybatisBaseService Date: Tue, 19 Jul 2022 14:48:42 +0800 Subject: [PATCH 04/10] =?UTF-8?q?pc=E7=AB=AF=E4=B8=AD=E4=BB=8B=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=A2=9E=E3=80=81=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basemiddleman/BaseMiddlemanDetailsVo.java | 3 +++ .../api/basemiddleman/BaseMiddlemanDto.java | 3 +++ .../api/basemiddleman/BaseMiddlemanVo.java | 3 +++ .../biz/basemiddleman/BaseMiddlemanMapper.xml | 18 ++++++++++++++++-- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDetailsVo.java index 99824d28b7..2a17671003 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDetailsVo.java @@ -65,4 +65,7 @@ public class BaseMiddlemanDetailsVo implements Vo { @ApiModelProperty(value = "用户sid") private String createBySid; + @ApiModelProperty(value = "备注") + private String remarks; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java index 33f3371b97..c71bd8f9c7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java @@ -65,4 +65,7 @@ public class BaseMiddlemanDto implements Dto { @ApiModelProperty(value = "用户sid") private String createBySid; + @ApiModelProperty(value = "备注") + private String remarks; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanVo.java index cd0abe57a3..0702857005 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanVo.java @@ -65,4 +65,7 @@ public class BaseMiddlemanVo implements Vo { @ApiModelProperty("专员用户sid") private String createBySid; + @ApiModelProperty(value = "备注") + private String remarks; + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml index bf8a864784..dcd59342da 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml @@ -4,7 +4,14 @@ From 58ed18c9efd82fb8d38e20ad50ca3c9fc12167cf Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Tue, 19 Jul 2022 15:14:39 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E5=BA=93=E7=9A=84=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseoutsourcingapplication.vue | 2 +- .../views/supplychain/caigoutuiku/caigoutuikuAdd.vue | 4 ++-- .../views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue | 10 ++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue index 800119701a..2d7e598379 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue @@ -33,7 +33,7 @@
- +